diff options
Diffstat (limited to 'src/main')
27 files changed, 62 insertions, 1053 deletions
diff --git a/src/main/java/client/GTTexture.java b/src/main/java/client/GTTexture.java deleted file mode 100644 index 345bb8f790..0000000000 --- a/src/main/java/client/GTTexture.java +++ /dev/null @@ -1,43 +0,0 @@ -package client; - -import gregtech.api.GregTech_API; -import gregtech.api.interfaces.IIconContainer; -import kekztech.KekzCore; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -public class GTTexture implements IIconContainer, Runnable { - - public static final GTTexture TFFT_CASING = new GTTexture("blocks/TFFTCasing"); - public static final GTTexture MULTI_HATCH_OFF = new GTTexture("blocks/multi_hatch_off"); - public static final GTTexture MULTI_HATCH_ON = new GTTexture("blocks/multi_hatch_on"); - - private IIcon icon; - private final String iconName; - - private GTTexture(String iconName) { - this.iconName = iconName; - GregTech_API.sGTBlockIconload.add(this); - } - - @Override - public IIcon getIcon() { - return icon; - } - - @Override - public IIcon getOverlayIcon() { - return null; - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationBlocksTexture; - } - - @Override - public void run() { - icon = GregTech_API.sBlockIcons.registerIcon(KekzCore.MODID + ":" + iconName); - } -} diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index fb5b152f26..3bc8ddc9f9 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -9,14 +9,6 @@ public class Blocks { public static Block yszUnit; public static Block gdcUnit; - public static Block tfftCasing; - public static Block tfftStorageField1; - public static Block tfftStorageField2; - public static Block tfftStorageField3; - public static Block tfftStorageField4; - public static Block tfftStorageField5; - public static Block tfftMultiHatch; - public static Block tfftStorageField; public static Block reactorChamberOFF; @@ -64,14 +56,6 @@ public class Blocks { } private static void registerBlocks_TFFT() { - tfftCasing = Block_TFFTCasing.registerBlock(); - tfftStorageField1 = Block_TFFTStorageFieldBlockT1.registerBlock(); - tfftStorageField2 = Block_TFFTStorageFieldBlockT2.registerBlock(); - tfftStorageField3 = Block_TFFTStorageFieldBlockT3.registerBlock(); - tfftStorageField4 = Block_TFFTStorageFieldBlockT4.registerBlock(); - tfftStorageField5 = Block_TFFTStorageFieldBlockT5.registerBlock(); - tfftMultiHatch = Block_TFFTMultiHatch.registerBlock(); - tfftStorageField = Block_TFFTStorageField.registerBlock(); } diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 64b4036d88..8af826dd61 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -54,8 +54,8 @@ public class Recipes { private static void registerRecipes_TFFT() { - // Controller - final Object[] tfft_recipe = { + // TFFT Controller + GT_ModHandler.addCraftingRecipe(TileEntities.tfft.getStackForm(1), new Object[] { "HFH", "PVP", "CFC", @@ -69,92 +69,96 @@ public class Recipes { OrePrefixes.rotor.get(Materials.VibrantAlloy), 'C', OrePrefixes.circuit.get(Materials.Data) - }; - GT_ModHandler.addCraftingRecipe(TileEntities.tfft.getStackForm(1), tfft_recipe); + }); - // Blocks - final ItemStack[] tfftcasing = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - }; + // TFFT Casing GT_Values.RA.addAssemblerRecipe( - tfftcasing, + new ItemStack[] { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1) + }, FluidRegistry.getFluidStack("molten.polytetrafluoroethylene", 144), new ItemStack(Blocks.tfftStorageField, 1), 200, 256); - final ItemStack[] tfftstoragefield1 = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1), - ItemList.Electric_Pump_LV.get(1L) - }; + + // TFFTStorageField1 GT_Values.RA.addAssemblerRecipe( - tfftstoragefield1, + new ItemStack[] { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1), + ItemList.Electric_Pump_LV.get(1L) + }, FluidRegistry.getFluidStack("molten.glass", 144), new ItemStack(Blocks.tfftStorageField, 1, 1), 200, 256); - final ItemStack[] tfftstoragefield2 = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 4), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1), - ItemList.Electric_Pump_MV.get(1L) - }; + + // TFFTStorageField2 GT_Values.RA.addAssemblerRecipe( - tfftstoragefield2, + new ItemStack[] { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 4), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1), + ItemList.Electric_Pump_MV.get(1L) + }, FluidRegistry.getFluidStack("molten.plastic", 576), new ItemStack(Blocks.tfftStorageField, 1, 2), 200, 480); - final ItemStack[] tfftstoragefield3 = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1), - ItemList.Field_Generator_MV.get(1L), - ItemList.Electric_Pump_HV.get(2L) - }; + + // TFFTStorageField3 GT_Values.RA.addAssemblerRecipe( - tfftstoragefield3, + new ItemStack[] { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1), + ItemList.Field_Generator_MV.get(1L), + ItemList.Electric_Pump_HV.get(2L) + }, FluidRegistry.getFluidStack("molten.epoxid", 576), new ItemStack(Blocks.tfftStorageField, 1, 3), 300, 1920); - final ItemStack[] tfftstoragefield4 = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 4), - GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.NiobiumTitanium, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.TungstenSteel, 1), - ItemList.Field_Generator_HV.get(1L), - ItemList.Electric_Pump_EV.get(1L) - }; + + // TFFTStorageField4 GT_Values.RA.addAssemblerRecipe( - tfftstoragefield4, + new ItemStack[] { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 4), + GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.NiobiumTitanium, 1), + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.TungstenSteel, 1), + ItemList.Field_Generator_HV.get(1L), + ItemList.Electric_Pump_EV.get(1L) + }, FluidRegistry.getFluidStack("molten.epoxid", 1152), new ItemStack(Blocks.tfftStorageField, 1, 4), 400, 4098); - final ItemStack[] tfftstoragefield5 = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4), - GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Enderium, 1), - ItemList.Field_Generator_EV.get(1L), - ItemList.Electric_Pump_IV.get(1L) - }; + + // TFFTStorageField5 GT_Values.RA.addAssemblerRecipe( - tfftstoragefield5, + new ItemStack[] { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4), + GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Enderium, 1), + ItemList.Field_Generator_EV.get(1L), + ItemList.Electric_Pump_IV.get(1L) + }, FluidRegistry.getFluidStack("molten.epoxid", 1152), new ItemStack(Blocks.tfftStorageField, 1, 5), 400, 6147); - // Multi Hatch - final Object[] multihatch = { + + // TFFT Multi Hatch + GT_ModHandler.addCraftingRecipe(TileEntities.tfftHatch.getStackForm(1), new Object[] { "PRP", "UFU", "PRP", @@ -166,8 +170,7 @@ public class Recipes { ItemList.Electric_Pump_HV.get(1L), 'F', ItemList.Field_Generator_LV.get(1L) - }; - GT_ModHandler.addCraftingRecipe(TileEntities.tfftHatch.getStackForm(1), multihatch); + }); } private static void registerRecipes_SOFC() { diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java index 78f27db269..455bde0e63 100644 --- a/src/main/java/common/TileEntities.java +++ b/src/main/java/common/TileEntities.java @@ -19,7 +19,6 @@ public class TileEntities { public static GTMTE_TFFTHatch tfftHatch; public static void preInit() { - GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile"); // GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile"); // GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); // GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); diff --git a/src/main/java/common/blocks/Block_TFFTCasing.java b/src/main/java/common/blocks/Block_TFFTCasing.java deleted file mode 100644 index b6d793e7ec..0000000000 --- a/src/main/java/common/blocks/Block_TFFTCasing.java +++ /dev/null @@ -1,28 +0,0 @@ -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 Block_TFFTCasing() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_tfftcasingblock_block"; - 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 deleted file mode 100644 index 14d288b7bb..0000000000 --- a/src/main/java/common/blocks/Block_TFFTMultiHatch.java +++ /dev/null @@ -1,55 +0,0 @@ -package common.blocks; - -import common.itemBlocks.IB_TFFTMultiHatch; -import common.tileentities.TE_TFFTMultiHatch; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -@Deprecated -public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock { - - private static final Block_TFFTMultiHatch INSTANCE = new Block_TFFTMultiHatch(); - - private IIcon casing; - - private Block_TFFTMultiHatch() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_tfftmultihatch_block"; - INSTANCE.setBlockName(blockName); - INSTANCE.setCreativeTab(CreativeTabs.tabMisc); - INSTANCE.setHardness(5.0f); - INSTANCE.setResistance(6.0f); - GameRegistry.registerBlock(INSTANCE, IB_TFFTMultiHatch.class, blockName); - - return INSTANCE; - } - - @Override - public void registerBlockIcons(IIconRegister ir) { - casing = ir.registerIcon("kekztech:TFFTCasing"); - } - - @Override - public IIcon getIcon(int side, int meta) { - return casing; - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - return new TE_TFFTMultiHatch(); - } - - @Override - public boolean hasTileEntity(int meta) { - return true; - } -} diff --git a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java deleted file mode 100644 index e6e3649f3a..0000000000 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT1.java +++ /dev/null @@ -1,37 +0,0 @@ -package common.blocks; - -import common.itemBlocks.IB_TFFTStorageFieldBlockT1; -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_TFFTStorageFieldBlockT1 extends BaseGTUpdateableBlock { - - private static Block_TFFTStorageFieldBlockT1 instance; - - private Block_TFFTStorageFieldBlockT1() { - super(Material.iron); - } - - public static int getCapacity() { - return 500000; - } - - public static Block registerBlock() { - if (instance == null) { - instance = new Block_TFFTStorageFieldBlockT1(); - } - - final String blockName = "kekztech_tfftstoragefieldblock1_block"; - 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 deleted file mode 100644 index 2b3477f750..0000000000 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT2.java +++ /dev/null @@ -1,37 +0,0 @@ -package common.blocks; - -import common.itemBlocks.IB_TFFTStorageFieldBlockT2; -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_TFFTStorageFieldBlockT2 extends BaseGTUpdateableBlock { - - private static Block_TFFTStorageFieldBlockT2 instance; - - private Block_TFFTStorageFieldBlockT2() { - super(Material.iron); - } - - public static int getCapacity() { - return 4000000; - } - - public static Block registerBlock() { - if (instance == null) { - instance = new Block_TFFTStorageFieldBlockT2(); - } - - final String blockName = "kekztech_tfftstoragefieldblock2_block"; - 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 deleted file mode 100644 index 313b87d10f..0000000000 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT3.java +++ /dev/null @@ -1,37 +0,0 @@ -package common.blocks; - -import common.itemBlocks.IB_TFFTStorageFieldBlockT3; -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_TFFTStorageFieldBlockT3 extends BaseGTUpdateableBlock { - - private static Block_TFFTStorageFieldBlockT3 instance; - - private Block_TFFTStorageFieldBlockT3() { - super(Material.iron); - } - - public static int getCapacity() { - return 16000000; - } - - public static Block registerBlock() { - if (instance == null) { - instance = new Block_TFFTStorageFieldBlockT3(); - } - - final String blockName = "kekztech_tfftstoragefieldblock3_block"; - 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 deleted file mode 100644 index bdd0af8d2b..0000000000 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT4.java +++ /dev/null @@ -1,37 +0,0 @@ -package common.blocks; - -import common.itemBlocks.IB_TFFTStorageFieldBlockT4; -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_TFFTStorageFieldBlockT4 extends BaseGTUpdateableBlock { - - private static Block_TFFTStorageFieldBlockT4 instance; - - private Block_TFFTStorageFieldBlockT4() { - super(Material.iron); - } - - public static int getCapacity() { - return 64000000; - } - - public static Block registerBlock() { - if (instance == null) { - instance = new Block_TFFTStorageFieldBlockT4(); - } - - final String blockName = "kekztech_tfftstoragefieldblock4_block"; - 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 deleted file mode 100644 index c215fe3909..0000000000 --- a/src/main/java/common/blocks/Block_TFFTStorageFieldBlockT5.java +++ /dev/null @@ -1,37 +0,0 @@ -package common.blocks; - -import common.itemBlocks.IB_TFFTStorageFieldBlockT5; -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_TFFTStorageFieldBlockT5 extends BaseGTUpdateableBlock { - - private static Block_TFFTStorageFieldBlockT5 instance; - - private Block_TFFTStorageFieldBlockT5() { - super(Material.iron); - } - - public static int getCapacity() { - return 256000000; - } - - public static Block registerBlock() { - if (instance == null) { - instance = new Block_TFFTStorageFieldBlockT5(); - } - - final String blockName = "kekztech_tfftstoragefieldblock5_block"; - 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; - } -} diff --git a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java b/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java deleted file mode 100644 index 4e4da45b2d..0000000000 --- a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java +++ /dev/null @@ -1,37 +0,0 @@ -package common.itemBlocks; - -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -@Deprecated -public class IB_TFFTMultiHatch extends ItemBlock { - - public IB_TFFTMultiHatch(Block block) { - super(block); - } - - @Override - public int getMetadata(int meta) { - return meta; - } - - @Override - public boolean getHasSubtypes() { - return true; - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + "." + stack.getItemDamage(); - } - - @SuppressWarnings({"unchecked"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.0.desc")); - } -} diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java deleted file mode 100644 index adcf705bcb..0000000000 --- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT1.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.itemBlocks; - -import common.blocks.Block_TFFTStorageFieldBlockT1; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_TFFTStorageFieldBlockT1 extends ItemBlock { - - public IB_TFFTStorageFieldBlockT1(Block block) { - super(block); - } - - @SuppressWarnings({"unchecked"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc")); - lines.add("Capacity: " + Block_TFFTStorageFieldBlockT1.getCapacity() + "L"); - lines.add("Power Draw: +0.5EU/t"); - } -} diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java deleted file mode 100644 index 2ee7a632a7..0000000000 --- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT2.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.itemBlocks; - -import common.blocks.Block_TFFTStorageFieldBlockT2; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_TFFTStorageFieldBlockT2 extends ItemBlock { - - public IB_TFFTStorageFieldBlockT2(Block block) { - super(block); - } - - @SuppressWarnings({"unchecked"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc")); - lines.add("Capacity: " + Block_TFFTStorageFieldBlockT2.getCapacity() + "L"); - lines.add("Power Draw: +1EU/t"); - } -} diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java deleted file mode 100644 index 6305209bb3..0000000000 --- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT3.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.itemBlocks; - -import common.blocks.Block_TFFTStorageFieldBlockT3; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_TFFTStorageFieldBlockT3 extends ItemBlock { - - public IB_TFFTStorageFieldBlockT3(Block block) { - super(block); - } - - @SuppressWarnings({"unchecked"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc")); - lines.add("Capacity: " + Block_TFFTStorageFieldBlockT3.getCapacity() + "L"); - lines.add("Power Draw: +2EU/t"); - } -} diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java deleted file mode 100644 index f0ed537b66..0000000000 --- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT4.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.itemBlocks; - -import common.blocks.Block_TFFTStorageFieldBlockT4; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_TFFTStorageFieldBlockT4 extends ItemBlock { - - public IB_TFFTStorageFieldBlockT4(Block block) { - super(block); - } - - @SuppressWarnings({"unchecked"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc")); - lines.add("Capacity: " + Block_TFFTStorageFieldBlockT4.getCapacity() + "L"); - lines.add("Power Draw: +4EU/t"); - } -} diff --git a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java b/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java deleted file mode 100644 index 4913d791e0..0000000000 --- a/src/main/java/common/itemBlocks/IB_TFFTStorageFieldBlockT5.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.itemBlocks; - -import common.blocks.Block_TFFTStorageFieldBlockT5; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_TFFTStorageFieldBlockT5 extends ItemBlock { - - public IB_TFFTStorageFieldBlockT5(Block block) { - super(block); - } - - @SuppressWarnings({"unchecked"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_tfftstoragefieldblock1_block.0.desc")); - lines.add("Capacity: " + Block_TFFTStorageFieldBlockT5.getCapacity() + "L"); - lines.add("Power Draw: +8EU/t"); - } -} diff --git a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java deleted file mode 100644 index 2e55e600d3..0000000000 --- a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java +++ /dev/null @@ -1,112 +0,0 @@ -package common.tileentities; - -import kekztech.MultiFluidHandler; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - -@Deprecated -public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler { - - public static final int BASE_OUTPUT_PER_SECOND = 2000; // L/s - - private byte facings = 0x0; - - private MultiFluidHandler mfh; - private int tickCounter = 0; - private boolean autoOutput = false; - - public boolean hasFacingOnSide(byte side) { - final byte key = (byte) Math.pow(0x2, side); - return (facings & key) == key; - } - - public void setFacingToSide(byte side) { - facings = (byte) Math.pow(0x2, side); - } - - public void setMultiFluidHandler(MultiFluidHandler mfh) { - this.mfh = mfh; - } - - public void toggleAutoOutput() { - autoOutput = !autoOutput; - } - - public boolean isOutputting() { - return autoOutput; - } - - @Override - public void updateEntity() { - // Removed deprecated code - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - // Removed deprecated code - return 0; - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - // Removed deprecated code - return null; - } - - /** - * Drains fluid out of 0th internal tank. - * If the TFFT Controller contains an Integrated Circuit, drain fluid - * from the slot equal to the circuit configuration. - * - * @param from - * Orientation the fluid is drained to. - * @param maxDrain - * Maximum amount of fluid to drain. - * @param doDrain - * If false, drain will only be simulated. - * @return FluidStack representing the Fluid and amount that was (or would have been, if - * simulated) drained. - */ - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - // Removed deprecated code - return null; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - // Removed deprecated code - return false; - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - // Removed deprecated code - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - // Removed deprecated code - return null; - } - - @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); - nbt.setBoolean("autoOutput", autoOutput); - nbt.setByte("facings", facings); - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); - autoOutput = nbt.getBoolean("autoOutput"); - facings = nbt.getByte("facings"); - } -} diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java deleted file mode 100644 index 232931b6fc..0000000000 --- a/src/main/java/kekztech/MultiFluidHandler.java +++ /dev/null @@ -1,397 +0,0 @@ -package kekztech; - -import java.util.ArrayList; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidStack; - -public class MultiFluidHandler { - - private final FluidStack[] fluids; - private final int maxDistinctFluids; - private final int capacityPerFluid; - - private boolean locked = true; - private boolean doVoidExcess = false; - private byte fluidSelector = -1; - - public MultiFluidHandler(int maxDistinctFluids, int capacityPerFluid, FluidStack[] fluidsToAdd) { - this.maxDistinctFluids = maxDistinctFluids; - this.fluids = new FluidStack[maxDistinctFluids]; - if (fluidsToAdd != null) { - int tFluidLengt = (maxDistinctFluids < fluidsToAdd.length) ? maxDistinctFluids : fluidsToAdd.length; - for (int i = 0; i < tFluidLengt; i++) { - this.fluids[i] = fluidsToAdd[i]; - } - } - this.capacityPerFluid = capacityPerFluid; - } - - /** - * Initialize a new MultiFluidHandler object with the given parameters - * @param maxDistinctFluids - * How many different fluids can be stored - * @param capacityPerFluid - * How much capacity each fluid should have - * @param fluidsToAdd - * Fluids to add immediately - * @return - * A new instance - */ - public static MultiFluidHandler newInstance( - int maxDistinctFluids, int capacityPerFluid, FluidStack... fluidsToAdd) { - return new MultiFluidHandler(maxDistinctFluids, capacityPerFluid, fluidsToAdd); - } - - /** - * Deep copy a MultiFluidHandler instance with a new capacity - * @param toCopy - * The MultiFluidHandler that should be copied - * @param capacityPerFluid - * How much capacity each fluid should have - * @return - * A new instance - */ - public static MultiFluidHandler newAdjustedInstance(MultiFluidHandler toCopy, int capacityPerFluid) { - return new MultiFluidHandler(toCopy.maxDistinctFluids, capacityPerFluid, toCopy.fluids); - } - - /** - * Lock internal tanks in case T.F.F.T is not running. - * - * @param state - * Lock state. - */ - public void setLock(boolean state) { - locked = state; - } - - public void setDoVoidExcess(boolean doVoidExcess) { - this.doVoidExcess = doVoidExcess; - } - - /** - * Used to tell the MFH if a fluid is selected by - * an Integrated Circuit in the controller. - * If the Integrate Circuit configuration exceeds - * the number of stored fluid, the configuration will be ignored. - * - * @param fluidSelector - * Selected fluid or -1 if no fluid is selected - */ - public void setFluidSelector(byte fluidSelector) { - this.fluidSelector = fluidSelector < fluids.length ? fluidSelector : -1; - } - - /** - * - * @return - * Selected fluid or -1 if no fluid is selected - */ - public byte getSelectedFluid() { - return fluidSelector; - } - - public FluidStack[] getAllFluids() { - return fluids; - } - - public int getFluidPosistion(FluidStack aFluid) { - - for (int i = 0; i < fluids.length; i++) { - FluidStack tFluid = fluids[i]; - if (tFluid != null && tFluid.isFluidEqual(aFluid)) return i; - } - return -1; - } - - public boolean contains(FluidStack aFluid) { - if (locked) return false; - return getFluidPosistion(aFluid) >= 0; - } - - public int countFluids() { - int tCount = 0; - for (int i = 0; i < fluids.length; i++) { - if (fluids[i] != null) tCount++; - } - return tCount; - } - - public int getCapacity() { - return capacityPerFluid; - } - - public int getMaxDistinctFluids() { - return maxDistinctFluids; - } - - /** - * Returns a deep copy of the the FluidStack in the requested slot - * @param slot - * requested slot - * @return - * deep copy of the requested FluidStack - */ - public FluidStack getFluidCopy(int slot) { - if (slot >= fluids.length) return null; - if (!locked && fluids.length > 0 && slot >= 0 && slot < maxDistinctFluids) { - FluidStack tFluid = fluids[slot]; - if (tFluid != null) return tFluid.copy(); - } - return null; - } - - /** - * Returns the amount of different fluids currently stored. - * @return - * amount of different fluids currently stored (0-25) - */ - public int getDistinctFluids() { - int distinctFluids = 0; - for (FluidStack f : fluids) { - if (f != null) distinctFluids++; - } - return distinctFluids; - } - - /** - * Helper method to save a MultiFluidHandler to NBT data - * @param nbt - * The NBT Tag to write to - * @return - * Updated NBT Tag - */ - public NBTTagCompound saveNBTData(NBTTagCompound nbt) { - nbt = (nbt == null) ? new NBTTagCompound() : nbt; - - nbt.setInteger("capacityPerFluid", getCapacity()); - nbt.setInteger("maxDistinctFluids", this.maxDistinctFluids); - int c = 0; - for (FluidStack f : fluids) { - if (f == null) { - c++; - continue; - } - nbt.setTag(String.valueOf(c), f.writeToNBT(new NBTTagCompound())); - c++; - } - return nbt; - } - - /** - * Helper method to initialize a MultiFluidHandler from NBT data - * @param nbt - * The NBT Tag to read from - * @return - * A new Instance - */ - public static MultiFluidHandler loadNBTData(NBTTagCompound nbt) { - nbt = (nbt == null) ? new NBTTagCompound() : nbt; - - final int capacityPerFluid = nbt.getInteger("capacityPerFluid"); - final NBTTagCompound fluidsTag = (NBTTagCompound) nbt.getTag("fluids"); - int distinctFluids = nbt.getInteger("maxDistinctFluids"); - if (!nbt.hasKey("maxDistinctFluids")) distinctFluids = 25; // adding it so it doesent break on upgrading - final FluidStack[] loadedFluids = new FluidStack[distinctFluids]; - - if (fluidsTag != null) { - for (int i = 0; i < distinctFluids; i++) { - final NBTTagCompound fluidNBT = (NBTTagCompound) fluidsTag.getTag("" + i); - if (fluidNBT == null) { - loadedFluids[i] = null; - } else { - loadedFluids[i] = FluidStack.loadFluidStackFromNBT(fluidNBT); - } - } - } - return new MultiFluidHandler(distinctFluids, capacityPerFluid, loadedFluids); - } - - public ArrayList<String> getInfoData() { - final ArrayList<String> lines = new ArrayList<>(fluids.length); - lines.add(EnumChatFormatting.YELLOW + "Stored Fluids:" + EnumChatFormatting.RESET); - for (int i = 0; i < fluids.length; i++) { - FluidStack tFluid = fluids[i]; - if (tFluid == null) { - lines.add(i + " - " + "null" + ": " + "0" + "L (" + "0" + "%)"); - } else { - lines.add(i + " - " + tFluid.getLocalizedName() + ": " - + tFluid.amount + "L (" - + (Math.round(100.0f * tFluid.amount / getCapacity())) + "%)"); - } - } - - return lines; - } - - /** - * Fill fluid into a tank. - * - * @param push - * Fluid type and quantity to be inserted. - * @param doPush - * If false, fill will only be simulated. - * @return Amount of fluid that was (or would have been, if simulated) filled. - */ - public int pushFluid(FluidStack push, boolean doPush) { - if (locked) { - return 0; - } - int empty = getNullSlot(); - int fluidCount = countFluids(); - if (fluidCount >= maxDistinctFluids && !contains(push)) { - // Already contains 25 fluids and this isn't one of them - return 0; - } else if (empty < maxDistinctFluids && !contains(push)) { - // Add new fluid - final int fit = Math.min(getCapacity(), push.amount); - if (doPush) { - if (empty == -1) return 0; - else fluids[empty] = new FluidStack(push.getFluid(), fit); - } - // If doVoidExcess, pretend all of it fit - return doVoidExcess ? push.amount : fit; - } else { - // Add to existing fluids - int index = getFluidPosistion(push); - if (index < 0) return 0; - final FluidStack existing = fluids[index]; - final int fit = Math.min(getCapacity() - existing.amount, push.amount); - if (doPush) { - existing.amount += fit; - } - // If doVoidExcess, pretend all of it fit - return doVoidExcess ? push.amount : fit; - } - } - - public int getNullSlot() { - for (int i = 0; i < fluids.length; i++) { - if (fluids[i] == null) return i; - } - return -1; - } - - /** - * Fill fluid into the specified tank. - * - * @param push - * Fluid type and quantity to be inserted. - * @param slot - * Tank the fluid should go into. - * @param doPush - * If false, fill will only be simulated. - * @return Amount of fluid that was (or would have been, if simulated) filled. - */ - public int pushFluid(FluidStack push, int slot, boolean doPush) { - if (locked) { - return 0; - } - FluidStack tFluid = fluids[slot]; - if (slot < 0 || slot >= maxDistinctFluids) { - // Invalid slot - return 0; - } - if ((tFluid != null) && !tFluid.equals(push)) { - // Selected slot is taken by a non-matching fluid - return 0; - } else { - int fit = 0; - // Add to existing fluid - if (tFluid == null) { - fit = Math.min(getCapacity(), push.amount); - fluids[slot] = new FluidStack(push.getFluid(), fit); - } else { - fit = Math.min(getCapacity() - tFluid.amount, push.amount); - if (doPush) { - tFluid.amount += fit; - } - } - // If doVoidExcess, pretend all of it fit - return doVoidExcess ? push.amount : fit; - } - } - - /** - * Drains fluid out of the internal tanks. - * - * @param pull - * Fluid type and quantity to be pulled. - * @param doPull - * If false, drain will only be simulated. - * @return Amount of fluid that was (or would have been, if simulated) pulled. - */ - public int pullFluid(FluidStack pull, boolean doPull) { - if (locked) { - return 0; - } else { - int tIndex = getFluidPosistion(pull); - if (tIndex < 0) return 0; - FluidStack src = fluids[tIndex]; - final int rec = Math.min(pull.amount, src.amount); - if (doPull) { - src.amount -= rec; - } - if (src.amount == 0) { - fluids[tIndex] = null; - } - return rec; - } - } - - /** - * Drains fluid out of the specified internal tank. - * - * @param pull - * Fluid type and quantity to be pulled. - * @param slot - * Tank fluid should be drained from. - * @param doPull - * If false, drain will only be simulated. - * @return Amount of fluid that was (or would have been, if simulated) pulled. - */ - public int pullFluid(FluidStack pull, int slot, boolean doPull) { - if (locked || slot >= fluids.length) { - return 0; - } - if (slot < 0 || slot >= maxDistinctFluids) { - return 0; - } - FluidStack tFluid = fluids[slot]; - if (tFluid == null || !tFluid.equals(pull)) { - return 0; - } else { - final int rec = Math.min(pull.amount, tFluid.amount); - if (doPull) { - tFluid.amount -= rec; - } - if (tFluid.amount == 0) { - fluids[slot] = null; - } - return rec; - } - } - - /** - * Test whether the given fluid type and quantity can be inserted into the internal tanks. - * @param push - * Fluid type and quantity to be tested - * @return True if there is sufficient space - */ - public boolean couldPush(FluidStack push) { - if (locked) { - return false; - } - int tFluidIndex = getFluidPosistion(push); - int fluidCount = countFluids(); - if (fluidCount >= maxDistinctFluids && !contains(push)) { - return false; - } else if (fluidCount < maxDistinctFluids && !contains(push)) { - return Math.min(getCapacity(), push.amount) > 0; - } else { - final int remcap = getCapacity() - fluids[tFluidIndex].amount; - return doVoidExcess || (Math.min(remcap, push.amount) > 0); - } - } -} diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_off.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_off.png Binary files differdeleted file mode 100755 index 96ced7f091..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_off.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_on.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_on.png Binary files differdeleted file mode 100755 index 149c7c847e..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_on.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_off.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_off.png Binary files differdeleted file mode 100755 index 259826d921..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_off.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_on.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_on.png Binary files differdeleted file mode 100755 index ed5dd7610b..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_on.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_off.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_off.png Binary files differdeleted file mode 100755 index 30fbb78f34..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_off.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_on.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_on.png Binary files differdeleted file mode 100755 index be6c2a6856..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_on.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_off.png b/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_off.png Binary files differdeleted file mode 100644 index ae3108edad..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_off.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_on.png b/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_on.png Binary files differdeleted file mode 100644 index a1e931c3a2..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_on.png +++ /dev/null |
