From 4e465dffd1d289e6d5757929252e66cf0eee3249 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 20:14:42 +0200 Subject: moved blocks and TEs into 'common' package --- src/main/java/blocks/BaseGTUpdateableBlock.java | 29 -- src/main/java/blocks/Block_ControlRod.java | 29 -- src/main/java/blocks/Block_GDCUnit.java | 30 -- src/main/java/blocks/Block_IchorJar.java | 46 -- src/main/java/blocks/Block_ItemProxyCable.java | 45 -- src/main/java/blocks/Block_ItemProxyEndpoint.java | 69 --- src/main/java/blocks/Block_ItemProxySource.java | 69 --- src/main/java/blocks/Block_ItemServerDrive.java | 59 --- src/main/java/blocks/Block_ItemServerIOPort.java | 45 -- .../java/blocks/Block_ItemServerRackCasing.java | 32 -- src/main/java/blocks/Block_ReactorChamber_OFF.java | 30 -- src/main/java/blocks/Block_ReactorChamber_ON.java | 35 -- src/main/java/blocks/Block_TFFTCasing.java | 30 -- src/main/java/blocks/Block_TFFTMultiHatch.java | 63 --- .../java/blocks/Block_TFFTStorageFieldBlockT1.java | 36 -- .../java/blocks/Block_TFFTStorageFieldBlockT2.java | 35 -- .../java/blocks/Block_TFFTStorageFieldBlockT3.java | 35 -- .../java/blocks/Block_TFFTStorageFieldBlockT4.java | 35 -- .../java/blocks/Block_TFFTStorageFieldBlockT5.java | 35 -- .../java/blocks/Block_ThaumiumReinforcedJar.java | 90 ---- src/main/java/blocks/Block_YSZUnit.java | 30 -- .../java/common/blocks/BaseGTUpdateableBlock.java | 29 ++ src/main/java/common/blocks/Block_ControlRod.java | 29 ++ src/main/java/common/blocks/Block_GDCUnit.java | 30 ++ src/main/java/common/blocks/Block_IchorJar.java | 46 ++ .../java/common/blocks/Block_ItemProxyCable.java | 45 ++ .../common/blocks/Block_ItemProxyEndpoint.java | 69 +++ .../java/common/blocks/Block_ItemProxySource.java | 69 +++ .../java/common/blocks/Block_ItemServerDrive.java | 59 +++ .../java/common/blocks/Block_ItemServerIOPort.java | 45 ++ .../common/blocks/Block_ItemServerRackCasing.java | 32 ++ .../common/blocks/Block_ReactorChamber_OFF.java | 30 ++ .../common/blocks/Block_ReactorChamber_ON.java | 35 ++ src/main/java/common/blocks/Block_TFFTCasing.java | 30 ++ .../java/common/blocks/Block_TFFTMultiHatch.java | 63 +++ .../blocks/Block_TFFTStorageFieldBlockT1.java | 36 ++ .../blocks/Block_TFFTStorageFieldBlockT2.java | 35 ++ .../blocks/Block_TFFTStorageFieldBlockT3.java | 35 ++ .../blocks/Block_TFFTStorageFieldBlockT4.java | 35 ++ .../blocks/Block_TFFTStorageFieldBlockT5.java | 35 ++ .../common/blocks/Block_ThaumiumReinforcedJar.java | 90 ++++ src/main/java/common/blocks/Block_YSZUnit.java | 30 ++ .../tileentities/GTMTE_FluidMultiStorage.java | 552 +++++++++++++++++++++ .../java/common/tileentities/GTMTE_ItemServer.java | 405 +++++++++++++++ .../tileentities/GTMTE_ModularNuclearReactor.java | 247 +++++++++ .../common/tileentities/GTMTE_SOFuelCellMK1.java | 335 +++++++++++++ .../common/tileentities/GTMTE_SOFuelCellMK2.java | 335 +++++++++++++ src/main/java/common/tileentities/TE_IchorJar.java | 10 + .../common/tileentities/TE_ItemProxyCable.java | 77 +++ .../common/tileentities/TE_ItemProxyEndpoint.java | 204 ++++++++ .../common/tileentities/TE_ItemProxySource.java | 101 ++++ .../common/tileentities/TE_ItemServerIOPort.java | 132 +++++ .../common/tileentities/TE_TFFTMultiHatch.java | 219 ++++++++ .../tileentities/TE_ThaumiumReinforcedJar.java | 10 + .../itemBlocks/IB_TFFTStorageFieldBlockT1.java | 2 +- .../itemBlocks/IB_TFFTStorageFieldBlockT2.java | 2 +- .../itemBlocks/IB_TFFTStorageFieldBlockT3.java | 2 +- .../itemBlocks/IB_TFFTStorageFieldBlockT4.java | 2 +- .../itemBlocks/IB_TFFTStorageFieldBlockT5.java | 2 +- src/main/java/kekztech/KekzCore.java | 64 +-- src/main/java/render/ConduitRenderer.java | 2 +- .../java/tileentities/GTMTE_FluidMultiStorage.java | 551 -------------------- src/main/java/tileentities/GTMTE_ItemServer.java | 405 --------------- .../tileentities/GTMTE_ModularNuclearReactor.java | 247 --------- .../java/tileentities/GTMTE_SOFuelCellMK1.java | 335 ------------- .../java/tileentities/GTMTE_SOFuelCellMK2.java | 335 ------------- src/main/java/tileentities/TE_IchorJar.java | 10 - src/main/java/tileentities/TE_ItemProxyCable.java | 77 --- .../java/tileentities/TE_ItemProxyEndpoint.java | 204 -------- src/main/java/tileentities/TE_ItemProxySource.java | 101 ---- .../java/tileentities/TE_ItemServerIOPort.java | 132 ----- src/main/java/tileentities/TE_TFFTMultiHatch.java | 219 -------- .../tileentities/TE_ThaumiumReinforcedJar.java | 10 - 73 files changed, 3572 insertions(+), 3571 deletions(-) delete mode 100644 src/main/java/blocks/BaseGTUpdateableBlock.java delete mode 100644 src/main/java/blocks/Block_ControlRod.java delete mode 100644 src/main/java/blocks/Block_GDCUnit.java delete mode 100644 src/main/java/blocks/Block_IchorJar.java delete mode 100644 src/main/java/blocks/Block_ItemProxyCable.java delete mode 100644 src/main/java/blocks/Block_ItemProxyEndpoint.java delete mode 100644 src/main/java/blocks/Block_ItemProxySource.java delete mode 100644 src/main/java/blocks/Block_ItemServerDrive.java delete mode 100644 src/main/java/blocks/Block_ItemServerIOPort.java delete mode 100644 src/main/java/blocks/Block_ItemServerRackCasing.java delete mode 100644 src/main/java/blocks/Block_ReactorChamber_OFF.java delete mode 100644 src/main/java/blocks/Block_ReactorChamber_ON.java delete mode 100644 src/main/java/blocks/Block_TFFTCasing.java delete mode 100644 src/main/java/blocks/Block_TFFTMultiHatch.java delete mode 100644 src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java delete mode 100644 src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java delete mode 100644 src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java delete mode 100644 src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java delete mode 100644 src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java delete mode 100644 src/main/java/blocks/Block_ThaumiumReinforcedJar.java delete mode 100644 src/main/java/blocks/Block_YSZUnit.java create mode 100644 src/main/java/common/blocks/BaseGTUpdateableBlock.java create mode 100644 src/main/java/common/blocks/Block_ControlRod.java create mode 100644 src/main/java/common/blocks/Block_GDCUnit.java create mode 100644 src/main/java/common/blocks/Block_IchorJar.java create mode 100644 src/main/java/common/blocks/Block_ItemProxyCable.java create mode 100644 src/main/java/common/blocks/Block_ItemProxyEndpoint.java create mode 100644 src/main/java/common/blocks/Block_ItemProxySource.java create mode 100644 src/main/java/common/blocks/Block_ItemServerDrive.java create mode 100644 src/main/java/common/blocks/Block_ItemServerIOPort.java create mode 100644 src/main/java/common/blocks/Block_ItemServerRackCasing.java create mode 100644 src/main/java/common/blocks/Block_ReactorChamber_OFF.java create mode 100644 src/main/java/common/blocks/Block_ReactorChamber_ON.java create mode 100644 src/main/java/common/blocks/Block_TFFTCasing.java create mode 100644 src/main/java/common/blocks/Block_TFFTMultiHatch.java create mode 100644 src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java create mode 100644 src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java create mode 100644 src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java create mode 100644 src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java create mode 100644 src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java create mode 100644 src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java create mode 100644 src/main/java/common/blocks/Block_YSZUnit.java create mode 100644 src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java create mode 100644 src/main/java/common/tileentities/GTMTE_ItemServer.java create mode 100644 src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java create mode 100644 src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java create mode 100644 src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java create mode 100644 src/main/java/common/tileentities/TE_IchorJar.java create mode 100644 src/main/java/common/tileentities/TE_ItemProxyCable.java create mode 100644 src/main/java/common/tileentities/TE_ItemProxyEndpoint.java create mode 100644 src/main/java/common/tileentities/TE_ItemProxySource.java create mode 100644 src/main/java/common/tileentities/TE_ItemServerIOPort.java create mode 100644 src/main/java/common/tileentities/TE_TFFTMultiHatch.java create mode 100644 src/main/java/common/tileentities/TE_ThaumiumReinforcedJar.java delete mode 100644 src/main/java/tileentities/GTMTE_FluidMultiStorage.java delete mode 100644 src/main/java/tileentities/GTMTE_ItemServer.java delete mode 100644 src/main/java/tileentities/GTMTE_ModularNuclearReactor.java delete mode 100644 src/main/java/tileentities/GTMTE_SOFuelCellMK1.java delete mode 100644 src/main/java/tileentities/GTMTE_SOFuelCellMK2.java delete mode 100644 src/main/java/tileentities/TE_IchorJar.java delete mode 100644 src/main/java/tileentities/TE_ItemProxyCable.java delete mode 100644 src/main/java/tileentities/TE_ItemProxyEndpoint.java delete mode 100644 src/main/java/tileentities/TE_ItemProxySource.java delete mode 100644 src/main/java/tileentities/TE_ItemServerIOPort.java delete mode 100644 src/main/java/tileentities/TE_TFFTMultiHatch.java delete mode 100644 src/main/java/tileentities/TE_ThaumiumReinforcedJar.java (limited to 'src/main') diff --git a/src/main/java/blocks/BaseGTUpdateableBlock.java b/src/main/java/blocks/BaseGTUpdateableBlock.java deleted file mode 100644 index 5b49a1fb25..0000000000 --- a/src/main/java/blocks/BaseGTUpdateableBlock.java +++ /dev/null @@ -1,29 +0,0 @@ -package blocks; - - -import gregtech.api.GregTech_API; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.world.World; - -public abstract class BaseGTUpdateableBlock extends Block { - - protected BaseGTUpdateableBlock(Material p_i45394_1_) { - super(p_i45394_1_); - GregTech_API.registerMachineBlock(this, -1); - } - - @Override - public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); - } - } - - @Override - public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); - } - } -} diff --git a/src/main/java/blocks/Block_ControlRod.java b/src/main/java/blocks/Block_ControlRod.java deleted file mode 100644 index a31c6e2981..0000000000 --- a/src/main/java/blocks/Block_ControlRod.java +++ /dev/null @@ -1,29 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -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 Block_ControlRod() { - super(Material.iron); - } - - public static Block_ControlRod getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } -} diff --git a/src/main/java/blocks/Block_GDCUnit.java b/src/main/java/blocks/Block_GDCUnit.java deleted file mode 100644 index 9dbad68d45..0000000000 --- a/src/main/java/blocks/Block_GDCUnit.java +++ /dev/null @@ -1,30 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -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 Block_GDCUnit() { - // I am a singleton - super(Material.iron); - } - - public static Block_GDCUnit getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } -} diff --git a/src/main/java/blocks/Block_IchorJar.java b/src/main/java/blocks/Block_IchorJar.java deleted file mode 100644 index bc046ae3b4..0000000000 --- a/src/main/java/blocks/Block_IchorJar.java +++ /dev/null @@ -1,46 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import thaumcraft.common.blocks.BlockJar; -import tileentities.TE_IchorJar; - -public class Block_IchorJar extends BlockJar { - - private static Block_IchorJar instance = new Block_IchorJar(); - - private Block_IchorJar() { - super(); - } - - public static Block_IchorJar getInstance() { - return instance; - } - - public void registerBlock() { - final String blockName = "kekztech_ichorjar_block"; - super.setBlockName(blockName); - GameRegistry.registerBlock(getInstance(), blockName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister ir) { - super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow"); - super.iconJarSide = ir.registerIcon("kekztech:ichor_jar_side"); - super.iconJarTop = ir.registerIcon("kekztech:ichor_jar_top"); - super.iconJarTopVoid = ir.registerIcon("kekztech:ichor_jar_top_void"); - super.iconJarSideVoid = ir.registerIcon("kekztech:jar_side_void"); - super.iconJarBottom = ir.registerIcon("kekztech:ichor_jar_bottom"); - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - return new TE_IchorJar(); - } - -} diff --git a/src/main/java/blocks/Block_ItemProxyCable.java b/src/main/java/blocks/Block_ItemProxyCable.java deleted file mode 100644 index dee566bab7..0000000000 --- a/src/main/java/blocks/Block_ItemProxyCable.java +++ /dev/null @@ -1,45 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_ItemProxyCable; -import kekztech.KekzCore; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import tileentities.TE_ItemProxyCable; - -public class Block_ItemProxyCable extends BlockContainer { - - private static Block_ItemProxyCable instance = new Block_ItemProxyCable(); - - private Block_ItemProxyCable() { - super(Material.glass); - } - - public static Block_ItemProxyCable getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TE_ItemProxyCable(); - } - -} diff --git a/src/main/java/blocks/Block_ItemProxyEndpoint.java b/src/main/java/blocks/Block_ItemProxyEndpoint.java deleted file mode 100644 index 762880c877..0000000000 --- a/src/main/java/blocks/Block_ItemProxyEndpoint.java +++ /dev/null @@ -1,69 +0,0 @@ -package blocks; - -import java.util.UUID; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_ItemProxyEndpoint; -import items.Item_Configurator; -import kekztech.GuiHandler; -import kekztech.KekzCore; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import tileentities.TE_ItemProxyEndpoint; - -public class Block_ItemProxyEndpoint extends BlockContainer { - - private static Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint(); - - private Block_ItemProxyEndpoint() { - super(Material.glass); - } - - public static Block_ItemProxyEndpoint getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) { - if(world.isRemote) { - return true; - } - - final TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TE_ItemProxyEndpoint) { - final TE_ItemProxyEndpoint endpoint = (TE_ItemProxyEndpoint) te; - if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof Item_Configurator) { - - final ItemStack held = player.inventory.getCurrentItem(); - if(held.hasTagCompound() && held.getTagCompound().hasKey("config")) { - endpoint.setChannel(UUID.fromString(held.getTagCompound().getString("config"))); - } - } else { - player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_ENDPOINT, world, x, y, z); - } - return true; - } - return false; - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TE_ItemProxyEndpoint(); - } - -} \ No newline at end of file diff --git a/src/main/java/blocks/Block_ItemProxySource.java b/src/main/java/blocks/Block_ItemProxySource.java deleted file mode 100644 index b2cdd4a656..0000000000 --- a/src/main/java/blocks/Block_ItemProxySource.java +++ /dev/null @@ -1,69 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_ItemProxySource; -import items.Item_Configurator; -import kekztech.GuiHandler; -import kekztech.KekzCore; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import tileentities.TE_ItemProxySource; - -public class Block_ItemProxySource extends BlockContainer { - - private static Block_ItemProxySource instance = new Block_ItemProxySource(); - - private Block_ItemProxySource() { - super(Material.glass); - } - - public static Block_ItemProxySource getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) { - if(world.isRemote) { - return true; - } - - final TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TE_ItemProxySource) { - final TE_ItemProxySource source = (TE_ItemProxySource) te; - if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof Item_Configurator) { - - final NBTTagCompound configNBT = new NBTTagCompound(); - configNBT.setString("config", source.getChannel().toString()); - final ItemStack held = player.inventory.getCurrentItem(); - held.setTagCompound(configNBT); - - } else { - player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_SOURCE, world, x, y, z); - } - return true; - } - return false; - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TE_ItemProxySource(); - } - -} diff --git a/src/main/java/blocks/Block_ItemServerDrive.java b/src/main/java/blocks/Block_ItemServerDrive.java deleted file mode 100644 index e2d521424b..0000000000 --- a/src/main/java/blocks/Block_ItemServerDrive.java +++ /dev/null @@ -1,59 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_ItemServerDrive; -import kekztech.KekzCore; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.IIcon; - -public class Block_ItemServerDrive extends BaseGTUpdateableBlock{ - - private static Block_ItemServerDrive instance = new Block_ItemServerDrive(); - - 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() { - 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); - } - - @Override - public void registerBlockIcons(IIconRegister reg) { - for(int i = 0; i < 6; i++) { - if(i == 0) { - faces[i] = reg.registerIcon(KekzCore.MODID + ":" + "ItemServerDrive_BOTTOM"); - } else if(i == 1) { - faces[i] = reg.registerIcon(KekzCore.MODID + ":" + "ItemServerDrive_TOP"); - } else { - faces[i] = reg.registerIcon(KekzCore.MODID + ":" + "ItemServerDrive"); - } - - } - } - - @Override - public IIcon getIcon(int side, int meta) { - return faces[side]; - } - - @Override - public int getLightValue() { - return 7; - } - -} diff --git a/src/main/java/blocks/Block_ItemServerIOPort.java b/src/main/java/blocks/Block_ItemServerIOPort.java deleted file mode 100644 index e53ebe2859..0000000000 --- a/src/main/java/blocks/Block_ItemServerIOPort.java +++ /dev/null @@ -1,45 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_ItemServerIOPort; -import kekztech.KekzCore; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import tileentities.TE_ItemServerIOPort; - -public class Block_ItemServerIOPort extends BaseGTUpdateableBlock { - - private static Block_ItemServerIOPort instance = new Block_ItemServerIOPort(); - - private Block_ItemServerIOPort() { - // I am a singleton - super(Material.iron); - } - - public static Block_ItemServerIOPort getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } - - @Override - public boolean hasTileEntity(int metadata) { - return true; - } - - @Override - public TileEntity createTileEntity(World world, int metadata) { - return new TE_ItemServerIOPort(); - } - -} diff --git a/src/main/java/blocks/Block_ItemServerRackCasing.java b/src/main/java/blocks/Block_ItemServerRackCasing.java deleted file mode 100644 index fe57f2da85..0000000000 --- a/src/main/java/blocks/Block_ItemServerRackCasing.java +++ /dev/null @@ -1,32 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_ItemServerRackCasing; -import kekztech.KekzCore; -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 Block_ItemServerRackCasing() { - // I am a singleton - super(Material.iron); - } - - public static Block_ItemServerRackCasing getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } - -} diff --git a/src/main/java/blocks/Block_ReactorChamber_OFF.java b/src/main/java/blocks/Block_ReactorChamber_OFF.java deleted file mode 100644 index 86b4b63445..0000000000 --- a/src/main/java/blocks/Block_ReactorChamber_OFF.java +++ /dev/null @@ -1,30 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -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 Block_ReactorChamber_OFF() { - super(Material.iron); - } - - public static Block_ReactorChamber_OFF getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } - -} diff --git a/src/main/java/blocks/Block_ReactorChamber_ON.java b/src/main/java/blocks/Block_ReactorChamber_ON.java deleted file mode 100644 index 621ffb99eb..0000000000 --- a/src/main/java/blocks/Block_ReactorChamber_ON.java +++ /dev/null @@ -1,35 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -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 Block_ReactorChamber_ON() { - super(Material.iron); - } - - public static Block_ReactorChamber_ON getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } - - @Override - public int getLightValue() { - return 15; - } - -} diff --git a/src/main/java/blocks/Block_TFFTCasing.java b/src/main/java/blocks/Block_TFFTCasing.java deleted file mode 100644 index df6626894d..0000000000 --- a/src/main/java/blocks/Block_TFFTCasing.java +++ /dev/null @@ -1,30 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -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 Block_TFFTCasing() { - // I am a singleton - super(Material.iron); - } - - public static Block_TFFTCasing getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } -} diff --git a/src/main/java/blocks/Block_TFFTMultiHatch.java b/src/main/java/blocks/Block_TFFTMultiHatch.java deleted file mode 100644 index 8b8c195335..0000000000 --- a/src/main/java/blocks/Block_TFFTMultiHatch.java +++ /dev/null @@ -1,63 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import itemBlocks.IB_TFFTMultiHatch; -import kekztech.KekzCore; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import tileentities.TE_TFFTMultiHatch; - -public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock { - - private static Block_TFFTMultiHatch instance = new Block_TFFTMultiHatch(); - - private Block_TFFTMultiHatch() { - super(Material.iron); - } - - public static Block_TFFTMultiHatch getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } - - @Override - public TileEntity createTileEntity(World world, int p_149915_2_) { - return new TE_TFFTMultiHatch(); - } - - @Override - public boolean hasTileEntity(int metadata) { - return true; - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { - // Code block taken from GregTech's BaseMetaTileEntity.class - if (GT_Utility.isStackInList(player.getHeldItem(), GregTech_API.sScrewdriverList)) { - if (GT_ModHandler.damageOrDechargeItem(player.getHeldItem(), 1, 200, player)) { - final TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TE_TFFTMultiHatch) { - ((TE_TFFTMultiHatch) te).toggleAutoOutput(); - GT_Utility.sendSoundToPlayers(world, (String) GregTech_API.sSoundList.get(100), 1.0F, -1.0F, x, y, z); - } - } - return true; - } - return false; - } -} diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java deleted file mode 100644 index cfb40282fa..0000000000 --- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java +++ /dev/null @@ -1,36 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_TFFTStorageFieldBlockT1; -import kekztech.KekzCore; -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 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() { - 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); - } - -} diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java deleted file mode 100644 index afacd768c3..0000000000 --- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java +++ /dev/null @@ -1,35 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_TFFTStorageFieldBlockT2; -import kekztech.KekzCore; -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 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() { - 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); - } -} diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java deleted file mode 100644 index 389bb7a24c..0000000000 --- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java +++ /dev/null @@ -1,35 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_TFFTStorageFieldBlockT3; -import kekztech.KekzCore; -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 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() { - 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); - } -} diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java deleted file mode 100644 index f328b858a5..0000000000 --- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java +++ /dev/null @@ -1,35 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_TFFTStorageFieldBlockT4; -import kekztech.KekzCore; -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 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() { - 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); - } -} diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java deleted file mode 100644 index fd53051974..0000000000 --- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT5.java +++ /dev/null @@ -1,35 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import itemBlocks.IB_TFFTStorageFieldBlockT5; -import kekztech.KekzCore; -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 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() { - 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); - } -} \ No newline at end of file diff --git a/src/main/java/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/blocks/Block_ThaumiumReinforcedJar.java deleted file mode 100644 index 29736a14f9..0000000000 --- a/src/main/java/blocks/Block_ThaumiumReinforcedJar.java +++ /dev/null @@ -1,90 +0,0 @@ -package blocks; - -import java.util.ArrayList; - -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.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.blocks.BlockJar; -import thaumcraft.common.blocks.ItemJarFilled; -import thaumcraft.common.tiles.TileJarFillable; -import thaumcraft.common.tiles.TileJarFillableVoid; -import tileentities.TE_ThaumiumReinforcedJar; - -public class Block_ThaumiumReinforcedJar extends BlockJar { - - private static Block_ThaumiumReinforcedJar instance = new Block_ThaumiumReinforcedJar(); - - private Block_ThaumiumReinforcedJar() { - super(); - } - - public static Block_ThaumiumReinforcedJar getInstance() { - return instance; - } - - public void registerBlock() { - final String blockName = "kekztech_thaumiumreinforcedjar_block"; - super.setBlockName(blockName); - GameRegistry.registerBlock(getInstance(), blockName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister ir) { - super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow"); - super.iconJarSide = ir.registerIcon("kekztech:jar_side"); - super.iconJarTop = ir.registerIcon("kekztech:jar_top"); - super.iconJarTopVoid = ir.registerIcon("kekztech:jar_top_void"); - super.iconJarSideVoid = ir.registerIcon("kekztech:jar_side_void"); - super.iconJarBottom = ir.registerIcon("kekztech:jar_bottom"); - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - return new TE_ThaumiumReinforcedJar(); - } - - @Override - public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { - final ArrayList drops = new ArrayList<>(); - - TileEntity te; - ItemStack drop; - - te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TileJarFillable) { - drop = new ItemStack(Item_ThaumiumReinforcedJarFilled.getInstance()); - // Empty and no label - if(((TileJarFillable) te).amount <= 0 && ((TileJarFillable) te).aspectFilter == null) { - drop = new ItemStack(this); - } - // If is void jar, set meta - if(te instanceof TileJarFillableVoid) { - drop.setItemDamage(3); - } - // Non empty, generate filled jar item with contents - if(((TileJarFillable) te).amount > 0) { - ((ItemJarFilled) drop.getItem()).setAspects(drop, - (new AspectList()).add(((TileJarFillable) te).aspect, ((TileJarFillable) te).amount)); - } - // has label - if(((TileJarFillable) te).aspectFilter != null) { - if(!drop.hasTagCompound()) { - drop.setTagCompound(new NBTTagCompound()); - } - drop.stackTagCompound.setString("AspectFilter", ((TileJarFillable) te).aspectFilter.getTag()); - } - drops.add(drop); - } - return drops; - } - -} diff --git a/src/main/java/blocks/Block_YSZUnit.java b/src/main/java/blocks/Block_YSZUnit.java deleted file mode 100644 index 33ec67c5be..0000000000 --- a/src/main/java/blocks/Block_YSZUnit.java +++ /dev/null @@ -1,30 +0,0 @@ -package blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -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 Block_YSZUnit() { - // I am a singleton - super(Material.iron); - } - - public static Block_YSZUnit getInstance() { - return instance; - } - - public void registerBlock() { - 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); - } -} diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java new file mode 100644 index 0000000000..8ca9a31fc0 --- /dev/null +++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java @@ -0,0 +1,29 @@ +package common.blocks; + + +import gregtech.api.GregTech_API; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.world.World; + +public abstract class BaseGTUpdateableBlock extends Block { + + protected BaseGTUpdateableBlock(Material p_i45394_1_) { + super(p_i45394_1_); + GregTech_API.registerMachineBlock(this, -1); + } + + @Override + public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { + if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + } + } + + @Override + public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { + if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + } + } +} diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java new file mode 100644 index 0000000000..abb9254f15 --- /dev/null +++ b/src/main/java/common/blocks/Block_ControlRod.java @@ -0,0 +1,29 @@ +package common.blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +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 Block_ControlRod() { + super(Material.iron); + } + + public static Block_ControlRod getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } +} diff --git a/src/main/java/common/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java new file mode 100644 index 0000000000..ec493eba90 --- /dev/null +++ b/src/main/java/common/blocks/Block_GDCUnit.java @@ -0,0 +1,30 @@ +package common.blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +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 Block_GDCUnit() { + // I am a singleton + super(Material.iron); + } + + public static Block_GDCUnit getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } +} diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java new file mode 100644 index 0000000000..b5660f3d82 --- /dev/null +++ b/src/main/java/common/blocks/Block_IchorJar.java @@ -0,0 +1,46 @@ +package common.blocks; + +import common.tileentities.TE_IchorJar; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import thaumcraft.common.blocks.BlockJar; + +public class Block_IchorJar extends BlockJar { + + private static Block_IchorJar instance = new Block_IchorJar(); + + private Block_IchorJar() { + super(); + } + + public static Block_IchorJar getInstance() { + return instance; + } + + public void registerBlock() { + final String blockName = "kekztech_ichorjar_block"; + super.setBlockName(blockName); + GameRegistry.registerBlock(getInstance(), blockName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister ir) { + super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow"); + super.iconJarSide = ir.registerIcon("kekztech:ichor_jar_side"); + super.iconJarTop = ir.registerIcon("kekztech:ichor_jar_top"); + super.iconJarTopVoid = ir.registerIcon("kekztech:ichor_jar_top_void"); + super.iconJarSideVoid = ir.registerIcon("kekztech:jar_side_void"); + super.iconJarBottom = ir.registerIcon("kekztech:ichor_jar_bottom"); + } + + @Override + public TileEntity createTileEntity(World world, int meta) { + return new TE_IchorJar(); + } + +} diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java new file mode 100644 index 0000000000..5dffc4d60d --- /dev/null +++ b/src/main/java/common/blocks/Block_ItemProxyCable.java @@ -0,0 +1,45 @@ +package common.blocks; + +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.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class Block_ItemProxyCable extends BlockContainer { + + private static Block_ItemProxyCable instance = new Block_ItemProxyCable(); + + private Block_ItemProxyCable() { + super(Material.glass); + } + + public static Block_ItemProxyCable getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) { + return new TE_ItemProxyCable(); + } + +} diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java new file mode 100644 index 0000000000..91d4ef5d29 --- /dev/null +++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java @@ -0,0 +1,69 @@ +package common.blocks; + +import java.util.UUID; + +import common.tileentities.TE_ItemProxyEndpoint; +import cpw.mods.fml.common.registry.GameRegistry; +import itemBlocks.IB_ItemProxyEndpoint; +import items.Item_Configurator; +import kekztech.GuiHandler; +import kekztech.KekzCore; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class Block_ItemProxyEndpoint extends BlockContainer { + + private static Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint(); + + private Block_ItemProxyEndpoint() { + super(Material.glass); + } + + public static Block_ItemProxyEndpoint getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) { + if(world.isRemote) { + return true; + } + + final TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TE_ItemProxyEndpoint) { + final TE_ItemProxyEndpoint endpoint = (TE_ItemProxyEndpoint) te; + if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof Item_Configurator) { + + final ItemStack held = player.inventory.getCurrentItem(); + if(held.hasTagCompound() && held.getTagCompound().hasKey("config")) { + endpoint.setChannel(UUID.fromString(held.getTagCompound().getString("config"))); + } + } else { + player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_ENDPOINT, world, x, y, z); + } + return true; + } + return false; + } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) { + return new TE_ItemProxyEndpoint(); + } + +} \ 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 new file mode 100644 index 0000000000..0158ae57e9 --- /dev/null +++ b/src/main/java/common/blocks/Block_ItemProxySource.java @@ -0,0 +1,69 @@ +package common.blocks; + +import common.tileentities.TE_ItemProxySource; +import cpw.mods.fml.common.registry.GameRegistry; +import itemBlocks.IB_ItemProxySource; +import items.Item_Configurator; +import kekztech.GuiHandler; +import kekztech.KekzCore; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class Block_ItemProxySource extends BlockContainer { + + private static Block_ItemProxySource instance = new Block_ItemProxySource(); + + private Block_ItemProxySource() { + super(Material.glass); + } + + public static Block_ItemProxySource getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) { + if(world.isRemote) { + return true; + } + + final TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TE_ItemProxySource) { + final TE_ItemProxySource source = (TE_ItemProxySource) te; + if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof Item_Configurator) { + + final NBTTagCompound configNBT = new NBTTagCompound(); + configNBT.setString("config", source.getChannel().toString()); + final ItemStack held = player.inventory.getCurrentItem(); + held.setTagCompound(configNBT); + + } else { + player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_SOURCE, world, x, y, z); + } + return true; + } + return false; + } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) { + return new TE_ItemProxySource(); + } + +} diff --git a/src/main/java/common/blocks/Block_ItemServerDrive.java b/src/main/java/common/blocks/Block_ItemServerDrive.java new file mode 100644 index 0000000000..e35cc220db --- /dev/null +++ b/src/main/java/common/blocks/Block_ItemServerDrive.java @@ -0,0 +1,59 @@ +package common.blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import itemBlocks.IB_ItemServerDrive; +import kekztech.KekzCore; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.util.IIcon; + +public class Block_ItemServerDrive extends BaseGTUpdateableBlock{ + + private static Block_ItemServerDrive instance = new Block_ItemServerDrive(); + + 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() { + 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); + } + + @Override + public void registerBlockIcons(IIconRegister reg) { + for(int i = 0; i < 6; i++) { + if(i == 0) { + faces[i] = reg.registerIcon(KekzCore.MODID + ":" + "ItemServerDrive_BOTTOM"); + } else if(i == 1) { + faces[i] = reg.registerIcon(KekzCore.MODID + ":" + "ItemServerDrive_TOP"); + } else { + faces[i] = reg.registerIcon(KekzCore.MODID + ":" + "ItemServerDrive"); + } + + } + } + + @Override + public IIcon getIcon(int side, int meta) { + return faces[side]; + } + + @Override + public int getLightValue() { + return 7; + } + +} diff --git a/src/main/java/common/blocks/Block_ItemServerIOPort.java b/src/main/java/common/blocks/Block_ItemServerIOPort.java new file mode 100644 index 0000000000..c7a3f4dce5 --- /dev/null +++ b/src/main/java/common/blocks/Block_ItemServerIOPort.java @@ -0,0 +1,45 @@ +package common.blocks; + +import common.tileentities.TE_ItemServerIOPort; +import cpw.mods.fml.common.registry.GameRegistry; +import itemBlocks.IB_ItemServerIOPort; +import kekztech.KekzCore; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class Block_ItemServerIOPort extends BaseGTUpdateableBlock { + + private static Block_ItemServerIOPort instance = new Block_ItemServerIOPort(); + + private Block_ItemServerIOPort() { + // I am a singleton + super(Material.iron); + } + + public static Block_ItemServerIOPort getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } + + @Override + public boolean hasTileEntity(int metadata) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TE_ItemServerIOPort(); + } + +} diff --git a/src/main/java/common/blocks/Block_ItemServerRackCasing.java b/src/main/java/common/blocks/Block_ItemServerRackCasing.java new file mode 100644 index 0000000000..e12262538b --- /dev/null +++ b/src/main/java/common/blocks/Block_ItemServerRackCasing.java @@ -0,0 +1,32 @@ +package common.blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import itemBlocks.IB_ItemServerRackCasing; +import kekztech.KekzCore; +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 Block_ItemServerRackCasing() { + // I am a singleton + super(Material.iron); + } + + public static Block_ItemServerRackCasing getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } + +} diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java new file mode 100644 index 0000000000..ab14e1d56c --- /dev/null +++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java @@ -0,0 +1,30 @@ +package common.blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +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 Block_ReactorChamber_OFF() { + super(Material.iron); + } + + public static Block_ReactorChamber_OFF getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } + +} diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java new file mode 100644 index 0000000000..fa6db02c8e --- /dev/null +++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java @@ -0,0 +1,35 @@ +package common.blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +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 Block_ReactorChamber_ON() { + super(Material.iron); + } + + public static Block_ReactorChamber_ON getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } + + @Override + public int getLightValue() { + return 15; + } + +} diff --git a/src/main/java/common/blocks/Block_TFFTCasing.java b/src/main/java/common/blocks/Block_TFFTCasing.java new file mode 100644 index 0000000000..86d4ed6182 --- /dev/null +++ b/src/main/java/common/blocks/Block_TFFTCasing.java @@ -0,0 +1,30 @@ +package common.blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import kekztech.KekzCore; +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 Block_TFFTCasing() { + // I am a singleton + super(Material.iron); + } + + public static Block_TFFTCasing getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } +} diff --git a/src/main/java/common/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java new file mode 100644 index 0000000000..c0cfab7777 --- /dev/null +++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java @@ -0,0 +1,63 @@ +package common.blocks; + +import common.tileentities.TE_TFFTMultiHatch; +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.GregTech_API; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; +import itemBlocks.IB_TFFTMultiHatch; +import kekztech.KekzCore; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock { + + private static Block_TFFTMultiHatch instance = new Block_TFFTMultiHatch(); + + private Block_TFFTMultiHatch() { + super(Material.iron); + } + + public static Block_TFFTMultiHatch getInstance() { + return instance; + } + + public void registerBlock() { + 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); + } + + @Override + public TileEntity createTileEntity(World world, int p_149915_2_) { + return new TE_TFFTMultiHatch(); + } + + @Override +