From ddc983cd4036087b5fca431218ba829e4c9c3419 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Tue, 23 Jul 2013 03:40:36 -0400 Subject: [PATCH] fixed domain loading issue --- .../dark/assembly/common/AssemblyLine.java | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/minecraft/dark/assembly/common/AssemblyLine.java b/src/minecraft/dark/assembly/common/AssemblyLine.java index b3562b4a..acdf8704 100644 --- a/src/minecraft/dark/assembly/common/AssemblyLine.java +++ b/src/minecraft/dark/assembly/common/AssemblyLine.java @@ -63,11 +63,6 @@ import dark.core.blocks.TileEntityMulti; @NetworkMod(channels = { AssemblyLine.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) public class AssemblyLine extends ModPrefab { - public AssemblyLine() - { - super("al"); - // TODO Auto-generated constructor stub - } // @Mod public static final String MOD_ID = "AssemblyLine"; @@ -106,12 +101,8 @@ public class AssemblyLine extends ModPrefab super.preInit(event); FMLog.setParent(FMLLog.getLogger()); instance = this; - recipeLoader = new ALRecipeLoader(); - /* UPDATE NOTIFIER */ - Modstats.instance().getReporter().registerMod(this); - - NetworkRegistry.instance().registerGuiHandler(this, this.proxy); + NetworkRegistry.instance().registerGuiHandler(this, proxy); GameRegistry.registerBlock(recipeLoader.blockConveyorBelt, "ConveyorBelt"); GameRegistry.registerBlock(recipeLoader.blockCrate, ItemBlockCrate.class, "Crate"); @@ -153,17 +144,15 @@ public class AssemblyLine extends ModPrefab } - public static void printSidedData(String data) - { - System.out.print(FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT ? "[C]" : "[S]"); - System.out.println(" " + data); - } - @Override public void loadConfig() { + if (recipeLoader == null) + { + recipeLoader = new ALRecipeLoader(); + } CONFIGURATION.load(); - recipeLoader.blockConveyorBelt = new BlockConveyorBelt(BLOCK_ID_PREFIX); + recipeLoader.blockConveyorBelt = new BlockConveyorBelt(BLOCK_ID_PREFIX++); recipeLoader.blockManipulator = new BlockManipulator(BLOCK_ID_PREFIX++); recipeLoader.blockCrate = new BlockCrate(BLOCK_ID_PREFIX++); recipeLoader.blockImprinter = new BlockImprinter(BLOCK_ID_PREFIX++); @@ -203,4 +192,10 @@ public class AssemblyLine extends ModPrefab meta.autogenerated = false; } + + @Override + public String getDomain() + { + return "al"; + } }