diff options
| -rw-r--r-- | .classpath | 3 | ||||
| -rw-r--r-- | src/Java/miscutil/MiscUtils.java | 6 | ||||
| -rw-r--r-- | src/Java/miscutil/core/block/ModBlocks.java | 10 | ||||
| -rw-r--r-- | src/Java/miscutil/core/tileentities/ModTileEntities.java | 4 |
4 files changed, 14 insertions, 9 deletions
diff --git a/.classpath b/.classpath index 6d6a1a9bdd..f03424b542 100644 --- a/.classpath +++ b/.classpath @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="conduits/|miscutil/enderio/" kind="src" path="src/Java"/> + <classpathentry excluding="miscutil/enderio/|conduits/" kind="src" path="src/Java"/> <classpathentry kind="src" path="src/resources"/> <classpathentry combineaccessrules="false" kind="src" path="/Forge"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="libs/industrialcraft-2-2.2.720-experimental-dev.jar"/> <classpathentry kind="lib" path="libs/gregtech_1.7.10-5.08.30-dev.jar"/> + <classpathentry kind="lib" path="libs/EnderIO-1.7.10-2.3.0.420_beta-dev.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index 662561fb57..cfb7944c8e 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -2,7 +2,6 @@ package miscutil; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.lang.reflect.InvocationTargetException; import miscutil.core.commands.CommandMath; import miscutil.core.common.CommonProxy; @@ -10,7 +9,6 @@ import miscutil.core.creativetabs.AddToCreativeTab; import miscutil.core.handler.CraftingManager; import miscutil.core.lib.Strings; import miscutil.core.util.Utils; -import miscutil.gregtech.enums.MaterialsNew; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -41,13 +39,13 @@ implements ActionListener @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - try { + /*try { MaterialsNew.getGregMaterials(); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { // TODO Auto-generated catch block e.printStackTrace(); - } + }*/ //java.lang.reflect.Array.get(Materials, index) Utils.LOG_INFO("Doing some house cleaning."); AddToCreativeTab.initialiseTabs(); diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index 86f36a6b9e..16475b2c68 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -1,6 +1,7 @@ package miscutil.core.block; -import static miscutil.core.creativetabs.AddToCreativeTab.tabBlock; +import miscutil.core.block.antigrief.TowerDevice; +import miscutil.core.creativetabs.AddToCreativeTab; import miscutil.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -13,6 +14,7 @@ public final class ModBlocks { public static Block blockStaballoy; public static Block blockToolBuilder; public static Block blockGriefSaver; + //public static Block blockBloodSteelChest; //BloodSteelorial Furnace @@ -32,6 +34,8 @@ public final class ModBlocks { public static void init() { Utils.LOG_INFO("Initializing Blocks."); + blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); + //BloodSteelorial Furnace - Must Init blocks first as they're not static. /** if (Strings.DEBUG){ FMLLog.info("Loading Furnace.");} @@ -89,8 +93,8 @@ public final class ModBlocks { //GameRegistry.registerBlock(emxBlockStorage, emxBlockStorage.getUnlocalizedName()); //blockGriefSaver Block - GameRegistry.registerBlock(blockGriefSaver = new AdvancedBlock("blockGriefSaver", Material.circuits, tabBlock, 2.0F, 10.0F, 0, "axe", 2, Block.soundTypeMetal), "blockGriefSaver"); - + //GameRegistry.registerBlock(blockGriefSaver = new AdvancedBlock("blockGriefSaver", Material.circuits, tabBlock, 2.0F, 10.0F, 0, "axe", 2, Block.soundTypeMetal), "blockGriefSaver"); + GameRegistry.registerBlock(blockGriefSaver, "blockGriefSaver"); } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/tileentities/ModTileEntities.java b/src/Java/miscutil/core/tileentities/ModTileEntities.java index 6126c5793e..4eead783c5 100644 --- a/src/Java/miscutil/core/tileentities/ModTileEntities.java +++ b/src/Java/miscutil/core/tileentities/ModTileEntities.java @@ -1,13 +1,15 @@ package miscutil.core.tileentities; import miscutil.core.util.Utils; +import cpw.mods.fml.common.registry.GameRegistry; public class ModTileEntities { public static void init(){ Utils.LOG_INFO("Registering Tile Entities."); - //GameRegistry.registerTileEntity(TileEntityStorage.class, "TE_Storage"); + //GameRegistry.registerTileEntity(TileEntityReverter.class, "TE_blockGriefSaver"); + GameRegistry.registerTileEntity(TileEntityReverter.class, "Tower Reverter"); } } |