diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index baf3899f..c012d3f4 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -181,6 +181,10 @@ tile.blockCombustionGenerator.tooltip.detailed.line2=Requires a coolant (e.g. wa tile.blockCombustionGenerator.tooltip.detailed.line3=Output dependent on fuel tile.blockFarmStation.name=Farming Station + +tile.blockTank.name=Fluid Tank +enderio.tank.tank=Tank + enderio.machine.tooltip.configured=(Configured) //Travel diff --git a/resources/assets/enderio/textures/blocks/blockTank.png b/resources/assets/enderio/textures/blocks/blockTank.png new file mode 100644 index 00000000..8b8e1740 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blockTank.png differ diff --git a/resources/assets/enderio/textures/gui/tank.png b/resources/assets/enderio/textures/gui/tank.png new file mode 100644 index 00000000..44f18f10 Binary files /dev/null and b/resources/assets/enderio/textures/gui/tank.png differ diff --git a/src/main/java/crazypants/enderio/enderface/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java similarity index 94% rename from src/main/java/crazypants/enderio/enderface/BlockEio.java rename to src/main/java/crazypants/enderio/BlockEio.java index b17c59e3..897072fa 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -1,4 +1,4 @@ -package crazypants.enderio.enderface; +package crazypants.enderio; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; @@ -7,8 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.Log; public abstract class BlockEio extends Block { diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 3c795421..65dbc80a 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -61,6 +61,8 @@ import crazypants.enderio.machine.reservoir.ReservoirRenderer; import crazypants.enderio.machine.reservoir.TileReservoir; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRenderer; +import crazypants.enderio.machine.tank.TankRenderer; +import crazypants.enderio.machine.tank.TileTank; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FusedQuartzFrameRenderer; import crazypants.enderio.material.FusedQuartzRenderer; @@ -195,6 +197,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderIo), eior); ClientRegistry.bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); + ClientRegistry.bindTileEntitySpecialRenderer(TileTank.class, new TankRenderer()); HyperCubeRenderer hcr = new HyperCubeRenderer(); ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index ab956f0f..a33ba602 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -70,6 +70,7 @@ import crazypants.enderio.machine.reservoir.BlockReservoir; import crazypants.enderio.machine.solar.BlockSolarPanel; import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRecipeManager; +import crazypants.enderio.machine.tank.BlockTank; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.ItemAlloy; @@ -145,6 +146,7 @@ public class EnderIO { public static BlockPowerMonitor blockPowerMonitor; public static BlockVat blockVat; public static BlockFarmStation blockFarmStation; + public static BlockTank blockTank; public static BlockElectricLight blockElectricLight; public static BlockLightNode blockLightNode; @@ -206,7 +208,7 @@ public class EnderIO { blockVat = BlockVat.create(); blockPowerMonitor = BlockPowerMonitor.create(); blockFarmStation = BlockFarmStation.create(); - blockCapacitorBank = BlockCapacitorBank.create(); + blockCapacitorBank = BlockCapacitorBank.create(); blockPainter = BlockPainter.create(); blockPaintedFence = BlockPaintedFence.create(); @@ -221,6 +223,7 @@ public class EnderIO { blockHyperCube = BlockHyperCube.create(); blockElectricLight = BlockElectricLight.create(); blockLightNode = BlockLightNode.create(); + blockTank = BlockTank.create(); blockReservoir = BlockReservoir.create(); blockFusedQuartz = BlockFusedQuartz.create(); diff --git a/src/main/java/crazypants/enderio/GuiHandler.java b/src/main/java/crazypants/enderio/GuiHandler.java index 215d4736..2206add3 100644 --- a/src/main/java/crazypants/enderio/GuiHandler.java +++ b/src/main/java/crazypants/enderio/GuiHandler.java @@ -35,6 +35,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUI_ID_STILL = 20; public static final int GUI_ID_COMBUSTION_GEN = 21; public static final int GUI_ID_FARM_STATATION = 22; + public static final int GUI_ID_TANK = 86; protected final Map guiHandlers = new HashMap(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 314f0208..c129f257 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -40,6 +40,7 @@ public enum ModObject { blockPowerMonitor, blockVat, blockFarmStation, + blockTank, blockElectricLight, blockLightNode, diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index e83d23d2..50169769 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -27,6 +27,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; @@ -42,7 +43,6 @@ import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; import crazypants.enderio.conduit.redstone.IRedstoneConduit; -import crazypants.enderio.enderface.BlockEio; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.render.BoundingBox; import crazypants.util.Util; diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 51ba1c6c..e7672730 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -1,5 +1,6 @@ package crazypants.enderio.enderface; +import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -12,6 +13,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; @@ -142,6 +144,10 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { return getUnlocalizedName(); } + public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { + super.breakBlock(world, x, y, z, block, p_149749_6_); + world.removeTileEntity(x, y, z); + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 904ea19b..cadaa5ac 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -317,9 +317,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi redstoneStateDirty = false; } - if(worldObj.getTotalWorldTime() % 20 == 0) { - requiresClientSync |= doSideIo(); - } + + requiresClientSync |= doSideIo(); + requiresClientSync |= prevRedCheck != redstoneCheckPassed; @@ -348,6 +348,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(faceModes == null) { return false; } + boolean res = false; Set> ents = faceModes.entrySet(); for(Entry ent : ents) { @@ -367,6 +368,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(slotDefinition.getNumOutputSlots() <= 0) { return false; } + if(worldObj.getWorldTime() % 20 != 0) { + return false; + } BlockCoord loc = getLocation().getLocation(dir); TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); @@ -398,6 +402,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(slotDefinition.getNumInputSlots() <= 0) { return false; } + if(worldObj.getWorldTime() % 20 != 0) { + return false; + } boolean hasSpace = false; for(int slot=slotDefinition.minInputSlot; slot <= slotDefinition.maxInputSlot && !hasSpace;slot++) { diff --git a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java index 9d9786a0..62e9f409 100644 --- a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java @@ -22,10 +22,8 @@ import crazypants.vecmath.Vector4f; public abstract class GuiMachineBase extends GuiContainerBase { - - public static final Vector4f PUSH_COLOR = new Vector4f(0.8f,0.4f,0.1f,0.5f); - public static final Vector4f PULL_COLOR = new Vector4f(0.1f,0.4f,0.8f,0.5f); - + public static final Vector4f PUSH_COLOR = new Vector4f(0.8f, 0.4f, 0.1f, 0.5f); + public static final Vector4f PULL_COLOR = new Vector4f(0.1f, 0.4f, 0.8f, 0.5f); protected static final int POWER_Y = 14; protected final int POWER_X = 15; @@ -36,7 +34,6 @@ public abstract class GuiMachineBase extends GuiContainerBase { public static final int BUTTON_SIZE = 16; private static final int CONFIG_ID = 8962349; - private AbstractMachineEntity tileEntity; private RedstoneModeButton redstoneButton; @@ -53,7 +50,7 @@ public abstract class GuiMachineBase extends GuiContainerBase { @Override protected void updateText() { text.clear(); - text.add("Max: " + PowerDisplayUtil.formatPower(tileEntity.getPowerUsePerTick()) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr()); + text.add("Max: " + PowerDisplayUtil.formatPower(tileEntity.getPowerUsePerTick()) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr()); //text.add() text.add(PowerDisplayUtil.formatStoredPower(tileEntity.getEnergyStored(), tileEntity.getCapacitor().getMaxEnergyStored())); @@ -84,24 +81,23 @@ public abstract class GuiMachineBase extends GuiContainerBase { return true; } - public void renderSlotHighlights(IoMode mode) { SlotDefinition slotDef = tileEntity.getSlotDefinition(); if(slotDef.getNumInputSlots() > 0 && (mode == IoMode.PULL || mode == IoMode.PUSH_PULL)) { for (int slot = slotDef.getMinInputSlot(); slot <= slotDef.getMaxInputSlot(); slot++) { - renderSlotHighlight(slot,PULL_COLOR); + renderSlotHighlight(slot, PULL_COLOR); } } if(slotDef.getNumOutputSlots() > 0 && (mode == IoMode.PUSH || mode == IoMode.PUSH_PULL)) { for (int slot = slotDef.getMinOutputSlot(); slot <= slotDef.getMaxOutputSlot(); slot++) { - renderSlotHighlight(slot,PUSH_COLOR); + renderSlotHighlight(slot, PUSH_COLOR); } } } protected void renderSlotHighlight(int slot, Vector4f col) { - Slot invSlot = (Slot)inventorySlots.inventorySlots.get(slot); - renderSlotHighlight(col, invSlot.xDisplayPosition,invSlot.yDisplayPosition,16,16); + Slot invSlot = (Slot) inventorySlots.inventorySlots.get(slot); + renderSlotHighlight(col, invSlot.xDisplayPosition, invSlot.yDisplayPosition, 16, 16); } protected void renderSlotHighlight(Vector4f col, int x, int y, int width, int height) { @@ -145,11 +141,14 @@ public abstract class GuiMachineBase extends GuiContainerBase { @Override protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int k = (width - xSize) / 2; int l = (height - ySize) / 2; - int i1 = tileEntity.getEnergyStoredScaled(getPowerHeight()); - // x, y, u, v, width, height - drawTexturedModalRect(k + getPowerX(), l + (getPowerY() + getPowerHeight()) - i1, 176, 31, getPowerWidth(), i1); + if(renderPowerBar()) { + int i1 = tileEntity.getEnergyStoredScaled(getPowerHeight()); + // x, y, u, v, width, height + drawTexturedModalRect(k + getPowerX(), l + (getPowerY() + getPowerHeight()) - i1, 176, 31, getPowerWidth(), i1); + } for (int i = 0; i < buttonList.size(); ++i) { GuiButton guibutton = (GuiButton) this.buttonList.get(i); @@ -157,7 +156,7 @@ public abstract class GuiMachineBase extends GuiContainerBase { } if(showRecipeButton()) { - IconEIO.RECIPE.renderIcon(k + 155, l + 43,16,16,0, true); + IconEIO.RECIPE.renderIcon(k + 155, l + 43, 16, 16, 0, true); } SelectedFace sel = configOverlay.getSelection(); @@ -168,7 +167,10 @@ public abstract class GuiMachineBase extends GuiContainerBase { } } + } + protected boolean renderPowerBar() { + return true; } } diff --git a/src/main/java/crazypants/enderio/machine/SlotDefinition.java b/src/main/java/crazypants/enderio/machine/SlotDefinition.java index 14068dd2..985f201d 100644 --- a/src/main/java/crazypants/enderio/machine/SlotDefinition.java +++ b/src/main/java/crazypants/enderio/machine/SlotDefinition.java @@ -72,7 +72,7 @@ public class SlotDefinition { } public int getNumSlots() { - return Math.max(Math.max(maxInputSlot, maxOutputSlot), maxUpgradeSlot) + 1; + return Math.max(Math.max(getMaxInputSlot(), getMaxOutputSlot()), getMaxUpgradeSlot()) + 1; } public int getMinUpgradeSlot() { diff --git a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java index 0142e46e..0206e105 100644 --- a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java @@ -16,6 +16,7 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.util.FluidUtil; import crazypants.util.Util; public class BlockCombustionGenerator extends AbstractMachineBlock { @@ -52,15 +53,7 @@ public class BlockCombustionGenerator extends AbstractMachineBlock= fluid.amount) { diff --git a/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java index a24597fe..51ed865c 100644 --- a/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/GuiCombustionGenerator.java @@ -158,13 +158,4 @@ public class GuiCombustionGenerator extends GuiMachineBase { return 60; } - public static class EmptyContainer extends Container { - - @Override - public boolean canInteractWith(EntityPlayer var1) { - return true; - } - - } - } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java index 6c5da419..12604a3a 100644 --- a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java @@ -138,16 +138,6 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL; } - @Override - public String getInventoryName() { - return ModObject.blockCombustionGenerator.unlocalisedName; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - @Override public String getMachineName() { return ModObject.blockCombustionGenerator.unlocalisedName; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index f7055bea..18d89316 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -21,11 +21,11 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.enderface.BlockEio; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; @@ -296,4 +296,9 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo return getUnlocalizedName(); } + public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { + super.breakBlock(world, x, y, z, block, p_149749_6_); + world.removeTileEntity(x, y, z); + } + } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index 78535c77..46d5e11e 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -11,8 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; -import crazypants.enderio.enderface.BlockEio; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.vecmath.Vector3f; diff --git a/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java b/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java index bbe41023..66b0ac30 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java @@ -5,8 +5,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; -import crazypants.enderio.enderface.BlockEio; public class BlockLightNode extends BlockEio { diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 5091d3a2..b3e9ccb4 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -23,11 +23,11 @@ import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.enderface.BlockEio; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index 79c36aa7..b333943f 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -25,6 +25,7 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.reservoir.TileReservoir.Pos; import crazypants.util.BlockCoord; +import crazypants.util.FluidUtil; import crazypants.util.Util; import crazypants.vecmath.Vector3d; @@ -83,15 +84,7 @@ public class BlockReservoir extends BlockContainer implements IResourceTooltipPr TileReservoir tank = (TileReservoir) world.getTileEntity(x, y, z); - FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(current); - if(liquid == null) { - if(current.getItem() == Items.water_bucket) { - liquid = new FluidStack(FluidRegistry.WATER, 1000); - } else if(current.getItem() == Items.lava_bucket) { - liquid = new FluidStack(FluidRegistry.LAVA, 1000); - } - } - + FluidStack liquid = FluidUtil.getFluidFromItem(current); if(liquid != null) { // Handle filled containers int qty = tank.getController().doFill(ForgeDirection.UNKNOWN, liquid, true); diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index bd9f2aec..ac8ea174 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -13,10 +13,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; +import crazypants.enderio.BlockEio; import crazypants.enderio.Config; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.enderface.BlockEio; import crazypants.enderio.gui.IResourceTooltipProvider; public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvider { @@ -112,4 +112,9 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide return getUnlocalizedName(); } + public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { + super.breakBlock(world, x, y, z, block, p_149749_6_); + world.removeTileEntity(x, y, z); + } + } diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java index fd9b221b..e2b3b3e5 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java @@ -22,6 +22,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.render.VertexRotation; +import crazypants.util.FluidUtil; import crazypants.util.Util; import crazypants.vecmath.Vector3d; @@ -117,15 +118,7 @@ public class BlockVat extends AbstractMachineBlock { } //check for filled fluid containers and see if we can empty them into our input tank - FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(item); - if(fluid == null) { - if(item.getItem() == Items.water_bucket) { - fluid = new FluidStack(FluidRegistry.WATER, 1000); - } else if(item.getItem() == Items.lava_bucket) { - fluid = new FluidStack(FluidRegistry.LAVA, 1000); - } - } - + FluidStack fluid = FluidUtil.getFluidFromItem(item); if(fluid != null) { int filled = vat.fill(ForgeDirection.UP, fluid, false); if(filled >= fluid.amount) { diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java index 7090e42f..5209f996 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java @@ -27,7 +27,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler final FluidTank inputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 8); final FluidTank outputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 8); - private static int IO_MB_TICK = 250; + private static int IO_MB_TICK = 100; boolean tanksDirty = false; @@ -73,7 +73,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler if(target.canFill(dir.getOpposite(), outputTank.getFluid().getFluid())) { FluidStack push = outputTank.getFluid().copy(); push.amount = Math.min(push.amount, IO_MB_TICK); - int filled = target.fill(dir.getOpposite(), outputTank.getFluid(), true); + int filled = target.fill(dir.getOpposite(), push, true); if(filled > 0) { outputTank.drain(filled, true); return true; diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java new file mode 100644 index 00000000..948ba21c --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -0,0 +1,162 @@ +package crazypants.enderio.machine.tank; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidStack; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.util.FluidUtil; +import crazypants.util.Util; + +public class BlockTank extends AbstractMachineBlock { + + public static BlockTank create() { + + BlockTank res = new BlockTank(); + res.init(); + return res; + } + + protected BlockTank() { + super(ModObject.blockTank, TileTank.class); + setStepSound(Block.soundTypeGlass); + } + + @Override + protected void init() { + super.init(); + setLightOpacity(0); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { + + TileEntity te = world.getTileEntity(x, y, z); + if(!(te instanceof TileTank)) { + return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); + } + + TileTank tank = (TileTank) te; + ItemStack item = entityPlayer.inventory.getCurrentItem(); + if(item == null) { + return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); + } + + //check for filled fluid containers and see if we can empty them into our input tank + FluidStack fluid = FluidUtil.getFluidFromItem(item); + if(fluid != null) { + int filled = tank.fill(ForgeDirection.UP, fluid, false); + if(filled >= fluid.amount) { + tank.fill(ForgeDirection.UP, fluid, true); + if(!entityPlayer.capabilities.isCreativeMode) { + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, Util.consumeItem(item)); + } + return true; + } + } + + //now check for empty fluid containers to fill + FluidStack available = tank.tank.getFluid(); + if(available != null) { + ItemStack res = FluidContainerRegistry.fillFluidContainer(available.copy(), item); + FluidStack filled = FluidContainerRegistry.getFluidForFilledItem(res); + + if(filled == null) { //this shouldn't be necessary but it appears to be a bug as the above method doesnt work + FluidContainerData[] datas = FluidContainerRegistry.getRegisteredFluidContainerData(); + for (FluidContainerData data : datas) { + if(data.fluid.getFluid().getName().equals(available.getFluid().getName()) && data.emptyContainer.isItemEqual(item)) { + res = data.filledContainer.copy(); + filled = FluidContainerRegistry.getFluidForFilledItem(res); + } + } + } + + if(filled != null) { + tank.drain(ForgeDirection.DOWN, filled, true); + if(item.stackSize > 1) { + item.stackSize--; + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, item); + for (int i = 0; i < entityPlayer.inventory.mainInventory.length; i++) { + if(entityPlayer.inventory.mainInventory[i] == null) { + entityPlayer.inventory.setInventorySlotContents(i, res); + return true; + } + } + if(!world.isRemote) { + Util.dropItems(world, res, x, y, z, true); + } + + } else { + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, res); + } + + return true; + } + } + return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); + } + + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(!(te instanceof TileTank)) { + System.out.println("BlockTank.getServerGuiElement: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + return null; + } + return new ContainerTank(player.inventory, (TileTank)te); + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(!(te instanceof TileTank)) { + System.out.println("BlockTank.getClientGuiElement: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + return null; + } + return new GuiTank(player.inventory, (TileTank)te); + } + + //Causes crashes in 1.7 on some machines + //@Override + //@SideOnly(Side.CLIENT) + //public int getRenderBlockPass() { + // return 1; + //} + // + //@Override + //public boolean canRenderInPass(int pass) { + // return pass == 1; + //} + +@Override +public boolean isOpaqueCube() { + return false; +} + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_TANK; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + return "enderio:blockTank"; + } + + protected String getSideIconKey(boolean active) { + return getMachineFrontIconKey(active); + } + + protected String getBackIconKey(boolean active) { + return getMachineFrontIconKey(active); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java b/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java new file mode 100644 index 00000000..cfe15db3 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java @@ -0,0 +1,44 @@ +package crazypants.enderio.machine.tank; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import crazypants.enderio.machine.AbstractMachineContainer; +import crazypants.enderio.machine.AbstractMachineEntity; + +public class ContainerTank extends AbstractMachineContainer { + + public ContainerTank(InventoryPlayer playerInv, AbstractMachineEntity te) { + super(playerInv, te); + } + + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(tileEntity, 0, 44, 21) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 1, 116, 21) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 2, 44, 52) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(2, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 3, 116, 52) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(3, itemStack); + } + }); + + } + +} diff --git a/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java b/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java new file mode 100644 index 00000000..0c226b40 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java @@ -0,0 +1,44 @@ +package crazypants.enderio.machine.tank; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; + +public class FluidTankEio extends FluidTank { + + public FluidTankEio(int capacity) { + super(capacity); + } + + public float getFilledRatio() { + return (float) getFluidAmount() / getCapacity(); + } + + public boolean isFull() { + return getFluidAmount() >= getCapacity(); + } + + public boolean canDrainFluidType(FluidStack resource) { + if(resource == null || resource.getFluid() == null || fluid == null) { + return false; + } + return fluid.isFluidEqual(resource); + } + + public boolean canDrainFluidType(Fluid fl) { + if(fl == null || fluid == null) { + return false; + } + return fl.getID() == fluid.fluidID; + } + + public FluidStack drain(FluidStack resource, boolean doDrain) { + if(!canDrainFluidType(resource)) { + return null; + } + return drain(resource.amount, doDrain); + } + + + +} diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java new file mode 100644 index 00000000..723ad91e --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -0,0 +1,70 @@ +package crazypants.enderio.machine.tank; + +import java.awt.Color; +import java.awt.Rectangle; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.fluid.Fluids; +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.generator.StirlingGeneratorContainer; +import crazypants.enderio.machine.generator.TileEntityStirlingGenerator; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.gui.GuiToolTip; +import crazypants.render.ColorUtil; +import crazypants.render.RenderUtil; +import crazypants.util.Lang; + +public class GuiTank extends GuiMachineBase { + + private TileTank entity; + + public GuiTank(InventoryPlayer par1InventoryPlayer, TileTank te) { + super(te, new ContainerTank(par1InventoryPlayer, te)); + this.entity = te; + + addToolTip(new GuiToolTip(new Rectangle(80, 21, 16, 47), "") { + + @Override + protected void updateText() { + text.clear(); + String heading = Lang.localize("tank.tank"); + if(entity.tank.getFluid() != null) { + heading += ": " + entity.tank.getFluid().getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(entity.tank)); + } + + }); + } + + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.bindTexture("enderio:textures/gui/tank.png"); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + RenderUtil.bindBlockTexture(); + RenderUtil.renderGuiTank(entity.tank, guiLeft + 80, guiTop + 21, zLevel, 16,47); + + } + + protected boolean renderPowerBar() { + return true; + } +} diff --git a/src/main/java/crazypants/enderio/machine/tank/TankRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankRenderer.java new file mode 100644 index 00000000..4e7b0368 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/tank/TankRenderer.java @@ -0,0 +1,51 @@ +package crazypants.enderio.machine.tank; + +import org.lwjgl.opengl.GL11; + +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; + +public class TankRenderer extends TileEntitySpecialRenderer { + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { + + TileTank tank = (TileTank)te; + if(tank.tank.getFluidAmount() <= 0) { + return; + } + + IIcon icon = tank.tank.getFluid().getFluid().getStillIcon(); + if(icon != null) { + float fullness = tank.tank.getFilledRatio(); + + float scale = 0.97f; + float yScale = 0.97f * fullness; + BoundingBox bb = BoundingBox.UNIT_CUBE.scale(scale, yScale , scale); + bb = bb.translate(0, -(1 - yScale)/2, 0); + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + RenderUtil.bindBlockTexture(); + + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.addTranslation((float)x, (float)y, (float)z); + CubeRenderer.render(bb, icon); + Tessellator.instance.addTranslation(-(float)x, -(float)y, -(float)z); + Tessellator.instance.draw(); + + GL11.glPopAttrib(); + } + + } + +} diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java new file mode 100644 index 00000000..c0a82490 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -0,0 +1,330 @@ +package crazypants.enderio.machine.tank; + +import buildcraft.api.power.PowerHandler.PowerReceiver; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.util.BlockCoord; +import crazypants.util.FluidUtil; +import crazypants.util.Util; + +public class TileTank extends AbstractMachineEntity implements IFluidHandler { + + private static int IO_MB_TICK = 100; + + protected FluidTankEio tank = new FluidTankEio(16000); + protected int lastUpdateLevel = -1; + + public TileTank() { + super(new SlotDefinition(0, 1, 2, 3, -1, -1)); + } + + @Override + protected boolean doPush(ForgeDirection dir) { + + if(isSideDisabled(dir.ordinal())) { + return false; + } + + boolean res = super.doPush(dir); + if(tank.getFluidAmount() > 0) { + + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if(target != null) { + if(target.canFill(dir.getOpposite(), tank.getFluid().getFluid())) { + FluidStack push = tank.getFluid().copy(); + push.amount = Math.min(push.amount, IO_MB_TICK); + int filled = target.fill(dir.getOpposite(), push, true); + if(filled > 0) { + tank.drain(filled, true); + return true; + } + } + } + + } + return res; + } + + @Override + protected boolean doPull(ForgeDirection dir) { + + if(isSideDisabled(dir.ordinal())) { + return false; + } + + boolean res = super.doPull(dir); + if(tank.getFluidAmount() < tank.getCapacity()) { + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if(target != null) { + + if(tank.getFluidAmount() > 0) { + FluidStack canPull = tank.getFluid().copy(); + canPull.amount = tank.getCapacity() - tank.getFluidAmount(); + canPull.amount = Math.min(canPull.amount, IO_MB_TICK); + FluidStack drained = target.drain(dir.getOpposite(), canPull, true); + if(drained != null && drained.amount > 0) { + tank.fill(drained, true); + return true; + } + } else { + + FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); + if(infos != null) { + for (FluidTankInfo info : infos) { + if(info.fluid != null && info.fluid.amount > 0) { + if(canFill(dir, info.fluid.getFluid())) { + FluidStack canPull = info.fluid.copy(); + canPull.amount = Math.min(IO_MB_TICK, canPull.amount); + FluidStack drained = target.drain(dir.getOpposite(), canPull, true); + if(drained != null && drained.amount > 0) { + tank.fill(drained, true); + return true; + } + } + } + } + } + } + + } + } + return res; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return tank.fill(resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tank.drain(resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tank.drain(maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return fluid != null && (tank.getFluidAmount() > 0 && tank.getFluid().fluidID == fluid.getID() || tank.getFluidAmount() == 0); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tank.canDrainFluidType(fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return new FluidTankInfo[] { new FluidTankInfo(tank) }; + } + + private int getFilledLevel() { + int level = (int) Math.floor(16 * tank.getFilledRatio()); + if(level == 0 && tank.getFluidAmount() > 0) { + level = 1; + } + return level; + } + + @Override + public String getMachineName() { + return "tank"; + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack item) { + if(i == 0) { + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(item); + if(fluid != null) { + return true; + } + if(item.getItem() == Items.water_bucket) { + return true; + } + if(item.getItem() == Items.lava_bucket) { + return true; + } + return false; + } else if(i == 1) { + return FluidContainerRegistry.isEmptyContainer(item) || item.getItem() == Items.bucket; + } + return false; + } + + @Override + public boolean isActive() { + return false; + } + + @Override + public float getProgress() { + return 0; + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + boolean res = processItems(redstoneCheckPassed); + int filledLevel = getFilledLevel(); + if(lastUpdateLevel != filledLevel) { + lastUpdateLevel = filledLevel; + return true; + } + return res; + } + + private boolean processItems(boolean redstoneCheckPassed) { + if(!redstoneCheckPassed) { + return false; + } + if(worldObj.getWorldTime() % 20 != 0) { + return false; + } + return drainFullContainer() || fillEmptyContainer(); + } + + private boolean fillEmptyContainer() { + ItemStack toFill = inventory[1]; + if(toFill == null) { + return false; + } + if(tank.getFluidAmount() <= 0) { + return false; + } + + ItemStack filledItem = FluidContainerRegistry.fillFluidContainer(tank.getFluid(), toFill); + FluidStack filledFluid = FluidContainerRegistry.getFluidForFilledItem(filledItem); + + if(filledFluid == null) { //this shouldn't be necessary but it appears to be a bug as the above method doesnt work + FluidContainerData[] datas = FluidContainerRegistry.getRegisteredFluidContainerData(); + for (FluidContainerData data : datas) { + if(data.fluid.getFluid().getName().equals(tank.getFluid().getFluid().getName()) && data.emptyContainer.isItemEqual(toFill)) { + filledItem = data.filledContainer.copy(); + filledFluid = FluidContainerRegistry.getFluidForFilledItem(filledItem); + } + } + } + + if(filledFluid == null || filledItem == null) { + return false; + } + if(filledFluid.amount > tank.getFluidAmount()) { + return false; + } + if(inventory[3] != null) { + if(!inventory[3].isItemEqual(filledItem) || inventory[3].getMaxStackSize() < inventory[3].stackSize + 1) { + return false; //can't stack the full container + } + } + + tank.drain(filledFluid.amount, true); + + toFill = toFill.copy(); + toFill.stackSize--; + if(toFill.stackSize == 0) { + setInventorySlotContents(1, null); + } else { + setInventorySlotContents(1, toFill); + } + + if(inventory[3] == null) { + setInventorySlotContents(3, filledItem); + } else { + ItemStack newStack = inventory[3].copy(); + newStack.stackSize++; + setInventorySlotContents(3, newStack); + } + + return false; + } + + private boolean drainFullContainer() { + ItemStack fillFrom = inventory[0]; + if(fillFrom == null) { + return false; + } + FluidStack fluid = FluidUtil.getFluidFromItem(fillFrom); + if(fluid == null) { + return false; + } + ItemStack emptyItem = FluidUtil.getEmptyContainer(fillFrom); + if(emptyItem != null && inventory[2] != null) { + if(!inventory[2].isItemEqual(emptyItem) || inventory[2].getMaxStackSize() < inventory[2].stackSize + 1) { + return false; //can't stack the empty container + } + } + + int filled = fill(ForgeDirection.UP, fluid, false); + if(filled < fluid.amount) { + return false; //can't empty the entire thing + } + fill(ForgeDirection.UP, fluid, true); + if(emptyItem == null) { + return true; + } + + fillFrom = fillFrom.copy(); + fillFrom.stackSize--; + if(fillFrom.stackSize == 0) { + setInventorySlotContents(0, null); + } else { + setInventorySlotContents(0, fillFrom); + } + + if(inventory[2] == null) { + setInventorySlotContents(2, emptyItem); + } else { + ItemStack newStack = inventory[2].copy(); + newStack.stackSize++; + setInventorySlotContents(2, newStack); + } + return true; + } + + public PowerReceiver getPowerReceiver(ForgeDirection side) { + return null; + } + + public boolean canConnectEnergy(ForgeDirection from) { + return false; + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + if(tank.getFluidAmount() > 0) { + NBTTagCompound fluidRoot = new NBTTagCompound(); + tank.getFluid().writeToNBT(fluidRoot); + nbtRoot.setTag("tankContents", fluidRoot); + } + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + if(nbtRoot.hasKey("tankContents")) { + FluidStack fl = FluidStack.loadFluidStackFromNBT((NBTTagCompound) nbtRoot.getTag("tankContents")); + tank.setFluid(fl); + } else { + tank.setFluid(null); + } + } + +} diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index 6a8685b6..cdf429a9 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -18,9 +18,9 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; -import crazypants.enderio.enderface.BlockEio; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index 562a6903..0a132df3 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -1,5 +1,6 @@ package crazypants.enderio.teleport; +import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -11,11 +12,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; +import crazypants.enderio.BlockEio; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.enderface.BlockEio; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.teleport.packet.PacketAccessMode; import crazypants.enderio.teleport.packet.PacketConfigSync; @@ -129,4 +130,9 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt return null; } + public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { + super.breakBlock(world, x, y, z, block, p_149749_6_); + world.removeTileEntity(x, y, z); + } + } diff --git a/src/main/java/crazypants/util/FluidUtil.java b/src/main/java/crazypants/util/FluidUtil.java index b131c451..cc816bae 100644 --- a/src/main/java/crazypants/util/FluidUtil.java +++ b/src/main/java/crazypants/util/FluidUtil.java @@ -1,7 +1,12 @@ package crazypants.util; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; @@ -28,6 +33,25 @@ public class FluidUtil { } return null; } + + public static FluidStack getFluidFromItem(ItemStack item) { + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(item); + if(fluid == null) { + if(item.getItem() == Items.water_bucket) { + fluid = new FluidStack(FluidRegistry.WATER, 1000); + } else if(item.getItem() == Items.lava_bucket) { + fluid = new FluidStack(FluidRegistry.LAVA, 1000); + } + } + return fluid; + } + + public static ItemStack getEmptyContainer(ItemStack stack) { + if(stack.getItem().hasContainerItem(stack)) { + return stack.getItem().getContainerItem(stack); + } + return null; + }