From 0747c2ffad2732bfd0f27c2ca253dc7ae7d558ff Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Sat, 11 Jan 2014 06:13:50 -0500 Subject: [PATCH 1/3] Moved tank prefabs --- .../{mechanical/fluid/tank => core/prefab}/FilteredTank.java | 2 +- .../{mechanical/fluid/tank => core/prefab}/GasTank.java | 2 +- .../{mechanical/fluid/tank => core/prefab}/LiquidTank.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/resonantinduction/{mechanical/fluid/tank => core/prefab}/FilteredTank.java (96%) rename src/main/java/resonantinduction/{mechanical/fluid/tank => core/prefab}/GasTank.java (93%) rename src/main/java/resonantinduction/{mechanical/fluid/tank => core/prefab}/LiquidTank.java (93%) diff --git a/src/main/java/resonantinduction/mechanical/fluid/tank/FilteredTank.java b/src/main/java/resonantinduction/core/prefab/FilteredTank.java similarity index 96% rename from src/main/java/resonantinduction/mechanical/fluid/tank/FilteredTank.java rename to src/main/java/resonantinduction/core/prefab/FilteredTank.java index 0370a3a53..49afd2c62 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/tank/FilteredTank.java +++ b/src/main/java/resonantinduction/core/prefab/FilteredTank.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.fluid.tank; +package resonantinduction.core.prefab; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/resonantinduction/mechanical/fluid/tank/GasTank.java b/src/main/java/resonantinduction/core/prefab/GasTank.java similarity index 93% rename from src/main/java/resonantinduction/mechanical/fluid/tank/GasTank.java rename to src/main/java/resonantinduction/core/prefab/GasTank.java index bfc6c7c4d..9c66f6c30 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/tank/GasTank.java +++ b/src/main/java/resonantinduction/core/prefab/GasTank.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.fluid.tank; +package resonantinduction.core.prefab; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/resonantinduction/mechanical/fluid/tank/LiquidTank.java b/src/main/java/resonantinduction/core/prefab/LiquidTank.java similarity index 93% rename from src/main/java/resonantinduction/mechanical/fluid/tank/LiquidTank.java rename to src/main/java/resonantinduction/core/prefab/LiquidTank.java index 8ecdb3fbc..05781d39c 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/tank/LiquidTank.java +++ b/src/main/java/resonantinduction/core/prefab/LiquidTank.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.fluid.tank; +package resonantinduction.core.prefab; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; From 9771db804c9bba241161fab7ab377c3225af0833 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Sat, 11 Jan 2014 06:16:34 -0500 Subject: [PATCH 2/3] Possible fix for config issues --- src/main/java/resonantinduction/core/ResonantInduction.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index ca12d50fb..e71044fb9 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -89,8 +89,6 @@ public class ResonantInduction MinecraftForge.EVENT_BUS.register(new LinkEventHandler()); MinecraftForge.EVENT_BUS.register(new FluidEventHandler()); - Settings.CONFIGURATION.load(); - blockMulti = new BlockMulti(Settings.getNextBlockID()).setPacketType(PACKET_TILE); MIXTURE = new Fluid("mixture"); @@ -107,7 +105,7 @@ public class ResonantInduction GameRegistry.registerBlock(blockFluidMixture, blockFluidMixture.getUnlocalizedName()); GameRegistry.registerTileEntity(TileFluidMixture.class, blockFluidMixture.getUnlocalizedName()); - Settings.CONFIGURATION.save(); + } @EventHandler @@ -124,6 +122,7 @@ public class ResonantInduction { // Generate Dusts ResourceGenerator.generateDusts(); + Settings.save(); } } From de54ac908c0d3dc9eb42660489249a19a94a64b5 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Sat, 11 Jan 2014 06:38:15 -0500 Subject: [PATCH 3/3] Try two on fixing config --- src/main/java/resonantinduction/core/ResonantInduction.java | 4 ++-- src/main/java/resonantinduction/electrical/Electrical.java | 5 ++--- src/main/java/resonantinduction/mechanical/Mechanical.java | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index e71044fb9..495e0c09a 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -105,7 +105,7 @@ public class ResonantInduction GameRegistry.registerBlock(blockFluidMixture, blockFluidMixture.getUnlocalizedName()); GameRegistry.registerTileEntity(TileFluidMixture.class, blockFluidMixture.getUnlocalizedName()); - + Settings.save(); } @EventHandler @@ -122,7 +122,7 @@ public class ResonantInduction { // Generate Dusts ResourceGenerator.generateDusts(); - Settings.save(); + } } diff --git a/src/main/java/resonantinduction/electrical/Electrical.java b/src/main/java/resonantinduction/electrical/Electrical.java index 57e0fc9c2..c13f85f09 100644 --- a/src/main/java/resonantinduction/electrical/Electrical.java +++ b/src/main/java/resonantinduction/electrical/Electrical.java @@ -103,7 +103,7 @@ public class Electrical { NetworkRegistry.instance().registerGuiHandler(this, proxy); - Settings.CONFIGURATION.load(); + Settings.load(); // Energy itemPartWire = contentRegistry.createItem(ItemWire.class); @@ -131,7 +131,7 @@ public class Electrical GameRegistry.registerTileEntity(TileAdvancedFurnace.class, "ri_" + blockAdvancedFurnace.getUnlocalizedName()); } - Settings.CONFIGURATION.save(); + Settings.save(); /** * Set reference itemstacks @@ -144,7 +144,6 @@ public class Electrical } proxy.preInit(); - Settings.CONFIGURATION.save(); } @EventHandler diff --git a/src/main/java/resonantinduction/mechanical/Mechanical.java b/src/main/java/resonantinduction/mechanical/Mechanical.java index f381c9e6b..ea890d7fa 100644 --- a/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -64,6 +64,7 @@ public class Mechanical @EventHandler public void preInit(FMLPreInitializationEvent evt) { + Settings.load(); NetworkRegistry.instance().registerGuiHandler(this, proxy); blockConveyorBelt = contentRegistry.createTile(BlockConveyorBelt.class, TileConveyorBelt.class); @@ -72,6 +73,7 @@ public class Mechanical blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class); blockPump = contentRegistry.createTile(BlockPump.class, TilePump.class); proxy.preInit(); + Settings.save(); } @EventHandler