Fixed block and item ID config not loading
This commit is contained in:
parent
40c13a9e37
commit
749d84648f
8 changed files with 27 additions and 29 deletions
|
@ -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);
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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--;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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,16 +136,16 @@ 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();
|
||||
|
|
|
@ -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, "");
|
||||
|
|
|
@ -9,8 +9,8 @@ public class TickingGrid<N extends Node> extends NodeGrid<N> implements IUpdate
|
|||
{
|
||||
super(type);
|
||||
add(node);
|
||||
NetworkTickHandler.addNetwork(this);
|
||||
// UpdateTicker.addNetwork(this);
|
||||
// NetworkTickHandler.addNetwork(this);
|
||||
UpdateTicker.addNetwork(this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue