diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-10-03 18:08:43 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-10-03 18:08:43 +1000 |
| commit | bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a (patch) | |
| tree | d345344fe061e07bca20357b18457c0b9fdf475b /src/Java/gtPlusPlus/core/block | |
| parent | e56e3fa33d84ca19a3fb0c5e72a60212f30660a7 (diff) | |
| download | GT5-Unofficial-bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a.tar.gz GT5-Unofficial-bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a.tar.bz2 GT5-Unofficial-bdb6fc4a5410d68cf517dbe90fa49cec45bbda5a.zip | |
% Gotta Re-merge these Changes with those made on my laptop.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/ModBlocks.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index e8334af98b..b7a2526e30 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -5,7 +5,6 @@ import gtPlusPlus.core.block.machine.Machine_Workbench; import gtPlusPlus.core.fluids.FluidRegistryHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; @@ -20,6 +19,7 @@ public final class ModBlocks { // WIP TODO public static Block blockToolBuilder; public static Block blockGriefSaver; public static Block blockCasingsMisc; + public static Block blockMetaTileEntity; public static Block blockHeliumGenerator; public static Block blockNHG; public static Block blockCharger; @@ -43,10 +43,6 @@ public final class ModBlocks { Utils.LOG_INFO("Registering Blocks."); GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect"); - - //Casing Blocks - blockCasingsMisc = new GregtechMetaCasingBlocks(); - //Fluids FluidRegistryHandler.registerFluids(); diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java index 92ba4a11cc..308413d81f 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java @@ -24,7 +24,8 @@ public class Machine_Workbench extends BlockContainer @SideOnly(Side.CLIENT) private IIcon textureFront; - public Machine_Workbench() + @SuppressWarnings("deprecation") + public Machine_Workbench() { super(Material.iron); this.setBlockName("blockWorkbenchGT"); |