diff options
Diffstat (limited to 'src/main/java')
5 files changed, 72 insertions, 38 deletions
diff --git a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java index 9a6aad0b5b..b49d287669 100644 --- a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java +++ b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java @@ -14,7 +14,7 @@ import net.minecraft.util.IIcon; public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock { - private static final Block_LapotronicEnergyUnit instance = new Block_LapotronicEnergyUnit(); + private static final Block_LapotronicEnergyUnit INSTANCE = new Block_LapotronicEnergyUnit(); private IIcon iconBaseSide; private IIcon iconBaseTop; @@ -36,13 +36,13 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock { public static Block registerBlock() { final String blockName = "kekztech_lapotronicenergyunit_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setHardness(5.0f); - instance.setResistance(6.0f); - GameRegistry.registerBlock(instance, IB_LapotronicEnergyUnit.class, blockName); - - return instance; + INSTANCE.setBlockName(blockName); + INSTANCE.setCreativeTab(CreativeTabs.tabMisc); + INSTANCE.setHardness(5.0f); + INSTANCE.setResistance(6.0f); + GameRegistry.registerBlock(INSTANCE, IB_LapotronicEnergyUnit.class, blockName); + + return INSTANCE; } @Override diff --git a/src/main/java/common/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java index be7b588fa5..e9e4230572 100644 --- a/src/main/java/common/blocks/Block_TFFTMultiHatch.java +++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java @@ -9,29 +9,58 @@ import gregtech.api.util.GT_Utility; import kekztech.KekzCore; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.World; +import java.util.List; + public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock { - private static Block_TFFTMultiHatch instance = new Block_TFFTMultiHatch(); - + private static final Block_TFFTMultiHatch INSTANCE = new Block_TFFTMultiHatch(); + + private final IIcon[] tieredTexture = new IIcon[3]; + private Block_TFFTMultiHatch() { super(Material.iron); } public static Block registerBlock() { final String blockName = "kekztech_tfftmultihatch_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTMultiHatch"); - instance.setHardness(5.0f); - instance.setResistance(6.0f); - GameRegistry.registerBlock(instance, IB_TFFTMultiHatch.class, blockName); + INSTANCE.setBlockName(blockName); + INSTANCE.setCreativeTab(CreativeTabs.tabMisc); + INSTANCE.setBlockTextureName(KekzCore.MODID + ":" + "TFFTMultiHatch"); + INSTANCE.setHardness(5.0f); + INSTANCE.setResistance(6.0f); + GameRegistry.registerBlock(INSTANCE, IB_TFFTMultiHatch.class, blockName); - return instance; + return INSTANCE; + } + + @Override + public void registerBlockIcons(IIconRegister ir) { + for(int i = 0; i < tieredTexture.length; i++) { + tieredTexture[i] = ir.registerIcon("kekztech:TFFTMultiHatch" + (i + 1)); + } + } + + @Override + @SuppressWarnings({"unchecked" }) + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + // HV, IV, ZPM + par3List.add(new ItemStack(par1, 1, 0)); + par3List.add(new ItemStack(par1, 1, 1)); + par3List.add(new ItemStack(par1, 1, 2)); + } + + @Override + public IIcon getIcon(int side, int meta) { + return tieredTexture[meta]; } @Override diff --git a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java b/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java index 38b8997f0f..c5ecdca46d 100644 --- a/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java +++ b/src/main/java/common/itemBlocks/IB_TFFTMultiHatch.java @@ -2,6 +2,7 @@ package common.itemBlocks; import java.util.List; +import common.tileentities.TE_TFFTMultiHatch; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -13,13 +14,31 @@ 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) { + final int outputPerSecond = (int) (TE_TFFTMultiHatch.BASE_OUTPUT_PER_SECOND * Math.pow(10, stack.getItemDamage())); + lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.0.desc")); lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.1.desc")); lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.2.desc")); - lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.3.desc")); + lines.add(StatCollector.translateToLocal("tile.kekztech_tfftmultihatch_block.3.desc" ) + + " " + outputPerSecond + "L/s"); } } diff --git a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java index 49ea5963a3..24d941b39b 100644 --- a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java +++ b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java @@ -12,7 +12,6 @@ import gregtech.api.objects.GT_RenderedTexture; import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; @@ -238,20 +237,6 @@ public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase { } @Override - public void saveNBTData(NBTTagCompound nbt) { - nbt = (nbt == null) ? new NBTTagCompound() : nbt; - - super.saveNBTData(nbt); - } - - @Override - public void loadNBTData(NBTTagCompound nbt) { - nbt = (nbt == null) ? new NBTTagCompound() : nbt; - - super.loadNBTData(nbt); - } - - @Override public boolean isGivingInformation() { return true; } diff --git a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java index c4f9451478..d387e4968d 100644 --- a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java +++ b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java @@ -16,7 +16,7 @@ import net.minecraftforge.fluids.IFluidHandler; public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler { - private static final int OUTPUT_PER_SECOND = 1000; // L/s + public static final int BASE_OUTPUT_PER_SECOND = 2000; // L/s private MultiFluidHandler mfh; private int tickCounter = 0; @@ -50,12 +50,13 @@ public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler { final TileEntity t = this.getWorldObj().getTileEntity( this.xCoord + d.offsetX, this.yCoord + d.offsetY, - this.zCoord + d.offsetZ); + this.zCoord + d.offsetZ + ); if(t instanceof IFluidHandler) { final IFluidHandler fh = (IFluidHandler) t; - + final int meta = t.getWorldObj().getBlockMetadata(t.xCoord, t.yCoord, t.zCoord); // Cycle through fluids final Iterator<FluidStack> volumes = mfh.getFluids().iterator(); while(volumes.hasNext()) { @@ -69,7 +70,7 @@ public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler { // Test how much can be output final FluidStack copy = volume.copy(); - copy.amount = Math.min(copy.amount, OUTPUT_PER_SECOND); + copy.amount = (int) Math.min(copy.amount, BASE_OUTPUT_PER_SECOND * Math.pow(10, meta)); // How much is drawn copy.amount = mfh.pullFluid(copy, false); |