Fix aura node transmutation (#17)

* Update buildscript and dependencies * Make aura node biome transmuatation work in PS biomes Closes <GTNewHorizons/GT-New-Horizons-Modpack#12759>
GTNewHorizons · Apr 27, 2023 · 6343d0d · 6343d0d
1 parent 4f244ac
commit 6343d0d
Show file tree

Hide file tree

Showing 18 changed files with 130 additions and 197 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,11 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-    implementation("com.github.GTNewHorizons:NotEnoughItems:2.3.24-GTNH:dev")
-    implementation('com.github.GTNewHorizons:CodeChickenLib:1.1.5.7:dev')
+    implementation("com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev")
 
-    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-140-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.40-GTNH:dev") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-195-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.65-GTNH:dev") {transitive = false}
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/src/main/java/me/eigenraven/personalspace/ClientProxy.java b/src/main/java/me/eigenraven/personalspace/ClientProxy.java
@@ -1,9 +1,5 @@
 package me.eigenraven.personalspace;
 
-import me.eigenraven.personalspace.block.PortalTileEntity;
-import me.eigenraven.personalspace.block.RenderPortal;
-import me.eigenraven.personalspace.gui.GuiEditWorld;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.gui.GuiScreen;
@@ -21,6 +17,9 @@
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
+import me.eigenraven.personalspace.block.PortalTileEntity;
+import me.eigenraven.personalspace.block.RenderPortal;
+import me.eigenraven.personalspace.gui.GuiEditWorld;
 
 public class ClientProxy extends CommonProxy {
 

diff --git a/src/main/java/me/eigenraven/personalspace/CommonProxy.java b/src/main/java/me/eigenraven/personalspace/CommonProxy.java
@@ -1,8 +1,5 @@
 package me.eigenraven.personalspace;
 
-import me.eigenraven.personalspace.block.PortalTileEntity;
-import me.eigenraven.personalspace.world.DimensionConfig;
-
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -14,6 +11,8 @@
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import gnu.trove.map.hash.TIntObjectHashMap;
+import me.eigenraven.personalspace.block.PortalTileEntity;
+import me.eigenraven.personalspace.world.DimensionConfig;
 
 public class CommonProxy {
 

diff --git a/src/main/java/me/eigenraven/personalspace/Config.java b/src/main/java/me/eigenraven/personalspace/Config.java
@@ -5,10 +5,10 @@
 import java.util.HashSet;
 import java.util.stream.Collectors;
 
-import me.eigenraven.personalspace.world.DimensionConfig;
-
 import net.minecraftforge.common.config.Configuration;
 
+import me.eigenraven.personalspace.world.DimensionConfig;
+
 public class Config {
 
     private static class Defaults {

diff --git a/src/main/java/me/eigenraven/personalspace/PersonalSpaceCommand.java b/src/main/java/me/eigenraven/personalspace/PersonalSpaceCommand.java
@@ -2,10 +2,6 @@
 
 import java.util.List;
 
-import me.eigenraven.personalspace.net.Packets;
-import me.eigenraven.personalspace.world.DimensionConfig;
-import me.eigenraven.personalspace.world.PersonalTeleporter;
-
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
@@ -21,6 +17,10 @@
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
 
+import me.eigenraven.personalspace.net.Packets;
+import me.eigenraven.personalspace.world.DimensionConfig;
+import me.eigenraven.personalspace.world.PersonalTeleporter;
+
 public class PersonalSpaceCommand extends CommandBase {
 
     @Override

diff --git a/src/main/java/me/eigenraven/personalspace/PersonalSpaceMod.java b/src/main/java/me/eigenraven/personalspace/PersonalSpaceMod.java
@@ -7,14 +7,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import me.eigenraven.personalspace.block.PortalBlock;
-import me.eigenraven.personalspace.block.PortalEntityItem;
-import me.eigenraven.personalspace.block.PortalItem;
-import me.eigenraven.personalspace.block.PortalTileEntity;
-import me.eigenraven.personalspace.net.Packets;
-import me.eigenraven.personalspace.world.DimensionConfig;
-import me.eigenraven.personalspace.world.PersonalWorldProvider;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraftforge.common.DimensionManager;
@@ -25,13 +17,12 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.google.common.collect.Lists;
+
 import appeng.api.AEApi;
 import appeng.api.IAppEngApi;
 import appeng.api.features.IWorldGen;
 import codechicken.lib.packet.PacketCustom;
-
-import com.google.common.collect.Lists;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
@@ -57,6 +48,13 @@
 import cpw.mods.fml.relauncher.Side;
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.map.hash.TIntObjectHashMap;
+import me.eigenraven.personalspace.block.PortalBlock;
+import me.eigenraven.personalspace.block.PortalEntityItem;
+import me.eigenraven.personalspace.block.PortalItem;
+import me.eigenraven.personalspace.block.PortalTileEntity;
+import me.eigenraven.personalspace.net.Packets;
+import me.eigenraven.personalspace.world.DimensionConfig;
+import me.eigenraven.personalspace.world.PersonalWorldProvider;
 
 @Mod(
         modid = "personalspace",
@@ -276,7 +274,7 @@ private void bulkDimSettingsUpdate() {
                 if (config.isGeneratingTrees()) {
                     tcBlacklist.remove(dimId);
                 } else {
-                    tcBlacklist.put(dimId, 0);
+                    tcBlacklist.put(dimId, 1); // disable vegetation but not aura node functionality
                 }
             }
             return true;

diff --git a/src/main/java/me/eigenraven/personalspace/block/PortalBlock.java b/src/main/java/me/eigenraven/personalspace/block/PortalBlock.java
@@ -2,8 +2,6 @@
 
 import java.util.ArrayList;
 
-import me.eigenraven.personalspace.PersonalSpaceMod;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
@@ -22,6 +20,7 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import me.eigenraven.personalspace.PersonalSpaceMod;
 
 public class PortalBlock extends Block implements ITileEntityProvider {
 

diff --git a/src/main/java/me/eigenraven/personalspace/block/PortalTileEntity.java b/src/main/java/me/eigenraven/personalspace/block/PortalTileEntity.java
@@ -1,12 +1,5 @@
 package me.eigenraven.personalspace.block;
 
-import me.eigenraven.personalspace.Config;
-import me.eigenraven.personalspace.PersonalSpaceMod;
-import me.eigenraven.personalspace.net.Packets;
-import me.eigenraven.personalspace.world.DimensionConfig;
-import me.eigenraven.personalspace.world.PersonalTeleporter;
-import me.eigenraven.personalspace.world.PersonalWorldProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetworkManager;
@@ -20,6 +13,13 @@
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.world.BlockEvent;
 
+import me.eigenraven.personalspace.Config;
+import me.eigenraven.personalspace.PersonalSpaceMod;
+import me.eigenraven.personalspace.net.Packets;
+import me.eigenraven.personalspace.world.DimensionConfig;
+import me.eigenraven.personalspace.world.PersonalTeleporter;
+import me.eigenraven.personalspace.world.PersonalWorldProvider;
+
 public class PortalTileEntity extends TileEntity {
 
     public static final ForgeDirection DEFAULT_FACING = ForgeDirection.NORTH;

diff --git a/src/main/java/me/eigenraven/personalspace/gui/GuiEditWorld.java b/src/main/java/me/eigenraven/personalspace/gui/GuiEditWorld.java
@@ -6,13 +6,6 @@
 import java.util.List;
 import java.util.function.IntConsumer;
 
-import me.eigenraven.personalspace.CommonProxy;
-import me.eigenraven.personalspace.Config;
-import me.eigenraven.personalspace.PersonalSpaceMod;
-import me.eigenraven.personalspace.block.PortalTileEntity;
-import me.eigenraven.personalspace.net.Packets;
-import me.eigenraven.personalspace.world.DimensionConfig;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -28,6 +21,12 @@
 
 import codechicken.lib.gui.GuiDraw;
 import cpw.mods.fml.common.registry.GameRegistry;
+import me.eigenraven.personalspace.CommonProxy;
+import me.eigenraven.personalspace.Config;
+import me.eigenraven.personalspace.PersonalSpaceMod;
+import me.eigenraven.personalspace.block.PortalTileEntity;
+import me.eigenraven.personalspace.net.Packets;
+import me.eigenraven.personalspace.world.DimensionConfig;
 
 public class GuiEditWorld extends GuiScreen {
 

diff --git a/src/main/java/me/eigenraven/personalspace/net/Packets.java b/src/main/java/me/eigenraven/personalspace/net/Packets.java
@@ -3,19 +3,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import me.eigenraven.personalspace.CommonProxy;
-import me.eigenraven.personalspace.Config;
-import me.eigenraven.personalspace.PersonalSpaceMod;
-import me.eigenraven.personalspace.block.PortalTileEntity;
-import me.eigenraven.personalspace.world.DimensionConfig;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.INetHandlerPlayClient;
 import net.minecraft.network.play.INetHandlerPlayServer;
 import net.minecraft.tileentity.TileEntity;
 
 import codechicken.lib.packet.PacketCustom;
+import me.eigenraven.personalspace.CommonProxy;
+import me.eigenraven.personalspace.Config;
+import me.eigenraven.personalspace.PersonalSpaceMod;
+import me.eigenraven.personalspace.block.PortalTileEntity;
+import me.eigenraven.personalspace.world.DimensionConfig;
 
 public enum Packets {
 

diff --git a/src/main/java/me/eigenraven/personalspace/world/DimensionConfig.java b/src/main/java/me/eigenraven/personalspace/world/DimensionConfig.java
@@ -9,10 +9,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
-import me.eigenraven.personalspace.CommonProxy;
-import me.eigenraven.personalspace.Config;
-import me.eigenraven.personalspace.PersonalSpaceMod;
-
 import net.minecraft.block.Block;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.StatCollector;
@@ -24,11 +20,14 @@
 
 import org.apache.commons.lang3.tuple.MutablePair;
 
+import com.google.common.collect.Lists;
+
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.data.MCDataOutput;
-
-import com.google.common.collect.Lists;
 import cpw.mods.fml.common.registry.GameRegistry;
+import me.eigenraven.personalspace.CommonProxy;
+import me.eigenraven.personalspace.Config;
+import me.eigenraven.personalspace.PersonalSpaceMod;
 
 /**
  * Current world generation settings for a given dimension

diff --git a/src/main/java/me/eigenraven/personalspace/world/PersonalChunkProvider.java b/src/main/java/me/eigenraven/personalspace/world/PersonalChunkProvider.java
@@ -6,9 +6,6 @@
 import java.util.Objects;
 import java.util.Random;
 
-import me.eigenraven.personalspace.Config;
-import me.eigenraven.personalspace.PersonalSpaceMod;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.init.Blocks;
@@ -25,6 +22,9 @@
 import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
 import net.minecraftforge.event.terraingen.TerrainGen;
 
+import me.eigenraven.personalspace.Config;
+import me.eigenraven.personalspace.PersonalSpaceMod;
+
 public class PersonalChunkProvider implements IChunkProvider {
 
     private PersonalWorldProvider world;

diff --git a/src/main/java/me/eigenraven/personalspace/world/PersonalTeleporter.java b/src/main/java/me/eigenraven/personalspace/world/PersonalTeleporter.java
@@ -1,11 +1,11 @@
 package me.eigenraven.personalspace.world;
 
-import me.eigenraven.personalspace.block.PortalTileEntity;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.world.Teleporter;
 import net.minecraft.world.WorldServer;
 
+import me.eigenraven.personalspace.block.PortalTileEntity;
+
 public class PersonalTeleporter extends Teleporter {
 
     int x, y, z;

diff --git a/src/main/java/me/eigenraven/personalspace/world/PersonalWorldProvider.java b/src/main/java/me/eigenraven/personalspace/world/PersonalWorldProvider.java
@@ -2,10 +2,6 @@
 
 import java.util.Arrays;
 
-import me.eigenraven.personalspace.CommonProxy;
-import me.eigenraven.personalspace.Config;
-import me.eigenraven.personalspace.PersonalSpaceMod;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.util.Vec3;
@@ -19,6 +15,9 @@
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import me.eigenraven.personalspace.CommonProxy;
+import me.eigenraven.personalspace.Config;
+import me.eigenraven.personalspace.PersonalSpaceMod;
 
 /**
  * Based on WorldProviderEnd