diff options
Diffstat (limited to 'src/main/java/common/blocks')
20 files changed, 312 insertions, 251 deletions
diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java index abb9254f15..f588e9113b 100644 --- a/src/main/java/common/blocks/Block_ControlRod.java +++ b/src/main/java/common/blocks/Block_ControlRod.java @@ -2,28 +2,31 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry; import kekztech.KekzCore; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; public class Block_ControlRod extends BaseGTUpdateableBlock { - private static Block_ControlRod instance = new Block_ControlRod(); + private static Block_ControlRod instance; private Block_ControlRod() { super(Material.iron); } - public static Block_ControlRod getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ControlRod(); + } + final String blockName = "kekztech_controlrod_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod"); - super.setHardness(5.0f); - super.setResistance(6.0f); - GameRegistry.registerBlock(getInstance(), blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod"); + instance.setHardness(5.0f); + instance.setResistance(6.0f); + GameRegistry.registerBlock(instance, blockName); + + return instance; } } diff --git a/src/main/java/common/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java index ec493eba90..0857572121 100644 --- a/src/main/java/common/blocks/Block_GDCUnit.java +++ b/src/main/java/common/blocks/Block_GDCUnit.java @@ -2,29 +2,31 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry;
import kekztech.KekzCore;
+import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
public class Block_GDCUnit extends BaseGTUpdateableBlock {
- private static Block_GDCUnit instance = new Block_GDCUnit();
+ private static Block_GDCUnit instance;
private Block_GDCUnit() {
- // I am a singleton
super(Material.iron);
}
- public static Block_GDCUnit getInstance() {
- return instance;
- }
-
- public void registerBlock() {
+ public static Block registerBlock() {
+ if(instance == null) {
+ instance = new Block_GDCUnit();
+ }
+
final String blockName = "kekztech_gdcceramicelectrolyteunit_block";
- super.setBlockName(blockName);
- super.setCreativeTab(CreativeTabs.tabMisc);
- super.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");
- super.setHardness(5.0f);
- super.setResistance(6.0f);
- GameRegistry.registerBlock(getInstance(), blockName);
+ instance.setBlockName(blockName);
+ instance.setCreativeTab(CreativeTabs.tabMisc);
+ instance.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");
+ instance.setHardness(5.0f);
+ instance.setResistance(6.0f);
+ GameRegistry.registerBlock(instance, blockName);
+
+ return instance;
}
}
diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java index 7b795d2401..cd3df9aa04 100644 --- a/src/main/java/common/blocks/Block_IchorJar.java +++ b/src/main/java/common/blocks/Block_IchorJar.java @@ -9,6 +9,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import items.Item_IchorJarFilled; +import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -21,20 +22,22 @@ import thaumcraft.common.blocks.BlockJar; public class Block_IchorJar extends BlockJar { - private static Block_IchorJar instance = new Block_IchorJar(); + private static Block_IchorJar instance; private Block_IchorJar() { super(); } - public static Block_IchorJar getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_IchorJar(); + } + final String blockName = "kekztech_ichorjar_block"; - super.setBlockName(blockName); - GameRegistry.registerBlock(getInstance(), blockName); + instance.setBlockName(blockName); + GameRegistry.registerBlock(instance, blockName); + + return instance; } @Override diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java index 5dffc4d60d..d7a4a2dcb2 100644 --- a/src/main/java/common/blocks/Block_ItemProxyCable.java +++ b/src/main/java/common/blocks/Block_ItemProxyCable.java @@ -4,32 +4,34 @@ import common.tileentities.TE_ItemProxyCable; import cpw.mods.fml.common.registry.GameRegistry; import itemBlocks.IB_ItemProxyCable; import kekztech.KekzCore; -import net.minecraft.block.BlockContainer; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class Block_ItemProxyCable extends BlockContainer { +public class Block_ItemProxyCable extends Block { - private static Block_ItemProxyCable instance = new Block_ItemProxyCable(); + private static Block_ItemProxyCable instance; private Block_ItemProxyCable() { super(Material.glass); } - public static Block_ItemProxyCable getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ItemProxyCable(); + } + final String blockName = "kekztech_itemproxycable_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing"); - super.setHardness(3.0f); - super.setResistance(2.0f); - GameRegistry.registerBlock(getInstance(), IB_ItemProxyCable.class, blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing"); + instance.setHardness(3.0f); + instance.setResistance(2.0f); + GameRegistry.registerBlock(instance, IB_ItemProxyCable.class, blockName); + + return instance; } @Override @@ -38,8 +40,13 @@ public class Block_ItemProxyCable extends BlockContainer { } @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { + public TileEntity createTileEntity(World world, int p_149915_2_) { return new TE_ItemProxyCable(); } + @Override + public boolean hasTileEntity(int metadata) { + return true; + } + } diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java index 91d4ef5d29..d2fdea8029 100644 --- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java +++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java @@ -8,7 +8,7 @@ import itemBlocks.IB_ItemProxyEndpoint; import items.Item_Configurator; import kekztech.GuiHandler; import kekztech.KekzCore; -import net.minecraft.block.BlockContainer; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -16,26 +16,28 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class Block_ItemProxyEndpoint extends BlockContainer { +public class Block_ItemProxyEndpoint extends Block { - private static Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint(); + private static Block_ItemProxyEndpoint instance; private Block_ItemProxyEndpoint() { super(Material.glass); } - public static Block_ItemProxyEndpoint getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ItemProxyEndpoint(); + } + final String blockName = "kekztech_itemproxyendpoint_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint"); - super.setHardness(3.0f); - super.setResistance(2.0f); - GameRegistry.registerBlock(getInstance(), IB_ItemProxyEndpoint.class, blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint"); + instance.setHardness(3.0f); + instance.setResistance(2.0f); + GameRegistry.registerBlock(instance, IB_ItemProxyEndpoint.class, blockName); + + return instance; } @Override @@ -62,8 +64,13 @@ public class Block_ItemProxyEndpoint extends BlockContainer { } @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { + public TileEntity createTileEntity(World world, int p_149915_2_) { return new TE_ItemProxyEndpoint(); } + @Override + public boolean hasTileEntity(int metadata) { + return true; + } + }
\ No newline at end of file diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java index 0158ae57e9..715a6e2bdf 100644 --- a/src/main/java/common/blocks/Block_ItemProxySource.java +++ b/src/main/java/common/blocks/Block_ItemProxySource.java @@ -6,7 +6,7 @@ import itemBlocks.IB_ItemProxySource; import items.Item_Configurator; import kekztech.GuiHandler; import kekztech.KekzCore; -import net.minecraft.block.BlockContainer; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,26 +15,28 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class Block_ItemProxySource extends BlockContainer { +public class Block_ItemProxySource extends Block { - private static Block_ItemProxySource instance = new Block_ItemProxySource(); + private static Block_ItemProxySource instance; private Block_ItemProxySource() { super(Material.glass); } - public static Block_ItemProxySource getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ItemProxySource(); + } + final String blockName = "kekztech_itemproxysource_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource"); - super.setHardness(3.0f); - super.setResistance(2.0f); - GameRegistry.registerBlock(getInstance(), IB_ItemProxySource.class, blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource"); + instance.setHardness(3.0f); + instance.setResistance(2.0f); + GameRegistry.registerBlock(instance, IB_ItemProxySource.class, blockName); + + return instance; } @Override @@ -62,8 +64,13 @@ public class Block_ItemProxySource extends BlockContainer { } @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { + public TileEntity createTileEntity(World world, int p_149915_2_) { return new TE_ItemProxySource(); } + @Override + public boolean hasTileEntity(int metadata) { + return true; + } + } diff --git a/src/main/java/common/blocks/Block_ItemServerDrive.java b/src/main/java/common/blocks/Block_ItemServerDrive.java index e35cc220db..38b54da41a 100644 --- a/src/main/java/common/blocks/Block_ItemServerDrive.java +++ b/src/main/java/common/blocks/Block_ItemServerDrive.java @@ -3,6 +3,7 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry; import itemBlocks.IB_ItemServerDrive; import kekztech.KekzCore; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -10,26 +11,27 @@ import net.minecraft.util.IIcon; public class Block_ItemServerDrive extends BaseGTUpdateableBlock{ - private static Block_ItemServerDrive instance = new Block_ItemServerDrive(); + private static Block_ItemServerDrive instance; private IIcon[] faces = new IIcon[6]; private Block_ItemServerDrive() { - // I am a singleton super(Material.iron); } - public static Block_ItemServerDrive getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ItemServerDrive(); + } + final String blockName = "kekztech_itemserverdrive_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setHardness(5.0f); - super.setResistance(6.0f); - GameRegistry.registerBlock(getInstance(), IB_ItemServerDrive.class, blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setHardness(5.0f); + instance.setResistance(6.0f); + GameRegistry.registerBlock(instance, IB_ItemServerDrive.class, blockName); + + return instance; } @Override diff --git a/src/main/java/common/blocks/Block_ItemServerIOPort.java b/src/main/java/common/blocks/Block_ItemServerIOPort.java index c7a3f4dce5..1b40ae89a3 100644 --- a/src/main/java/common/blocks/Block_ItemServerIOPort.java +++ b/src/main/java/common/blocks/Block_ItemServerIOPort.java @@ -4,6 +4,7 @@ import common.tileentities.TE_ItemServerIOPort; import cpw.mods.fml.common.registry.GameRegistry; import itemBlocks.IB_ItemServerIOPort; import kekztech.KekzCore; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.tileentity.TileEntity; @@ -11,25 +12,26 @@ import net.minecraft.world.World; public class Block_ItemServerIOPort extends BaseGTUpdateableBlock { - private static Block_ItemServerIOPort instance = new Block_ItemServerIOPort(); + private static Block_ItemServerIOPort instance; private Block_ItemServerIOPort() { - // I am a singleton super(Material.iron); } - public static Block_ItemServerIOPort getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ItemServerIOPort(); + } + final String blockName = "kekztech_itemserverioport_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "ItemServerIOPort"); - super.setHardness(5.0f); - super.setResistance(6.0f); - GameRegistry.registerBlock(getInstance(), IB_ItemServerIOPort.class, blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemServerIOPort"); + instance.setHardness(5.0f); + instance.setResistance(6.0f); + GameRegistry.registerBlock(instance, IB_ItemServerIOPort.class, blockName); + + return instance; } @Override diff --git a/src/main/java/common/blocks/Block_ItemServerRackCasing.java b/src/main/java/common/blocks/Block_ItemServerRackCasing.java index e12262538b..fbddd34315 100644 --- a/src/main/java/common/blocks/Block_ItemServerRackCasing.java +++ b/src/main/java/common/blocks/Block_ItemServerRackCasing.java @@ -3,30 +3,32 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry; import itemBlocks.IB_ItemServerRackCasing; import kekztech.KekzCore; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; public class Block_ItemServerRackCasing extends BaseGTUpdateableBlock { - private static Block_ItemServerRackCasing instance = new Block_ItemServerRackCasing(); + private static Block_ItemServerRackCasing instance; private Block_ItemServerRackCasing() { - // I am a singleton super(Material.iron); } - public static Block_ItemServerRackCasing getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ItemServerRackCasing(); + } + final String blockName = "kekztech_itemserverrackcasing_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "ItemServerRackCasing"); - super.setHardness(5.0f); - super.setResistance(6.0f); - GameRegistry.registerBlock(getInstance(), IB_ItemServerRackCasing.class, blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemServerRackCasing"); + instance.setHardness(5.0f); + instance.setResistance(6.0f); + GameRegistry.registerBlock(instance, IB_ItemServerRackCasing.class, blockName); + + return instance; } } diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java index ab14e1d56c..21f3c698e0 100644 --- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java +++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java @@ -2,29 +2,32 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry; import kekztech.KekzCore; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock { - private static Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF(); + private static Block_ReactorChamber_OFF instance; private Block_ReactorChamber_OFF() { super(Material.iron); } - public static Block_ReactorChamber_OFF getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ReactorChamber_OFF(); + } + final String blockName = "kekztech_reactorchamberoff_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_OFF"); - super.setHardness(10.0f); - super.setResistance(16.0f); - GameRegistry.registerBlock(getInstance(), blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_OFF"); + instance.setHardness(10.0f); + instance.setResistance(16.0f); + GameRegistry.registerBlock(instance, blockName); + + return instance; } } diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java index fa6db02c8e..4eb7fdadae 100644 --- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java +++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java @@ -2,29 +2,32 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry; import kekztech.KekzCore; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock { - private static Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON(); + private static Block_ReactorChamber_ON instance; private Block_ReactorChamber_ON() { super(Material.iron); } - public static Block_ReactorChamber_ON getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ReactorChamber_ON(); + } + final String blockName = "kekztech_reactorchamberon_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_ON"); - super.setHardness(-1.0f); - super.setResistance(16.0f); - GameRegistry.registerBlock(getInstance(), blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_ON"); + instance.setHardness(-1.0f); + instance.setResistance(16.0f); + GameRegistry.registerBlock(instance, blockName); + + return instance; } @Override diff --git a/src/main/java/common/blocks/Block_TFFTCasing.java b/src/main/java/common/blocks/Block_TFFTCasing.java index 86d4ed6182..96696c2ee9 100644 --- a/src/main/java/common/blocks/Block_TFFTCasing.java +++ b/src/main/java/common/blocks/Block_TFFTCasing.java @@ -2,29 +2,31 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry;
import kekztech.KekzCore;
+import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
public class Block_TFFTCasing extends BaseGTUpdateableBlock {
- private static Block_TFFTCasing instance = new Block_TFFTCasing();
+ private static Block_TFFTCasing instance;
private Block_TFFTCasing() {
- // I am a singleton
super(Material.iron);
}
- public static Block_TFFTCasing getInstance() {
- return instance;
- }
-
- public void registerBlock() {
+ public static Block registerBlock() {
+ if(instance == null) {
+ instance = new Block_TFFTCasing();
+ }
+
final String blockName = "kekztech_tfftcasingblock_block";
- super.setBlockName(blockName);
- super.setCreativeTab(CreativeTabs.tabMisc);
- super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
- super.setHardness(5.0f);
- super.setResistance(6.0f);
- GameRegistry.registerBlock(getInstance(), blockName);
+ instance.setBlockName(blockName);
+ instance.setCreativeTab(CreativeTabs.tabMisc);
+ instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
+ instance.setHardness(5.0f);
+ instance.setResistance(6.0f);
+ GameRegistry.registerBlock(instance, blockName);
+
+ return instance;
}
}
diff --git a/src/main/java/common/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java index c0cfab7777..0f26e7dc66 100644 --- a/src/main/java/common/blocks/Block_TFFTMultiHatch.java +++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java @@ -7,6 +7,7 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import itemBlocks.IB_TFFTMultiHatch; import kekztech.KekzCore; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,24 +16,26 @@ import net.minecraft.world.World; public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock { - private static Block_TFFTMultiHatch instance = new Block_TFFTMultiHatch(); + private static Block_TFFTMultiHatch instance; private Block_TFFTMultiHatch() { super(Material.iron); } - public static Block_TFFTMultiHatch getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_TFFTMultiHatch(); + } + final String blockName = "kekztech_tfftmultihatch_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTMultiHatch"); - super.setHardness(5.0f); - super.setResistance(6.0f); - GameRegistry.registerBlock(getInstance(), IB_TFFTMultiHatch.class, blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTMultiHatch"); + instance.setHardness(5.0f); + instance.setResistance(6.0f); + GameRegistry.registerBlock(instance, IB_TFFTMultiHatch.class, blockName); + + return instance; } @Override diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java index 3bc390ce91..e8e69d2850 100644 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java +++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java @@ -3,34 +3,36 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry;
import itemBlocks.IB_TFFTStorageFieldBlockT1;
import kekztech.KekzCore;
+import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
public class Block_TFFTStorageFieldBlockT1 extends BaseGTUpdateableBlock {
- private static Block_TFFTStorageFieldBlockT1 instance = new Block_TFFTStorageFieldBlockT1();
+ private static Block_TFFTStorageFieldBlockT1 instance;
private Block_TFFTStorageFieldBlockT1() {
- // I am a singleton
super(Material.iron);
}
- public static Block_TFFTStorageFieldBlockT1 getInstance() {
- return instance;
- }
-
public static int getCapacity() {
return 500000;
}
- public void registerBlock() {
+ public static Block registerBlock() {
+ if(instance == null) {
+ instance = new Block_TFFTStorageFieldBlockT1();
+ }
+
final String blockName = "kekztech_tfftstoragefieldblock1_block";
- super.setBlockName(blockName);
- super.setCreativeTab(CreativeTabs.tabMisc);
- super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock1");
- super.setHardness(5.0f);
- super.setResistance(6.0f);
- GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT1.class, blockName);
+ instance.setBlockName(blockName);
+ instance.setCreativeTab(CreativeTabs.tabMisc);
+ instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock1");
+ instance.setHardness(5.0f);
+ instance.setResistance(6.0f);
+ GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT1.class, blockName);
+
+ return instance;
}
}
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java index 7ba7f25a88..747c2cd1a9 100644 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java +++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java @@ -3,33 +3,35 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry;
import itemBlocks.IB_TFFTStorageFieldBlockT2;
import kekztech.KekzCore;
+import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
public class Block_TFFTStorageFieldBlockT2 extends BaseGTUpdateableBlock {
- private static Block_TFFTStorageFieldBlockT2 instance = new Block_TFFTStorageFieldBlockT2();
+ private static Block_TFFTStorageFieldBlockT2 instance;
private Block_TFFTStorageFieldBlockT2() {
- // I am a singleton
super(Material.iron);
}
- public static Block_TFFTStorageFieldBlockT2 getInstance() {
- return instance;
- }
-
public static int getCapacity() {
return 4000000;
}
- public void registerBlock() {
+ public static Block registerBlock() {
+ if(instance == null) {
+ instance = new Block_TFFTStorageFieldBlockT2();
+ }
+
final String blockName = "kekztech_tfftstoragefieldblock2_block";
- super.setBlockName(blockName);
- super.setCreativeTab(CreativeTabs.tabMisc);
- super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock2");
- super.setHardness(5.0f);
- super.setResistance(6.0f);
- GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT2.class, blockName);
+ instance.setBlockName(blockName);
+ instance.setCreativeTab(CreativeTabs.tabMisc);
+ instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock2");
+ instance.setHardness(5.0f);
+ instance.setResistance(6.0f);
+ GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT2.class, blockName);
+
+ return instance;
}
}
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java index 51741dc4fa..6b163d2b24 100644 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java +++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java @@ -3,33 +3,35 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry;
import itemBlocks.IB_TFFTStorageFieldBlockT3;
import kekztech.KekzCore;
+import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
public class Block_TFFTStorageFieldBlockT3 extends BaseGTUpdateableBlock {
- private static Block_TFFTStorageFieldBlockT3 instance = new Block_TFFTStorageFieldBlockT3();
+ private static Block_TFFTStorageFieldBlockT3 instance;
private Block_TFFTStorageFieldBlockT3() {
- // I am a singleton
super(Material.iron);
}
- public static Block_TFFTStorageFieldBlockT3 getInstance() {
- return instance;
- }
-
public static int getCapacity() {
return 16000000;
}
- public void registerBlock() {
+ public static Block registerBlock() {
+ if(instance == null) {
+ instance = new Block_TFFTStorageFieldBlockT3();
+ }
+
final String blockName = "kekztech_tfftstoragefieldblock3_block";
- super.setBlockName(blockName);
- super.setCreativeTab(CreativeTabs.tabMisc);
- super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock3");
- super.setHardness(5.0f);
- super.setResistance(6.0f);
- GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT3.class, blockName);
+ instance.setBlockName(blockName);
+ instance.setCreativeTab(CreativeTabs.tabMisc);
+ instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock3");
+ instance.setHardness(5.0f);
+ instance.setResistance(6.0f);
+ GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT3.class, blockName);
+
+ return instance;
}
}
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java index 9a2bb9e3be..e46686a86a 100644 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java +++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java @@ -3,33 +3,35 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry;
import itemBlocks.IB_TFFTStorageFieldBlockT4;
import kekztech.KekzCore;
+import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
public class Block_TFFTStorageFieldBlockT4 extends BaseGTUpdateableBlock {
- private static Block_TFFTStorageFieldBlockT4 instance = new Block_TFFTStorageFieldBlockT4();
+ private static Block_TFFTStorageFieldBlockT4 instance;
private Block_TFFTStorageFieldBlockT4() {
- // I am a singleton
super(Material.iron);
}
- public static Block_TFFTStorageFieldBlockT4 getInstance() {
- return instance;
- }
-
public static int getCapacity() {
return 64000000;
}
- public void registerBlock() {
+ public static Block registerBlock() {
+ if(instance == null) {
+ instance = new Block_TFFTStorageFieldBlockT4();
+ }
+
final String blockName = "kekztech_tfftstoragefieldblock4_block";
- super.setBlockName(blockName);
- super.setCreativeTab(CreativeTabs.tabMisc);
- super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock4");
- super.setHardness(5.0f);
- super.setResistance(6.0f);
- GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT4.class, blockName);
+ instance.setBlockName(blockName);
+ instance.setCreativeTab(CreativeTabs.tabMisc);
+ instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock4");
+ instance.setHardness(5.0f);
+ instance.setResistance(6.0f);
+ GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT4.class, blockName);
+
+ return instance;
}
}
diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java index 437e0454f8..b53de1dc8a 100644 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java +++ b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java @@ -3,33 +3,35 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry; import itemBlocks.IB_TFFTStorageFieldBlockT5; import kekztech.KekzCore; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; public class Block_TFFTStorageFieldBlockT5 extends BaseGTUpdateableBlock { - private static Block_TFFTStorageFieldBlockT5 instance = new Block_TFFTStorageFieldBlockT5(); + private static Block_TFFTStorageFieldBlockT5 instance; private Block_TFFTStorageFieldBlockT5() { - // I am a singleton super(Material.iron); } - public static Block_TFFTStorageFieldBlockT5 getInstance() { - return instance; - } - public static int getCapacity() { return 256000000; } - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_TFFTStorageFieldBlockT5(); + } + final String blockName = "kekztech_tfftstoragefieldblock5_block"; - super.setBlockName(blockName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock5"); - super.setHardness(5.0f); - super.setResistance(6.0f); - GameRegistry.registerBlock(getInstance(), IB_TFFTStorageFieldBlockT5.class, blockName); + instance.setBlockName(blockName); + instance.setCreativeTab(CreativeTabs.tabMisc); + instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock5"); + instance.setHardness(5.0f); + instance.setResistance(6.0f); + GameRegistry.registerBlock(instance, IB_TFFTStorageFieldBlockT5.class, blockName); + + return instance; } }
\ No newline at end of file diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java index 7811b67233..421e1d2c2b 100644 --- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java +++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java @@ -9,6 +9,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import items.Item_ThaumiumReinforcedJarFilled; +import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -21,20 +22,22 @@ import thaumcraft.common.blocks.BlockJar; public class Block_ThaumiumReinforcedJar extends BlockJar { - private static Block_ThaumiumReinforcedJar instance = new Block_ThaumiumReinforcedJar(); + private static Block_ThaumiumReinforcedJar instance; private Block_ThaumiumReinforcedJar() { super(); } - public static Block_ThaumiumReinforcedJar getInstance() { - return instance; - } - - public void registerBlock() { + public static Block registerBlock() { + if(instance == null) { + instance = new Block_ThaumiumReinforcedJar(); + } + final String blockName = "kekztech_thaumiumreinforcedjar_block"; - super.setBlockName(blockName); - GameRegistry.registerBlock(getInstance(), blockName); + instance.setBlockName(blockName); + GameRegistry.registerBlock(instance, blockName); + + return instance; } @Override diff --git a/src/main/java/common/blocks/Block_YSZUnit.java b/src/main/java/common/blocks/Block_YSZUnit.java index 60b5603a3e..760ebf3d48 100644 --- a/src/main/java/common/blocks/Block_YSZUnit.java +++ b/src/main/java/common/blocks/Block_YSZUnit.java @@ -2,29 +2,31 @@ package common.blocks; import cpw.mods.fml.common.registry.GameRegistry;
import kekztech.KekzCore;
+import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
public class Block_YSZUnit extends BaseGTUpdateableBlock {
- private static Block_YSZUnit instance = new Block_YSZUnit();
+ private static Block_YSZUnit instance;
private Block_YSZUnit() {
- // I am a singleton
super(Material.iron);
}
- public static Block_YSZUnit getInstance() {
- return instance;
- }
-
- public void registerBlock() {
+ public static Block registerBlock() {
+ if(instance == null) {
+ instance = new Block_YSZUnit();
+ }
+
final String blockName = "kekztech_yszceramicelectrolyteunit_block";
- super.setBlockName(blockName);
- super.setCreativeTab(CreativeTabs.tabMisc);
- super.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit");
- super.setHardness(5.0f);
- super.setResistance(6.0f);
- GameRegistry.registerBlock(getInstance(), blockName);
+ instance.setBlockName(blockName);
+ instance.setCreativeTab(CreativeTabs.tabMisc);
+ instance.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit");
+ instance.setHardness(5.0f);
+ instance.setResistance(6.0f);
+ GameRegistry.registerBlock(instance, blockName);
+
+ return instance;
}
}
|