From 749d84648faac4d693468566f48e22c0cd7f88bc Mon Sep 17 00:00:00 2001 From: Calclavia Date: Tue, 11 Mar 2014 21:45:31 +0800 Subject: [PATCH] Fixed block and item ID config not loading --- .../resonantinduction/archaic/Archaic.java | 3 ++- .../electrical/Electrical.java | 3 ++- .../mechanical/Mechanical.java | 3 ++- .../crusher/RenderMechanicalPiston.java | 2 +- .../process/crusher/TileMechanicalPiston.java | 14 ++++++------ .../core/ResonantInduction.java | 22 +++++++++---------- .../java/resonantinduction/core/Settings.java | 5 ----- .../core/grid/TickingGrid.java | 4 ++-- 8 files changed, 27 insertions(+), 29 deletions(-) diff --git a/archaic/src/main/java/resonantinduction/archaic/Archaic.java b/archaic/src/main/java/resonantinduction/archaic/Archaic.java index 5b8f6314..0a31bbe5 100644 --- a/archaic/src/main/java/resonantinduction/archaic/Archaic.java +++ b/archaic/src/main/java/resonantinduction/archaic/Archaic.java @@ -96,6 +96,7 @@ public class Archaic public void preInit(FMLPreInitializationEvent evt) { NetworkRegistry.instance().registerGuiHandler(this, proxy); + Settings.CONFIGURATION.load(); blockEngineeringTable = contentRegistry.newBlock(TileEngineeringTable.class); blockCrate = contentRegistry.createBlock(BlockCrate.class, ItemBlockCrate.class, TileCrate.class); blockImprinter = contentRegistry.createTile(BlockImprinter.class, TileImprinter.class); @@ -114,7 +115,7 @@ public class Archaic itemHammer = contentRegistry.createItem(ItemHammer.class); proxy.preInit(); - Settings.save(); + Settings.CONFIGURATION.save(); TabRI.ITEMSTACK = new ItemStack(blockEngineeringTable); PacketAnnotation.register(TileFirebox.class); diff --git a/electrical/src/main/java/resonantinduction/electrical/Electrical.java b/electrical/src/main/java/resonantinduction/electrical/Electrical.java index c6aabf28..1a9d1f21 100644 --- a/electrical/src/main/java/resonantinduction/electrical/Electrical.java +++ b/electrical/src/main/java/resonantinduction/electrical/Electrical.java @@ -99,6 +99,7 @@ public class Electrical { NetworkRegistry.instance().registerGuiHandler(this, proxy); + Settings.CONFIGURATION.load(); // Energy itemWire = contentRegistry.createItem(ItemWire.class); itemMultimeter = contentRegistry.createItem(ItemMultimeter.class); @@ -120,7 +121,7 @@ public class Electrical // Quantum itemQuantumGlyph = contentRegistry.createItem(ItemQuantumGlyph.class); - Settings.save(); + Settings.CONFIGURATION.save(); OreDictionary.registerOre("wire", itemWire); OreDictionary.registerOre("battery", ItemBlockBattery.setTier(new ItemStack(blockBattery, 1, 0), (byte) 0)); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java index 6cfcd818..091fa3f0 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -106,6 +106,7 @@ public class Mechanical MinecraftForge.EVENT_BUS.register(new MicroblockHighlightHandler()); BlockCreativeBuilder.register(new SchematicWindTurbine()); BlockCreativeBuilder.register(new SchematicWaterTurbine()); + Settings.CONFIGURATION.load(); itemGear = contentRegistry.createItem(ItemGear.class); itemGearShaft = contentRegistry.createItem(ItemGearShaft.class); @@ -129,7 +130,7 @@ public class Mechanical OreDictionary.registerOre("gear", itemGear); proxy.preInit(); - Settings.save(); + Settings.CONFIGURATION.save(); TabRI.ITEMSTACK = new ItemStack(blockGrinderWheel); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java b/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java index af58c85d..8e85e1a3 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java @@ -57,7 +57,7 @@ public class RenderMechanicalPiston extends TileEntitySpecialRenderer * Render Piston Rotor */ GL11.glPushMatrix(); - GL11.glTranslated(0, 0, (0.5 * Math.cos(angle - Math.PI)) - 0.5); + GL11.glTranslated(0, 0, (0.5 * Math.sin(angle - Math.PI)) - 0.5); MODEL.renderOnly("PistonShaft", "PistonFace", "PistonFace2"); GL11.glPopMatrix(); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java b/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java index 763b255e..42bca61a 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java @@ -2,9 +2,6 @@ package resonantinduction.mechanical.process.crusher; import java.lang.reflect.Method; -import codechicken.multipart.MultipartHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; @@ -13,15 +10,18 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.mechanical.energy.grid.TileMechanical; import universalelectricity.api.vector.Vector3; +import calclavia.lib.configurable.Config; import calclavia.lib.prefab.tile.IRotatable; import calclavia.lib.utility.MovementUtility; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.ReflectionHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileMechanicalPiston extends TileMechanical implements IRotatable { - // Planned CalCore option @ConfigInt() - private int breakCount = 5; + @Config + private int mechanicalPistonBreakCount = 5; public TileMechanicalPiston() { @@ -200,12 +200,12 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable } else { - if (this.breakCount <= 0) + if (this.mechanicalPistonBreakCount <= 0) { getWorldObj().setBlockToAir(blockPos.intX(), blockPos.intY(), blockPos.intZ()); } - this.breakCount--; + this.mechanicalPistonBreakCount--; } } diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index 2f021ba2..df047a50 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -90,7 +90,7 @@ public class ResonantInduction ResonantInduction.LOGGER.setParent(FMLLog.getLogger()); NetworkRegistry.instance().registerGuiHandler(this, proxy); Modstats.instance().getReporter().registerMod(this); - + Settings.CONFIGURATION.load(); // Register Forge Events MinecraftForge.EVENT_BUS.register(ResourceGenerator.INSTANCE); MinecraftForge.EVENT_BUS.register(new TextureHookHandler()); @@ -136,20 +136,20 @@ public class ResonantInduction @EventHandler public void postInit(FMLPostInitializationEvent evt) { - try - { - ConfigHandler.configure(Settings.CONFIGURATION, "resonantinduction"); - } - catch (Exception e) - { - e.printStackTrace(); - } + try + { + ConfigHandler.configure(Settings.CONFIGURATION, "resonantinduction"); + } + catch (Exception e) + { + e.printStackTrace(); + } - Settings.save(); + Settings.CONFIGURATION.save(); // Generate Resources ResourceGenerator.generateOreResources(); proxy.postInit(); - + if (!UpdateTicker.INSTANCE.isAlive()) UpdateTicker.INSTANCE.start(); } diff --git a/src/main/java/resonantinduction/core/Settings.java b/src/main/java/resonantinduction/core/Settings.java index 6c8a8852..0af7063d 100644 --- a/src/main/java/resonantinduction/core/Settings.java +++ b/src/main/java/resonantinduction/core/Settings.java @@ -58,11 +58,6 @@ public class Settings @Config(category = Configuration.CATEGORY_GENERAL, key = "Max EM Contractor Path") public static int MAX_LEVITATOR_DISTANCE = 200; - public static void save() - { - CONFIGURATION.save(); - } - public static void setModMetadata(ModMetadata metadata, String id, String name) { setModMetadata(metadata, id, name, ""); diff --git a/src/main/java/resonantinduction/core/grid/TickingGrid.java b/src/main/java/resonantinduction/core/grid/TickingGrid.java index 12ca59cb..dac13c17 100644 --- a/src/main/java/resonantinduction/core/grid/TickingGrid.java +++ b/src/main/java/resonantinduction/core/grid/TickingGrid.java @@ -9,8 +9,8 @@ public class TickingGrid extends NodeGrid implements IUpdate { super(type); add(node); - NetworkTickHandler.addNetwork(this); - // UpdateTicker.addNetwork(this); + // NetworkTickHandler.addNetwork(this); + UpdateTicker.addNetwork(this); } /**