From b4f331f1b1b811d07903ffb557bd1a77565b3980 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 19 Apr 2015 01:18:01 +0200 Subject: [PATCH] consolidate nutrient tank code, reduce client sync packet size --- src/main/java/crazypants/enderio/EnderIO.java | 3 + .../zombie/BlockZombieGenerator.java | 4 -- .../generator/zombie/IHasNutrientTank.java | 7 +++ .../generator/zombie/NutrientTank.java | 34 ++++++++++- .../generator/zombie/PacketNutrientTank.java | 45 +++++++++++++++ .../generator/zombie/PacketZombieTank.java | 56 ------------------ .../generator/zombie/TileZombieGenerator.java | 33 ++++------- .../machine/killera/BlockKillerJoe.java | 1 - .../machine/killera/PacketNutrientLevel.java | 57 ------------------- .../machine/killera/TileKillerJoe.java | 34 +++++------ 10 files changed, 109 insertions(+), 165 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java create mode 100644 src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java delete mode 100644 src/main/java/crazypants/enderio/machine/generator/zombie/PacketZombieTank.java delete mode 100644 src/main/java/crazypants/enderio/machine/killera/PacketNutrientLevel.java diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index d0f27a1b..5ef7f719 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -154,6 +154,7 @@ import crazypants.enderio.teleport.telepad.ItemCoordSelector; import crazypants.enderio.thaumcraft.ThaumcraftCompat; import crazypants.util.EntityUtil; import static crazypants.enderio.EnderIO.*; +import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { @@ -433,6 +434,8 @@ public class EnderIO { fluidNutrientDistillation = FluidRegistry.getFluid(f.getName()); blockNutrientDistillation = BlockFluidEio.create(fluidNutrientDistillation, Material.water); + PacketHandler.INSTANCE.registerMessage(PacketNutrientTank.class, PacketNutrientTank.class, PacketHandler.nextID(), Side.CLIENT); + f = new Fluid(Fluids.HOOTCH_NAME).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidHootch = FluidRegistry.getFluid(f.getName()); diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index 0a5d4e98..c0bf7237 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -18,15 +18,11 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.network.PacketHandler; import crazypants.util.Lang; public class BlockZombieGenerator extends AbstractMachineBlock { public static BlockZombieGenerator create() { - - PacketHandler.INSTANCE.registerMessage(PacketZombieTank.class, PacketZombieTank.class, PacketHandler.nextID(), Side.CLIENT); - BlockZombieGenerator gen = new BlockZombieGenerator(); gen.init(); return gen; diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java new file mode 100644 index 00000000..f803e634 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java @@ -0,0 +1,7 @@ +package crazypants.enderio.machine.generator.zombie; + +public interface IHasNutrientTank { + + NutrientTank getNutrientTank(); + +} diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java index 22b716ea..fbe18e69 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.generator.zombie; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import crazypants.enderio.EnderIO; @@ -10,9 +12,13 @@ public class NutrientTank extends FluidTank { super(capacity); } + public boolean canFill(Fluid fluid) { + return fluid != null && fluid.getID() == EnderIO.fluidNutrientDistillation.getID(); + } + @Override public int fill(FluidStack resource, boolean doFill) { - if(resource == null || resource.getFluid().getID() != EnderIO.fluidNutrientDistillation.getID()) { + if(resource == null || !canFill(resource.getFluid())) { return 0; } return super.fill(resource, doFill); @@ -21,7 +27,29 @@ public class NutrientTank extends FluidTank { public float getFilledRatio() { return (float) getFluidAmount() / getCapacity(); } - - + public void setFluidAmount(int amount) { + if(amount > 0) { + setFluid(new FluidStack(EnderIO.fluidNutrientDistillation, Math.min(capacity, amount))); + } else { + setFluid(null); + } + } + + public void writeCommon(String name, NBTTagCompound nbtRoot) { + if(getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + writeToNBT(tankRoot); + nbtRoot.setTag(name, tankRoot); + } + } + + public void readCommon(String name, NBTTagCompound nbtRoot) { + NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag(name); + if(tankRoot != null) { + readFromNBT(tankRoot); + } else { + setFluid(null); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java new file mode 100644 index 00000000..a4fa4c93 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java @@ -0,0 +1,45 @@ +package crazypants.enderio.machine.generator.zombie; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.EnderIO; +import crazypants.enderio.network.MessageTileEntity; +import net.minecraft.tileentity.TileEntity; + +public class PacketNutrientTank extends MessageTileEntity implements IMessageHandler { + + private int amount; + + public PacketNutrientTank() { + } + + public PacketNutrientTank(T tile) { + super(tile); + amount = tile.getNutrientTank().getFluidAmount(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(amount); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + amount = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketNutrientTank message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity tile = message.getTileEntity(player.worldObj); + if (tile instanceof IHasNutrientTank) { + ((IHasNutrientTank) tile).getNutrientTank().setFluidAmount(message.amount); + } + return null; + } +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketZombieTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketZombieTank.java deleted file mode 100644 index e3d4982d..00000000 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketZombieTank.java +++ /dev/null @@ -1,56 +0,0 @@ -package crazypants.enderio.machine.generator.zombie; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; - -public class PacketZombieTank extends MessageTileEntity implements IMessageHandler { - - private NBTTagCompound nbtRoot; - - public PacketZombieTank() { - } - - public PacketZombieTank(TileZombieGenerator tile) { - super(tile); - nbtRoot = new NBTTagCompound(); - if(tile.fuelTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.fuelTank.writeToNBT(tankRoot); - nbtRoot.setTag("tank", tankRoot); - } - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - NetworkUtil.writeNBTTagCompound(nbtRoot, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - nbtRoot = NetworkUtil.readNBTTagCompound(buf); - } - - @Override - public IMessage onMessage(PacketZombieTank message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileZombieGenerator tile = message.getTileEntity(player.worldObj); - if (tile != null) { - if(message.nbtRoot.hasKey("tank")) { - NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("tank"); - tile.fuelTank.readFromNBT(tankRoot); - } else { - tile.fuelTank.setFluid(null); - } - } - return null; - } -} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index 10870c66..5788eaf1 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -22,7 +22,7 @@ import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; import crazypants.util.ITankAccess; -public class TileZombieGenerator extends AbstractGeneratorEntity implements IFluidHandler, ITankAccess { +public class TileZombieGenerator extends AbstractGeneratorEntity implements IFluidHandler, ITankAccess, IHasNutrientTank { private static int IO_MB_TICK = 250; @@ -134,7 +134,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu } if(tanksDirty) { - PacketHandler.sendToAllAround(new PacketZombieTank(this), this); + PacketHandler.sendToAllAround(new PacketNutrientTank(this), this); tanksDirty = false; } @@ -183,9 +183,6 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource == null || resource.getFluid() == null || !canFill(from, resource.getFluid())) { - return 0; - } int res = fuelTank.fill(resource, doFill); if(res > 0 && doFill) { tanksDirty = true; @@ -205,7 +202,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu @Override public boolean canFill(ForgeDirection from, Fluid fluid) { - return fluid != null && fluid.getID() == EnderIO.fluidNutrientDistillation.getID(); + return fuelTank.canFill(fluid); } @Override @@ -243,28 +240,13 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); - - if(nbtRoot.hasKey("fuelTank")) { - NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("fuelTank"); - if(tankRoot != null) { - fuelTank.readFromNBT(tankRoot); - } else { - fuelTank.setFluid(null); - } - } else { - fuelTank.setFluid(null); - } - + fuelTank.readCommon("fuelTank", nbtRoot); } @Override public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); - if(fuelTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - fuelTank.writeToNBT(tankRoot); - nbtRoot.setTag("fuelTank", tankRoot); - } + fuelTank.writeCommon("fuelTank", nbtRoot); } @Override @@ -291,4 +273,9 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu tanksDirty = true; } + @Override + public NutrientTank getNutrientTank() { + return fuelTank; + } + } diff --git a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java index 2ec4ff27..225db2ac 100644 --- a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java @@ -23,7 +23,6 @@ public class BlockKillerJoe extends AbstractMachineBlock { static final String USERNAME = "KillerJoe"; public static BlockKillerJoe create() { - PacketHandler.INSTANCE.registerMessage(PacketNutrientLevel.class, PacketNutrientLevel.class, PacketHandler.nextID(), Side.CLIENT); PacketHandler.INSTANCE.registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT); PacketGivePlayerXP.register(); PacketExperianceContainer.register(); diff --git a/src/main/java/crazypants/enderio/machine/killera/PacketNutrientLevel.java b/src/main/java/crazypants/enderio/machine/killera/PacketNutrientLevel.java deleted file mode 100644 index 57b1044a..00000000 --- a/src/main/java/crazypants/enderio/machine/killera/PacketNutrientLevel.java +++ /dev/null @@ -1,57 +0,0 @@ -package crazypants.enderio.machine.killera; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.EnderIO; -import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; - -public class PacketNutrientLevel extends MessageTileEntity implements IMessageHandler { - - private NBTTagCompound nbtRoot; - - public PacketNutrientLevel() { - } - - public PacketNutrientLevel(TileKillerJoe tile) { - super(tile); - nbtRoot = new NBTTagCompound(); - if(tile.fuelTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.fuelTank.writeToNBT(tankRoot); - nbtRoot.setTag("tank", tankRoot); - } - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - NetworkUtil.writeNBTTagCompound(nbtRoot, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - nbtRoot = NetworkUtil.readNBTTagCompound(buf); - } - - @Override - public IMessage onMessage(PacketNutrientLevel message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileKillerJoe tile = message.getTileEntity(player.worldObj); - if (tile != null) { - if(message.nbtRoot.hasKey("tank")) { - NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("tank"); - tile.fuelTank.readFromNBT(tankRoot); - } else { - tile.fuelTank.setFluid(null); - } - } - return null; - } - -} diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index a1ad5613..e310649c 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -32,7 +32,9 @@ import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.generator.zombie.IHasNutrientTank; import crazypants.enderio.machine.generator.zombie.NutrientTank; +import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; import crazypants.enderio.machine.wireless.WirelessChargedLocation; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceContainer; @@ -46,7 +48,7 @@ import crazypants.util.ForgeDirectionOffsets; import crazypants.util.ITankAccess; import crazypants.vecmath.Vector3d; -public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector, IHaveExperience, ITankAccess { +public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector, IHaveExperience, ITankAccess, IHasNutrientTank { private static final int IO_MB_TICK = 250; @@ -146,7 +148,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle } if(tanksDirty) { - PacketHandler.sendToAllAround(new PacketNutrientLevel(this), this); + PacketHandler.sendToAllAround(new PacketNutrientTank(this), this); tanksDirty = false; } if(xpCon.isDirty()) { @@ -442,9 +444,6 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource == null || resource.getFluid() == null || !canFill(from, resource.getFluid())) { - return 0; - } int res = fuelTank.fill(resource, doFill); if(res > 0 && doFill) { tanksDirty = true; @@ -454,7 +453,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle @Override public boolean canFill(ForgeDirection from, Fluid fluid) { - return fluid != null && fluid.getID() == EnderIO.fluidNutrientDistillation.getID(); + return fuelTank.canFill(fluid); } @Override @@ -482,27 +481,14 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); - if(nbtRoot.hasKey("fuelTank")) { - NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("fuelTank"); - if(tankRoot != null) { - fuelTank.readFromNBT(tankRoot); - } else { - fuelTank.setFluid(null); - } - } else { - fuelTank.setFluid(null); - } + fuelTank.readCommon("fuelTank", nbtRoot); xpCon.readFromNBT(nbtRoot); } @Override public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); - if(fuelTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - fuelTank.writeToNBT(tankRoot); - nbtRoot.setTag("fuelTank", tankRoot); - } + fuelTank.writeCommon("fuelTank", nbtRoot); xpCon.writeToNBT(nbtRoot); } @@ -576,4 +562,10 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle public void setTanksDirty() { tanksDirty = true; } + + @Override + public NutrientTank getNutrientTank() { + return fuelTank; + } + }