aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-02-20 00:57:04 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-02-20 00:57:04 +1000
commit2d3e33a26084e068756852ee9d5de4d65ffd91ac (patch)
tree3fd479d2baa64158c323c33b5486cacfd4cd64d7 /src/Java
parente7d8f3dcfe82b5c56dea66c8a231f1a47b7a0f60 (diff)
downloadGT5-Unofficial-2d3e33a26084e068756852ee9d5de4d65ffd91ac.tar.gz
GT5-Unofficial-2d3e33a26084e068756852ee9d5de4d65ffd91ac.tar.bz2
GT5-Unofficial-2d3e33a26084e068756852ee9d5de4d65ffd91ac.zip
AntiGriefer Block basic implementation added.
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/miscutil/MiscUtils.java6
-rw-r--r--src/Java/miscutil/core/block/ModBlocks.java10
-rw-r--r--src/Java/miscutil/core/tileentities/ModTileEntities.java4
3 files changed, 12 insertions, 8 deletions
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");
}
}