diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 0db8446b..3661bf0f 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -509,9 +509,13 @@ enderio.gui.inventorypanel.tooltip.refill.line2=A normal click puts items enderio.gui.inventorypanel.tooltip.refill.line3=for one crafting opperations, enderio.gui.inventorypanel.tooltip.refill.line4=while a shift click tries to enderio.gui.inventorypanel.tooltip.refill.line5=fill the crafting grid. +enderio.gui.inventorypanel.tooltip.setrecipe.line1=Learn the current crafting recipe +enderio.gui.inventorypanel.tooltip.setrecipe.line2=Allows the refilling for the +enderio.gui.inventorypanel.tooltip.setrecipe.line3=current recipe from the network. enderio.gui.inventorypanel.tooltip.clear.line1=Clear crafting grid enderio.gui.inventorypanel.tooltip.clear.line2=Moves all items to the return area enderio.gui.inventorypanel.tooltip.fuelTank=Nutrient Tank +enderio.gui.inventorypanel.tooltip.itemsstored=Items Stored: %s enderio.machine.tooltip.configured=(Configured) @@ -550,6 +554,9 @@ enderio.blockTravelPlatform.invalidTarget=Destination is Obstructed enderio.blockTravelPlatform.outOfRange=Destination out of range tile.blockTelePad.name=Telepad Block +tile.blockTelePad.tooltip.detailed.line1=Uses power to teleport entities +tile.blockTelePad.tooltip.detailed.line2=to a specific position and dimension. +tile.blockTelePad.tooltip.detailed.line3=Must be placed in a 3x1x3 multiblock. enderio.gui.telepad.teleport=Teleport! item.itemTravelStaff.name=Staff of Traveling diff --git a/resources/assets/enderio/textures/gui/inventorypanel.png b/resources/assets/enderio/textures/gui/inventorypanel.png index 9b49c805..baeec6e2 100644 Binary files a/resources/assets/enderio/textures/gui/inventorypanel.png and b/resources/assets/enderio/textures/gui/inventorypanel.png differ diff --git a/resources/assets/enderio/textures/items/extractSpeedDowngrade.png b/resources/assets/enderio/textures/items/extractSpeedDowngrade.png index 0a98aedb..a8c85b98 100644 Binary files a/resources/assets/enderio/textures/items/extractSpeedDowngrade.png and b/resources/assets/enderio/textures/items/extractSpeedDowngrade.png differ diff --git a/resources/assets/enderio/textures/items/filterUpgradePower.png b/resources/assets/enderio/textures/items/filterUpgradePower.png index ac49007b..5d1b13ff 100644 Binary files a/resources/assets/enderio/textures/items/filterUpgradePower.png and b/resources/assets/enderio/textures/items/filterUpgradePower.png differ diff --git a/resources/assets/enderio/textures/items/itemGliderWing.png b/resources/assets/enderio/textures/items/itemGliderWing.png index 0e4ffa9c..82549f3b 100644 Binary files a/resources/assets/enderio/textures/items/itemGliderWing.png and b/resources/assets/enderio/textures/items/itemGliderWing.png differ diff --git a/resources/assets/enderio/textures/items/itemGliderWings.png b/resources/assets/enderio/textures/items/itemGliderWings.png index 523371ce..c876e747 100644 Binary files a/resources/assets/enderio/textures/items/itemGliderWings.png and b/resources/assets/enderio/textures/items/itemGliderWings.png differ diff --git a/resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png b/resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png new file mode 100644 index 00000000..0a98aedb Binary files /dev/null and b/resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png differ diff --git a/resources/assets/enderio/textures/items/old/filterUpgradePower.png b/resources/assets/enderio/textures/items/old/filterUpgradePower.png new file mode 100644 index 00000000..ac49007b Binary files /dev/null and b/resources/assets/enderio/textures/items/old/filterUpgradePower.png differ diff --git a/resources/assets/enderio/textures/items/old/itemGliderWing.png b/resources/assets/enderio/textures/items/old/itemGliderWing.png new file mode 100644 index 00000000..0e4ffa9c Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemGliderWing.png differ diff --git a/resources/assets/enderio/textures/items/old/itemGliderWings.png b/resources/assets/enderio/textures/items/old/itemGliderWings.png new file mode 100644 index 00000000..523371ce Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemGliderWings.png differ diff --git a/resources/assets/enderio/textures/items/old/silicon.png b/resources/assets/enderio/textures/items/old/silicon.png index c47990cf..c840d947 100644 Binary files a/resources/assets/enderio/textures/items/old/silicon.png and b/resources/assets/enderio/textures/items/old/silicon.png differ diff --git a/resources/assets/enderio/textures/items/silicon.png b/resources/assets/enderio/textures/items/silicon.png index c840d947..8b932a0c 100644 Binary files a/resources/assets/enderio/textures/items/silicon.png and b/resources/assets/enderio/textures/items/silicon.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 36d0cfeb..59c88ae4 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -198,7 +198,7 @@ public class EnderIO { //Teleporting public static BlockTravelAnchor blockTravelPlatform; public static BlockTelePad blockTelePad; - public static ItemCoordSelector itemCoordsCard; + public static ItemCoordSelector itemCoordSelector; public static ItemTravelStaff itemTravelStaff; // Painter @@ -357,7 +357,7 @@ public class EnderIO { blockEnderIo = BlockEnderIO.create(); blockTravelPlatform = BlockTravelAnchor.create(); blockTelePad = BlockTelePad.create(); - itemCoordsCard = ItemCoordSelector.create(); + itemCoordSelector = ItemCoordSelector.create(); blockSliceAndSplice = BlockSliceAndSplice.create(); blockSoulFuser = BlockSoulBinder.create(); diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 7edda08b..c0e77793 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -32,23 +32,23 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem { protected IIcon[] icons; - protected AbstractItemConduit(ModObject modObj) { + protected AbstractItemConduit(ModObject modObj, ItemConduitSubtype... subtypes) { this.modObj = modObj; + this.subtypes = subtypes; setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName(modObj.unlocalisedName); setMaxStackSize(64); setHasSubtypes(true); } - protected void init(ItemConduitSubtype[] subtypes) { - this.subtypes = subtypes; - icons = new IIcon[subtypes.length]; + protected void init() { GameRegistry.registerItem(this, modObj.unlocalisedName); } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) { + icons = new IIcon[subtypes.length]; int index = 0; for (ItemConduitSubtype subtype : subtypes) { icons[index] = IIconRegister.registerIcon(subtype.iconKey); diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index d7361877..b2f91d04 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; +import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.item.filter.ClearFilterRecipe; import crazypants.enderio.conduit.item.filter.CopyFilterRecipe; import crazypants.enderio.conduit.me.MEUtil; @@ -58,8 +59,11 @@ public class ConduitRecipes { Blocks.lever); GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 2), "bbb", "###", "bbb", 'b', conduitBinder, '#', redstoneAlloy); - GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemGasConduit, numConduits, 0), "bbb", "#g#", "bbb", 'b', conduitBinder, '#', - electricalSteel, 'g', fusedGlass); + + if (GasUtil.isGasConduitEnabled()) { + GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemGasConduit, numConduits, 0), "bbb", "#g#", "bbb", 'b', conduitBinder, '#', electricalSteel, 'g', + fusedGlass); + } ItemStack itemConduit = new ItemStack(EnderIO.itemItemConduit, numConduits, 0); GameRegistry.addShapedRecipe(itemConduit, "bbb", "###", "bbb", 'b', conduitBinder, '#', phasedIronNugget); diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 0a586d10..c406543c 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -31,6 +31,7 @@ import crazypants.enderio.Log; import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState; import crazypants.enderio.conduit.gas.GasConduitNetwork; +import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.ItemConduitNetwork; @@ -42,6 +43,7 @@ import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.liquid.LiquidConduitNetwork; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.me.MEConduitNetwork; +import crazypants.enderio.conduit.me.MEUtil; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; @@ -329,7 +331,10 @@ public class ConduitUtil { if(typeName == null || conduitBody == null) { return null; } - if(nbtVersion == 0 && "crazypants.enderio.conduit.liquid.LiquidConduit".equals(typeName)) { + if ((typeName.contains("conduit.me") && !MEUtil.isMEEnabled()) || typeName.contains("conduit.gas") && !GasUtil.isGasConduitEnabled()) { + return null; + } + if (nbtVersion == 0 && "crazypants.enderio.conduit.liquid.LiquidConduit".equals(typeName)) { Log.debug("ConduitUtil.readConduitFromNBT: Converted pre 0.7.3 fluid conduit to advanced fluid conduit."); typeName = "crazypants.enderio.conduit.liquid.AdvancedLiquidConduit"; } diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index e4026337..4c141ad1 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -25,12 +25,14 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool public static ItemGasConduit create() { ItemGasConduit result = new ItemGasConduit(); - result.init(subtypes); + if (GasUtil.isGasConduitEnabled()) { + result.init(); + } return result; } protected ItemGasConduit() { - super(ModObject.itemGasConduit); + super(ModObject.itemGasConduit, subtypes); if(!GasUtil.isGasConduitEnabled()) { setCreativeTab(null); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index e5b93c49..b4a0fdc9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -64,12 +64,12 @@ public class ExternalConnectionContainer extends Container { x = 10; y = 47; - slotInputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 3, x, y)); + slotOutputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 3, x, y)); slotLocations.add(new Point(x, y)); x = 10; y = 47; - slotOutputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 2, x, y)); + slotInputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 2, x, y)); slotLocations.add(new Point(x, y)); x = 28; diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 6ca31b24..d1e0f984 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -182,7 +182,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork { @Override @@ -20,6 +23,8 @@ public class PacketConfigSync implements IMessage, IMessageHandler tmp = new ArrayList(); SpecialTooltipHandler.addDetailedTooltipFromResources(tmp, getUnlocalizedName()); String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()); - for(String line : tmp) { + for (String line : tmp) { list.add(String.format(line, keyName)); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 3a1b1e9c..634bff9f 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -2,14 +2,17 @@ package crazypants.enderio.item.darksteel; import java.util.HashMap; import java.util.Map; +import java.util.Random; import java.util.UUID; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.particle.EntityReddustFX; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -17,6 +20,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.util.MovementInput; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; import org.lwjgl.opengl.GL11; @@ -34,6 +38,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.PacketUpgradeState.Type; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade; import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; @@ -79,8 +84,21 @@ public class DarkSteelController { private DarkSteelController() { PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.CLIENT); } + public boolean isActive(EntityPlayer player, Type type) { + switch(type) { + case GLIDE: + return isGlideActive(player); + case SPEED: + return isSpeedActive(player); + case STEP_ASSIST: + return isStepAssistActive(player); + } + return false; + } + public void setGlideActive(EntityPlayer player, boolean isGlideActive) { if(player.getGameProfile().getId() != null) { glideActiveMap.put(player.getGameProfile().getId(), isGlideActive); @@ -362,6 +380,15 @@ public class DarkSteelController { } return res; } + + @SubscribeEvent + public void onStartTracking(PlayerEvent.StartTracking event) { + if (event.target instanceof EntityPlayerMP) { + for (PacketUpgradeState.Type type : PacketUpgradeState.Type.values()) { + PacketHandler.sendTo(new PacketUpgradeState(type, isActive((EntityPlayer) event.target, type), event.target.getEntityId()), (EntityPlayerMP) event.entityPlayer); + } + } + } @SideOnly(Side.CLIENT) @SubscribeEvent @@ -405,6 +432,9 @@ public class DarkSteelController { float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; GL11.glPushMatrix(); + if(player.isSneaking()) { + GL11.glTranslatef(0, 0.0625f, 0); + } GL11.glRotatef(yawOffset, 0, -1, 0); GL11.glRotatef(yaw - 270, 0, 1, 0); GL11.glRotatef(pitch, 0, 0, 1); @@ -453,6 +483,14 @@ public class DarkSteelController { ticksSinceLastJump = 0; usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, requiredPower); player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.MODID + ":ds.jump", 1.0f, player.worldObj.rand.nextFloat() * 0.5f + 0.75f, false); + Random rand = player.worldObj.rand; + for (int i = rand.nextInt(10) + 5; i >= 0; i--) { + EntityReddustFX fx = new EntityReddustFX(player.worldObj, player.posX + (rand.nextDouble() * 0.5 - 0.25), player.posY - player.yOffset, player.posZ + + (rand.nextDouble() * 0.5 - 0.25), 1, 1, 1); + fx.setVelocity(player.motionX + (rand.nextDouble() * 0.5 - 0.25), (player.motionY / 2) + (rand.nextDouble() * -0.05), + player.motionZ + (rand.nextDouble() * 0.5 - 0.25)); + Minecraft.getMinecraft().effectRenderer.addEffect(fx); + } PacketHandler.INSTANCE.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, DarkSteelItems.itemDarkSteelBoots.armorType)); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java index 13ee5a52..bfd94043 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java @@ -1,10 +1,12 @@ package crazypants.enderio.item.darksteel; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; +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.PacketHandler; public class PacketUpgradeState implements IMessage, IMessageHandler { @@ -19,28 +21,36 @@ public class PacketUpgradeState implements IMessage, IMessageHandler implements IMessageHandler { + + private float progress; + + public PacketProgress() { + } + + public PacketProgress(IProgressTile tile) { + super(tile.getTileEntity()); + progress = tile.getProgress(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeFloat(progress); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + progress = buf.readFloat(); + } + + @Override + public IMessage onMessage(PacketProgress message, MessageContext ctx) { + TileEntity tile = message.getTileEntity(EnderIO.proxy.getClientWorld()); + if(tile instanceof IProgressTile) { + ((IProgressTile) tile).setProgress(message.progress); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java index f803e634..73724fa0 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java @@ -1,7 +1,9 @@ package crazypants.enderio.machine.generator.zombie; +import crazypants.enderio.tool.SmartTank; + public interface IHasNutrientTank { - NutrientTank getNutrientTank(); + SmartTank 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 deleted file mode 100644 index fbe18e69..00000000 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/NutrientTank.java +++ /dev/null @@ -1,55 +0,0 @@ -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; - -public class NutrientTank extends FluidTank { - - public NutrientTank(int capacity) { - 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 || !canFill(resource.getFluid())) { - return 0; - } - return super.fill(resource, doFill); - } - - 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/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index c2c4b872..e6306c8a 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -23,12 +23,13 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.AbstractGeneratorEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerDistributor; +import crazypants.enderio.tool.SmartTank; public class TileZombieGenerator extends AbstractGeneratorEntity implements IFluidHandler, ITankAccess, IHasNutrientTank { private static int IO_MB_TICK = 250; - final NutrientTank fuelTank = new NutrientTank(FluidContainerRegistry.BUCKET_VOLUME * 2); + final SmartTank fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, FluidContainerRegistry.BUCKET_VOLUME * 2); int outputPerTick = Config.zombieGeneratorRfPerTick; int tickPerBucketOfFuel = Config.zombieGeneratorTicksPerBucketFuel; @@ -276,7 +277,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu } @Override - public NutrientTank getNutrientTank() { + public SmartTank getNutrientTank() { return fuelTank; } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index ecca1d2b..01e5efc3 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -2,14 +2,18 @@ package crazypants.enderio.machine.invpanel; import java.util.Random; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ClientProxy; +import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; @@ -26,6 +30,7 @@ public class BlockInventoryPanel extends AbstractMachineBlock { @@ -59,8 +64,10 @@ public class GuiInventoryPanel extends GuiMachineBase { private final GuiToolTip ttRefill; private final VScrollbar scrollbar; private final MultiIconButton btnClear; + private final GuiToolTip ttSetReceipe; private int scrollPos; + private int ghostSlotTooltipStacksize; private final String headerCrafting; private final String headerReturn; @@ -83,10 +90,18 @@ public class GuiInventoryPanel extends GuiMachineBase { this.view = new DatabaseView(); + int sortMode = te.getGuiSortMode(); + int sortOrderIdx = sortMode >> 1; + SortOrder[] orders = SortOrder.values(); + if(sortOrderIdx >= 0 && te.getGuiSortMode() < orders.length) { + view.setSortOrder(orders[sortOrderIdx], (sortMode & 1) != 0); + } + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; tfFilter = new TextFieldEnder(fr, 108, 11, 106, 10); tfFilter.setEnableBackgroundDrawing(false); + tfFilter.setText(te.getGuiFilterString()); btnSort = new IconButton(this, ID_SORT, 233, 27, getSortOrderIcon()) { @Override public boolean mousePressed(Minecraft mc, int x, int y) { @@ -132,6 +147,17 @@ public class GuiInventoryPanel extends GuiMachineBase { ttRefill.setVisible(false); addToolTip(ttRefill); + list.clear(); + + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.setrecipe.line"); + ttSetReceipe = new GuiToolTip(btnRefill, list) { + @Override + public boolean shouldDraw() { + return super.shouldDraw() && getContainer().hasCraftingRecipe(); + } + }; + addToolTip(ttSetReceipe); + list.clear(); SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.clear.line"); btnClear.setToolTip(list.toArray(new String[list.size()])); @@ -146,9 +172,20 @@ public class GuiInventoryPanel extends GuiMachineBase { }); } + @Override + public void onGuiClosed() { + int sortMode = (view.getSortOrder().ordinal() << 1); + if(view.isSortOrderInverted()) { + sortMode |= 1; + } + getTileEntity().setGuiParameter(sortMode, tfFilter.getText()); + super.onGuiClosed(); + } + public void setCraftingHelper(ICraftingHelper craftingHelper) { this.craftingHelper = craftingHelper; ttRefill.setVisible(craftingHelper != null); + ttSetReceipe.setVisible(craftingHelper == null); } @Override @@ -172,7 +209,7 @@ public class GuiInventoryPanel extends GuiMachineBase { if(getContainer().clearCraftingGrid()) { if(craftingHelper != null) { craftingHelper.remove(); - craftingHelper = null; + setCraftingHelper(null); } } } @@ -191,6 +228,10 @@ public class GuiInventoryPanel extends GuiMachineBase { boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); int iconX = hover ? (isShiftKeyDown() ? 48 : 24) : 0; drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); + } else if(getContainer().hasCraftingRecipe()) { + boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); + int iconX = hover ? 96 : 72; + drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); } int headerColor = 0x404040; @@ -200,7 +241,7 @@ public class GuiInventoryPanel extends GuiMachineBase { fr.drawString(headerInventory, sx + 38, sy + 120, headerColor); TileInventoryPanel te = getTileEntity(); - NutrientTank fuelTank = te.fuelTank; + SmartTank fuelTank = te.fuelTank; if(fuelTank.getFluidAmount() > 0) { RenderUtil.renderGuiTank(fuelTank.getFluid(), fuelTank.getCapacity(), fuelTank.getFluidAmount(), sx + 12, sy + 132, zLevel, 16, 47); } @@ -236,13 +277,40 @@ public class GuiInventoryPanel extends GuiMachineBase { font = fontRendererObj; } String str = null; - if(stack.stackSize > 999) { - str = (stack.stackSize / 1000) + "k"; + if(stack.stackSize >= 1000) { + int value = stack.stackSize / 1000; + String unit = "k"; + if(value >= 1000) { + value /= 1000; + unit = "m"; + } + str = value + unit; } itemRender.renderItemAndEffectIntoGUI(font, mc.renderEngine, stack, x, y); itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, stack, x, y, str); } + @Override + protected void drawGhostSlotTooltip(GhostSlot slot, int mouseX, int mouseY) { + ItemStack stack = slot.getStack(); + if(stack != null) { + ghostSlotTooltipStacksize = stack.stackSize; + try { + renderToolTip(stack, mouseX, mouseY); + } finally { + ghostSlotTooltipStacksize = 0; + } + } + } + + @Override + public void drawHoveringText(List list, int mouseX, int mouseY, FontRenderer font) { + if(ghostSlotTooltipStacksize >= 1000) { + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.inventorypanel.tooltip.itemsstored", Integer.toString(ghostSlotTooltipStacksize))); + } + super.drawHoveringText(list, mouseX, mouseY, font); + } + public InventoryPanelContainer getContainer() { return (InventoryPanelContainer) inventorySlots; } @@ -323,6 +391,19 @@ public class GuiInventoryPanel extends GuiMachineBase { return 212; } + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + // NEI seems to have an issue with the shifted GUI position - so let's work around it + if(x+w >= guiLeft && x < guiLeft+xSize && y+h >= guiTop && y < guiTop+49) { + return true; + } + if(x+w >= guiLeft && x < guiLeft+232 && x+h >= guiTop+49 && y < guiTop+ySize) { + return true; + } + return false; + } + @Override protected void mouseClicked(int x, int y, int button) { super.mouseClicked(x, y, button); @@ -330,12 +411,21 @@ public class GuiInventoryPanel extends GuiMachineBase { x -= guiLeft; y -= guiTop; - if(craftingHelper != null && btnRefill.contains(x, y)) { - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); - craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); + if(btnRefill.contains(x, y)) { + if(craftingHelper != null) { + playClickSound(); + craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); + } else if(getContainer().hasCraftingRecipe()) { + playClickSound(); + setCraftingHelper(CraftingHelper.createFromSlots(getContainer().getCraftingGridSlots())); + } } } + private void playClickSound() { + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + } + @Override protected void mouseWheel(int x, int y, int delta) { super.mouseWheel(x, y, delta); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index ae6e0f9a..9557ba31 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -240,6 +240,10 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements return cleared; } + public boolean hasCraftingRecipe() { + return getSlot(slotCraftResult).getHasStack(); + } + @Override protected List getTargetSlotsForTransfer(int slotIndex, Slot slot) { if((slotIndex == slotCraftResult) || (slotIndex >= firstSlotReturn && slotIndex < endSlotReturn)) { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java new file mode 100644 index 00000000..f41021a1 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java @@ -0,0 +1,75 @@ +package crazypants.enderio.machine.invpanel; + +import io.netty.buffer.ByteBuf; + +import java.io.UnsupportedEncodingException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.network.MessageTileEntity; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class PacketGuiSettings extends MessageTileEntity implements IMessageHandler { + + private int sortMode; + private String filterString; + + public PacketGuiSettings() { + filterString = ""; + } + + public PacketGuiSettings(TileInventoryPanel tile, int sortMode, String filterString) { + super(tile); + this.sortMode = sortMode; + this.filterString = filterString; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + sortMode = buf.readInt(); + int len = buf.readUnsignedShort(); + if(len > 0) { + byte[] utf8 = new byte[len]; + buf.readBytes(utf8); + try { + filterString = new String(utf8, "UTF8"); + } catch (UnsupportedEncodingException ex) { + // should not happen - if it does we can't do anything + } + } + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(sortMode); + if(filterString.isEmpty()) { + buf.writeShort(0); + } else { + try { + byte[] utf8 = filterString.getBytes("UTF8"); + buf.writeShort((short) utf8.length); + buf.writeBytes(utf8); + } catch (UnsupportedEncodingException ex) { + // should not happen - if it does we can't do anything + buf.writeShort(0); + } + } + } + + @Override + public IMessage onMessage(PacketGuiSettings message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if(te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + teInvPanel.setGuiParameter(message.sortMode, message.filterString); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index f83040db..26b95445 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -13,6 +13,7 @@ import net.minecraftforge.fluids.IFluidHandler; import com.enderio.core.api.common.util.ITankAccess; +import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.item.FilterRegister; @@ -23,12 +24,12 @@ 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.invpanel.client.ClientDatabaseManager; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.SmartTank; public class TileInventoryPanel extends AbstractMachineEntity implements IFluidHandler, ITankAccess, IHasNutrientTank { @@ -37,7 +38,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH public static final int SLOT_VIEW_FILTER = 10; public static final int SLOT_RETURN_START = 11; - protected final NutrientTank fuelTank; + protected final SmartTank fuelTank; protected boolean tanksDirty; private InventoryDatabaseServer dbServer; @@ -48,9 +49,12 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH public Container eventHandler; private IItemFilter itemFilter; + private int guiSortMode; + private String guiFilterString = ""; + public TileInventoryPanel() { super(new SlotDefinition(0, 8, 11, 20, 21, 20)); - this.fuelTank = new NutrientTank(2000); + this.fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, 2000); } public InventoryDatabaseServer getDatabaseServer() { @@ -202,16 +206,38 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH return false; } + public int getGuiSortMode() { + return guiSortMode; + } + + public String getGuiFilterString() { + return guiFilterString; + } + + public void setGuiParameter(int sortMode, String filterString) { + this.guiSortMode = sortMode; + this.guiFilterString = filterString; + if(worldObj != null && worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketGuiSettings(this, sortMode, filterString)); + } else { + markDirty(); + } + } + @Override public void writeCommon(NBTTagCompound nbtRoot) { super.writeCommon(nbtRoot); fuelTank.writeCommon("fuelTank", nbtRoot); + nbtRoot.setInteger("guiSortMode", guiSortMode); + nbtRoot.setString("guiFilterString", guiFilterString); } @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); fuelTank.readCommon("fuelTank", nbtRoot); + guiSortMode = nbtRoot.getInteger("guiSortMode"); + guiFilterString = nbtRoot.getString("guiFilterString"); } @Override @@ -296,7 +322,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH } @Override - public NutrientTank getNutrientTank() { + public SmartTank getNutrientTank() { return fuelTank; } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java new file mode 100644 index 00000000..299085ee --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java @@ -0,0 +1,224 @@ +package crazypants.enderio.machine.invpanel.client; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.ItemUtil; + +import crazypants.enderio.machine.invpanel.GuiInventoryPanel; +import crazypants.enderio.machine.invpanel.InventoryPanelContainer; +import crazypants.enderio.machine.invpanel.PacketFetchItem; +import crazypants.enderio.network.PacketHandler; + +public class CraftingHelper implements ICraftingHelper { + final ItemStack[][] ingredients; + + public CraftingHelper(ItemStack[][] ingredients) { + this.ingredients = ingredients; + } + + public static ICraftingHelper createFromSlots(List slots) { + if (slots.size() != 9) { + return null; + } + ItemStack[][] ingredients = new ItemStack[9][]; + int count = 0; + for (int idx = 0; idx < 9; idx++) { + Slot slot = slots.get(idx); + ItemStack stack = slot.getStack(); + if(stack != null) { + stack = stack.copy(); + stack.stackSize = 1; + ingredients[idx] = new ItemStack[] { stack }; + count++; + } + } + if (count > 0) { + return new CraftingHelper(ingredients); + } + return null; + } + + @Override + public void remove() { + } + + @Override + public void refill(GuiInventoryPanel gui, int amount) { + InventoryPanelContainer container = gui.getContainer(); + InventoryDatabaseClient db = gui.getDatabase(); + List craftingGrid = container.getCraftingGridSlots(); + int slotsToProcess = (1 << 9) - 1; + boolean madeProgress; + int maxAmount = 64; + do { + Candidate[] candidates = new Candidate[9]; + for (int idx = 0; idx < 9; idx++) { + if ((slotsToProcess & (1 << idx)) != 0) { + ItemStack[] pstack = ingredients[idx]; + Slot slot = craftingGrid.get(idx); + ItemStack stack = slot.getStack(); + if (pstack == null) { + if (stack != null) { + return; + } + } else { + Candidate candidate; + if (stack != null) { + if (!isStackCompatible(pstack, stack)) { + return; + } + candidate = findCandidates(stack, gui, db, candidates); + } else { + candidate = findAllCandidates(pstack, gui, db, candidates); + } + if (candidate == null) { + return; + } + candidate.used++; + candidates[idx] = candidate; + } + } + } + int targetAmount = maxAmount; + int currentAmount = 0; + for (int idx = 0; idx < 9; idx++) { + Candidate candidate = candidates[idx]; + if (candidate != null) { + Slot slot = craftingGrid.get(idx); + int current = getSlotStackSize(slot); + int maxStackSize = candidate.stack.getMaxStackSize(); + currentAmount = Math.max(currentAmount, current); + if (candidate.stack.isStackable() && maxStackSize > 1) { + targetAmount = Math.min(targetAmount, current + Math.min(maxStackSize, candidate.getAvailable())); + } + } + } + targetAmount = Math.min(targetAmount, currentAmount + amount); + madeProgress = false; + for (int idx = 0; idx < 9; idx++) { + final int mask = 1 << idx; + Candidate candidate = candidates[idx]; + if (candidate != null) { + Slot slot = craftingGrid.get(idx); + for (Slot srcSlot : candidate.sourceSlots) { + int current = getSlotStackSize(slot); + if (current >= targetAmount) { + break; + } + if (container.moveItems(srcSlot.slotNumber, slot.slotNumber, slot.slotNumber + 1, targetAmount - current)) { + slotsToProcess &= ~mask; + madeProgress = true; + } + } + int current = getSlotStackSize(slot); + if (candidate.entry != null) { + if (current < targetAmount) { + int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); + PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); + slotsToProcess &= ~mask; + current += toMove; + } + } + if (current > 0) { + maxAmount = Math.min(maxAmount, current); + } + } + } + } while (madeProgress && slotsToProcess != 0); + } + + private static int getSlotStackSize(Slot slot) { + ItemStack stack = slot.getStack(); + return (stack != null) ? stack.stackSize : 0; + } + + private static boolean isStackCompatible(ItemStack[] pstack, ItemStack stack) { + for (ItemStack istack : pstack) { + if (ItemUtil.areStackMergable(stack, istack)) { + return true; + } + } + return false; + } + + private Candidate findAllCandidates(ItemStack[] pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { + Candidate bestInventory = null; + Candidate bestNetwork = null; + for (ItemStack istack : pstack) { + Candidate candidate = findCandidates(istack, gui, db, candidates); + if (candidate.available > 0) { + if (bestInventory == null || bestInventory.available < candidate.available) { + bestInventory = candidate; + } + } + if (candidate.entry != null) { + if (bestNetwork == null || bestNetwork.entry.getCount() < candidate.entry.getCount()) { + bestNetwork = candidate; + } + } + } + if (bestInventory != null) { + return bestInventory; + } else { + return bestNetwork; + } + } + + private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { + for (Candidate candidate : candidates) { + if (candidate != null && ItemUtil.areStackMergable(candidate.stack, stack)) { + return candidate; + } + } + Candidate candidate = new Candidate(stack); + InventoryPanelContainer container = gui.getContainer(); + findCandidates(candidate, stack, container.getReturnAreaSlots()); + findCandidates(candidate, stack, container.getPlayerInventorySlots()); + findCandidates(candidate, stack, container.getPlayerHotbarSlots()); + if (candidate.available == 0 && db != null) { + candidate.entry = db.lookupItem(stack, null, false); + if (candidate.entry != null && candidate.entry.getCount() <= 0) { + candidate.entry = null; + } + } + return candidate; + } + + private void findCandidates(Candidate candidates, ItemStack stack, Collection slots) { + for (Slot slot : slots) { + ItemStack slotStack = slot.getStack(); + if (slotStack != null && ItemUtil.areStackMergable(slotStack, stack)) { + candidates.sourceSlots.add(slot); + candidates.available += slotStack.stackSize; + } + } + } + + static class Candidate { + final ItemStack stack; + final ArrayList sourceSlots = new ArrayList(); + ItemEntry entry; + int available; + int used; + + public Candidate(ItemStack stack) { + this.stack = stack; + } + + public int getAvailable() { + int avail = available; + if(entry != null) { + avail += entry.getCount(); + } + if(avail > 0 && used > 1) { + avail = Math.max(1, avail / used); + } + return avail; + } + } +} diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java index 419a2e81..bca1add3 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.invpanel.client; -import codechicken.lib.inventory.InventoryUtils; import codechicken.nei.LayoutManager; import codechicken.nei.OffsetPositioner; import codechicken.nei.PositionedStack; @@ -10,10 +9,6 @@ import codechicken.nei.api.IStackPositioner; import codechicken.nei.recipe.IRecipeHandler; import crazypants.enderio.machine.invpanel.GuiInventoryPanel; import crazypants.enderio.machine.invpanel.InventoryPanelContainer; -import crazypants.enderio.machine.invpanel.PacketFetchItem; -import crazypants.enderio.network.PacketHandler; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; @@ -40,9 +35,15 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { shift = guiInvPanel.getContainer().clearCraftingGrid(); } - PositionedStack[] slots = mapSlots(ingredients, guiInvPanel.getContainer()); + ItemStack[][] slots = mapSlots(ingredients, guiInvPanel.getContainer()); if(slots != null) { - CraftingHelper helper = new CraftingHelper(slots); + CraftingHelper helper = new CraftingHelper(slots) { + @Override + public void remove() { + super.remove(); + LayoutManager.overlayRenderer = null; + } + }; guiInvPanel.setCraftingHelper(helper); if(shift) { helper.refill(guiInvPanel, 64); @@ -52,15 +53,15 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { } } - private PositionedStack[] mapSlots(List ingredients, InventoryPanelContainer c) { - PositionedStack[] slots = new PositionedStack[9]; + private ItemStack[][] mapSlots(List ingredients, InventoryPanelContainer c) { + ItemStack[][] slots = new ItemStack[9][]; List craftingGrid = c.getCraftingGridSlots(); int found = 0; for(PositionedStack pstack : ingredients) { for(int idx = 0; idx < 9 ; idx++) { Slot slot = craftingGrid.get(idx); if(slot.xDisplayPosition == pstack.relx + CRAFTING_GRID_OFFSET_X && slot.yDisplayPosition == pstack.rely + CRAFTING_GRID_OFFSET_Y) { - slots[idx] = pstack; + slots[idx] = pstack.items; found++; break; } @@ -71,197 +72,4 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { } return slots; } - - static class CraftingHelper implements ICraftingHelper { - final PositionedStack[] ingredients; - - public CraftingHelper(PositionedStack[] ingredients) { - this.ingredients = ingredients; - } - - @Override - public void remove() { - LayoutManager.overlayRenderer = null; - } - - @Override - public void refill(GuiInventoryPanel gui, int amount) { - InventoryPanelContainer container = gui.getContainer(); - InventoryDatabaseClient db = gui.getDatabase(); - List craftingGrid = container.getCraftingGridSlots(); - int slotsToProcess = (1<<9)-1; - boolean madeProgress; - int maxAmount = 64; - do { - Candidate[] candidates = new Candidate[9]; - for(int idx = 0; idx < 9; idx++) { - if((slotsToProcess & (1 << idx)) != 0) { - PositionedStack pstack = ingredients[idx]; - Slot slot = craftingGrid.get(idx); - ItemStack stack = slot.getStack(); - if(pstack == null) { - if(stack != null) { - return; - } - } else { - Candidate candidate; - if(stack != null) { - if(!isStackCompatible(pstack, stack)) { - return; - } - candidate = findCandidates(stack, gui, db, candidates); - } else { - candidate = findAllCandidates(pstack, gui, db, candidates); - } - - if(candidate == null) { - return; - } - candidate.used++; - candidates[idx] = candidate; - } - } - } - - int targetAmount = maxAmount; - int currentAmount = 0; - for(int idx = 0; idx < 9; idx++) { - Candidate candidate = candidates[idx]; - if(candidate != null) { - Slot slot = craftingGrid.get(idx); - int current = getSlotStackSize(slot); - int maxStackSize = candidate.stack.getMaxStackSize(); - currentAmount = Math.max(currentAmount, current); - if(candidate.stack.isStackable() && maxStackSize > 1) { - targetAmount = Math.min(targetAmount, current + Math.min(maxStackSize, candidate.getAvailable())); - } - } - } - - targetAmount = Math.min(targetAmount, currentAmount + amount); - madeProgress = false; - for(int idx = 0; idx < 9; idx++) { - final int mask = 1 << idx; - Candidate candidate = candidates[idx]; - if(candidate != null) { - Slot slot = craftingGrid.get(idx); - for(Slot srcSlot : candidate.sourceSlots) { - int current = getSlotStackSize(slot); - if(current >= targetAmount) { - break; - } - if(container.moveItems(srcSlot.slotNumber, slot.slotNumber, slot.slotNumber+1, targetAmount - current)) { - slotsToProcess &= ~mask; - madeProgress = true; - } - } - - int current = getSlotStackSize(slot); - if(candidate.entry != null) { - if(current < targetAmount) { - int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); - slotsToProcess &= ~mask; - current += toMove; - } - } - - if(current > 0) { - maxAmount = Math.min(maxAmount, current); - } - } - } - }while(madeProgress && slotsToProcess != 0); - } - - private static int getSlotStackSize(Slot slot) { - ItemStack stack = slot.getStack(); - return (stack != null) ? stack.stackSize : 0; - } - - private static boolean isStackCompatible(PositionedStack pstack, ItemStack stack) { - for(ItemStack istack : pstack.items) { - if(InventoryUtils.canStack(stack, istack)) { - return true; - } - } - return false; - } - - private Candidate findAllCandidates(PositionedStack pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { - Candidate bestInventory = null; - Candidate bestNetwork = null; - for(ItemStack istack : pstack.items) { - Candidate candidate = findCandidates(istack, gui, db, candidates); - if(candidate.available > 0) { - if(bestInventory == null || bestInventory.available < candidate.available) { - bestInventory = candidate; - } - } - if(candidate.entry != null) { - if(bestNetwork == null || bestNetwork.entry.getCount() < candidate.entry.getCount()) { - bestNetwork = candidate; - } - } - } - if(bestInventory != null) { - return bestInventory; - } else { - return bestNetwork; - } - } - - private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { - for(Candidate candidate : candidates) { - if(candidate != null && InventoryUtils.canStack(candidate.stack, stack)) { - return candidate; - } - } - Candidate candidate = new Candidate(stack); - InventoryPanelContainer container = gui.getContainer(); - findCandidates(candidate, stack, container.getReturnAreaSlots()); - findCandidates(candidate, stack, container.getPlayerInventorySlots()); - findCandidates(candidate, stack, container.getPlayerHotbarSlots()); - if(candidate.available == 0 && db != null) { - candidate.entry = db.lookupItem(stack, null, false); - if(candidate.entry != null && candidate.entry.getCount() <= 0) { - candidate.entry = null; - } - } - return candidate; - } - - private void findCandidates(Candidate candidates, ItemStack stack, Collection slots) { - for(Slot slot : slots) { - ItemStack slotStack = slot.getStack(); - if(slotStack != null && InventoryUtils.canStack(slotStack, stack)) { - candidates.sourceSlots.add(slot); - candidates.available += slotStack.stackSize; - } - } - } - } - - static class Candidate { - final ItemStack stack; - final ArrayList sourceSlots = new ArrayList(); - ItemEntry entry; - int available; - int used; - - public Candidate(ItemStack stack) { - this.stack = stack; - } - - public int getAvailable() { - int avail = available; - if(entry != null) { - avail += entry.getCount(); - } - if(avail > 0 && used > 1) { - avail = Math.max(1, avail / used); - } - return avail; - } - } } diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 10e46725..bce9a9ca 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -40,10 +40,10 @@ 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.tool.SmartTank; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; @@ -63,7 +63,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle protected WirelessChargedLocation chargedLocation; - final NutrientTank fuelTank = new NutrientTank(FluidContainerRegistry.BUCKET_VOLUME * 2); + final SmartTank fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, FluidContainerRegistry.BUCKET_VOLUME * 2); int lastFluidLevelUpdate; @@ -569,7 +569,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle } @Override - public NutrientTank getNutrientTank() { + public SmartTank getNutrientTank() { return fuelTank; } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index c09010d9..86ff59dc 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -24,6 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import com.enderio.core.common.TileEntityEnder; +import com.enderio.core.common.util.Util; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; @@ -186,7 +187,7 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid } return Blocks.anvil.getIcon(world, x, y, z, blockSide); } - + @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister IIconRegister) { @@ -240,6 +241,11 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid super(Blocks.glowstone, BlockPaintedGlowstone.this); MinecraftForge.EVENT_BUS.register(this); } + + @Override + public boolean isValidPaintSource(ItemStack paintSource) { + return super.isValidPaintSource(paintSource) && Util.getBlockFromItemId(paintSource).isOpaqueCube(); + } @Override public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java index 13f3e55c..30b36f43 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java @@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; @@ -171,7 +172,7 @@ public class ReservoirRenderer extends TileEntitySpecialRenderer implements IRes private IIcon getLiquidTexture() { if(tex == null) { - tex = ReservoirTank.WATER.getFluid().getStillIcon(); + tex = FluidRegistry.WATER.getStillIcon(); } return tex; } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirTank.java b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirTank.java deleted file mode 100644 index 7ca0d7f7..00000000 --- a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirTank.java +++ /dev/null @@ -1,66 +0,0 @@ -package crazypants.enderio.machine.reservoir; - -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; - -public class ReservoirTank extends FluidTank { - - static final FluidStack WATER = FluidRegistry.getFluidStack("water", 0); - - ReservoirTank(int quantity, int capacity) { - super(WATER.getFluid(), quantity, capacity); - } - - ReservoirTank(int capacity) { - this(0, capacity); - } - - ReservoirTank(FluidStack liquid, int capacity) { - super(liquid, capacity); - } - - public int getAmount() { - return getFluid().amount; - } - - public float getFilledRatio() { - return (float) getAmount() / getCapacity(); - } - - public boolean isFull() { - return getAmount() >= getCapacity(); - } - - public void setAmount(int amount) { - FluidStack newLiquid = WATER.copy(); - newLiquid.amount = Math.min(getCapacity(), amount); - setFluid(newLiquid); - } - - @Override - public FluidStack getFluid() { - FluidStack l = super.getFluid(); - if(l == null) { - l = WATER.copy(); - setFluid(l); - } - return l; - } - - public int getAvailableSpace() { - return getCapacity() - getAmount(); - } - - public void addAmount(int amount) { - setAmount(getAmount() + amount); - } - - @Override - public void setCapacity(int capacity) { - super.setCapacity(capacity); - if(getAmount() > capacity) { - setAmount(capacity); - } - } -} diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index 44ec1e2d..4b5f1ab3 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -20,6 +20,7 @@ import com.enderio.core.common.vecmath.Vector3f; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.tool.SmartTank; import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; @@ -68,9 +69,9 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank // Position within multiblock Pos pos = Pos.UNKNOWN; - ReservoirTank tank = new ReservoirTank(BUCKET_VOLUME); + SmartTank tank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME); - ReservoirTank regenTank = null; + SmartTank regenTank = null; boolean autoEject; @@ -107,8 +108,8 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank if(autoEject && neighboursDirty) { doUpdateTankNeighbours(); } - if(autoEject && tankNeighbours != null && !tankNeighbours.isEmpty() && tank.getAmount() > 0) { - int ejectable = tank.getAmount(); + if(autoEject && tankNeighbours != null && !tankNeighbours.isEmpty() && tank.getFluidAmount() > 0) { + int ejectable = tank.getFluidAmount(); int amountPerNeighbour = ejectable / tankNeighbours.size(); FluidStack source = WATER_BUCKET.copy(); int used = 0; @@ -258,13 +259,14 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank if(liquid != null) { tank.setFluid(liquid); } else { - tank.setAmount(0); + tank.setFluidAmount(0); } if(regenLiquid == null) { regenTank = null; } else { - regenTank = new ReservoirTank(regenLiquid, BUCKET_VOLUME * 2); + regenTank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME * 2); + regenTank.setFluidAmount(regenLiquid.amount); } boolean wasMulti = isMultiblock(); @@ -301,7 +303,7 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank nbtRoot.setBoolean("autoEject", autoEject); - if(tank.getFluid() != null && FluidRegistry.getFluidName(tank.getFluid().fluidID) != null) { + if(tank.getFluid() != null && FluidRegistry.getFluidName(tank.getFluid()) != null) { nbtRoot.setTag("tank", tank.getFluid().writeToNBT(new NBTTagCompound())); } if(regenTank != null) { @@ -418,19 +420,19 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank if(isMaster()) { - regenTank = new ReservoirTank(BUCKET_VOLUME * 2); + regenTank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME * 2); tank.setCapacity(BUCKET_VOLUME * 2); for (BlockCoord bc : multiblock) { TileReservoir res = getReservoir(bc); if(res != null) { FluidStack drained = res.doDrain(ForgeDirection.UNKNOWN, regenTank.getAvailableSpace(), true); if(drained != null) { - regenTank.addAmount(drained.amount); + regenTank.addFluidAmount(drained.amount); } // incase regen tank is full, add to normal tank drained = res.doDrain(ForgeDirection.UNKNOWN, tank.getAvailableSpace(), true); if(drained != null) { - tank.addAmount(drained.amount); + tank.addFluidAmount(drained.amount); } } } @@ -683,10 +685,10 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank @Override public void setTanksDirty() { if (isMaster() && regenTank != null && tank != null) { - if (!regenTank.isFull() && tank.getAmount() > 0) { - int toMove = Math.min(tank.getAmount(), regenTank.getCapacity() - regenTank.getAmount()); - regenTank.setAmount(regenTank.getAmount() + toMove); - tank.setAmount(tank.getAmount() - toMove); + if (!regenTank.isFull() && tank.getFluidAmount() > 0) { + int toMove = Math.min(tank.getFluidAmount(), regenTank.getCapacity() - regenTank.getFluidAmount()); + regenTank.setFluidAmount(regenTank.getFluidAmount() + toMove); + tank.setFluidAmount(tank.getFluidAmount() - toMove); } } tankDirty = true; diff --git a/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java b/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java deleted file mode 100644 index 0c226b40..00000000 --- a/src/main/java/crazypants/enderio/machine/tank/FluidTankEio.java +++ /dev/null @@ -1,44 +0,0 @@ -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/TankFluidRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java index 65a60047..d2b1d158 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java @@ -13,6 +13,7 @@ import com.enderio.core.client.render.RenderUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.tool.SmartTank; @SideOnly(Side.CLIENT) public class TankFluidRenderer extends TileEntitySpecialRenderer { @@ -27,7 +28,7 @@ public class TankFluidRenderer extends TileEntitySpecialRenderer { renderTankFluid(tank.tank, (float)x, (float)y, (float)z); } - public static void renderTankFluid(FluidTankEio tank, float x, float y, float z) { + public static void renderTankFluid(SmartTank tank, float x, float y, float z) { if(tank == null || tank.getFluid() == null) { return; } diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index bc87d30d..f7f86fff 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -24,12 +24,13 @@ import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.SmartTank; public class TileTank extends AbstractMachineEntity implements IFluidHandler, ITankAccess { private static int IO_MB_TICK = 100; - protected FluidTankEio tank;// = new FluidTankEio(16000); + protected SmartTank tank;// = new FluidTankEio(16000); protected int lastUpdateLevel = -1; private boolean tankDirty = false; @@ -38,9 +39,9 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT public TileTank(int meta) { super(new SlotDefinition(0, 1, 2, 3, -1, -1)); if(meta == 1) { - tank = new FluidTankEio(32000); + tank = new SmartTank(32000); } else { - tank = new FluidTankEio(16000); + tank = new SmartTank(16000); } } @@ -347,9 +348,9 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT int tankType = nbtRoot.getInteger("tankType"); tankType = MathHelper.clamp_int(tankType, 0, 1); if(tankType == 1) { - tank = new FluidTankEio(32000); + tank = new SmartTank(32000); } else { - tank = new FluidTankEio(16000); + tank = new SmartTank(16000); } if(nbtRoot.hasKey("tankContents")) { diff --git a/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java b/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java deleted file mode 100644 index cf19413f..00000000 --- a/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package crazypants.enderio.teleport; - -import net.minecraft.entity.player.EntityPlayerMP; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.packet.PacketConfigSync; - -public class ConnectionHandler { - - @SubscribeEvent - public void onPlayerLoggon(PlayerLoggedInEvent evt) { - PacketHandler.INSTANCE.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player); - } - -} diff --git a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java index bd2af4ac..bd5af150 100644 --- a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java +++ b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java @@ -43,5 +43,8 @@ public class TeleportRecipes { ItemStack fq = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal()); GameRegistry.addRecipe(new ShapedOreRecipe(telepad, "gSg", "dAd", "dod", 'g', fq, 'S', staff, 'd', "ingotDarkSteel", 'A', travelBlock, 'o', octadic)); } + + ItemStack coordSelector = new ItemStack(EnderIO.itemCoordSelector); + GameRegistry.addRecipe(new ShapedOreRecipe(coordSelector, "sps", " cs", " s", 's', "ingotElectricalSteel", 'p', Items.ender_pearl, 'c', Items.compass)); } } diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index 921220a8..32982054 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -20,7 +20,6 @@ import net.minecraftforge.common.UsernameCache; import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.TileEntityEnder; -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; @@ -36,13 +35,11 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.ConnectionHandler; import crazypants.enderio.teleport.ContainerTravelAccessable; import crazypants.enderio.teleport.ContainerTravelAuth; import crazypants.enderio.teleport.GuiTravelAccessable; import crazypants.enderio.teleport.GuiTravelAuth; import crazypants.enderio.teleport.packet.PacketAccessMode; -import crazypants.enderio.teleport.packet.PacketConfigSync; import crazypants.enderio.teleport.packet.PacketDrainStaff; import crazypants.enderio.teleport.packet.PacketLabel; import crazypants.enderio.teleport.packet.PacketOpenAuthGui; @@ -60,10 +57,6 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt PacketHandler.INSTANCE.registerMessage(PacketTravelEvent.class, PacketTravelEvent.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketOpenAuthGui.class, PacketOpenAuthGui.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); - - ConnectionHandler ch = new ConnectionHandler(); - FMLCommonHandler.instance().bus().register(ch); BlockTravelAnchor result = new BlockTravelAnchor(); result.init(); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index 162572cb..529211c0 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -9,10 +9,12 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.obj.GroupObject; +import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.TechneModelRenderer; import com.enderio.core.client.render.TechneUtil; +import com.enderio.core.common.util.BlockCoord; import com.google.common.collect.Lists; import crazypants.enderio.EnderIO; @@ -38,21 +40,41 @@ public class TelePadRenderer extends TechneModelRenderer { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { TileTelePad te = (TileTelePad) world.getTileEntity(x, y, z); - IIcon cached = renderer.overrideBlockTexture; boolean ret = true; - if(te.inNetwork()) { - renderer.overrideBlockTexture = null; - if(te.isMaster()) { - super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + if (te.inNetwork()) { + if (renderer.hasOverrideBlockTexture()) { + IIcon icon = renderer.overrideBlockTexture; + renderer.renderFaceYNeg(block, x, y, z, icon); + renderer.renderFaceYPos(block, x, y, z, icon); + BlockCoord bc = te.getLocation(); + if (!isTelepad(world, bc, ForgeDirection.EAST)) { + renderer.renderFaceXPos(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.WEST)) { + renderer.renderFaceXNeg(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.SOUTH)) { + renderer.renderFaceZPos(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.NORTH)) { + renderer.renderFaceZNeg(block, x, y, z, icon); + } } else { - ret = false; + if (te.isMaster()) { + super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + } else { + ret = false; + } } } else { renderer.renderStandardBlock(block, x, y, z); } - renderer.overrideBlockTexture = cached; return ret; } + + private boolean isTelepad(IBlockAccess world, BlockCoord pos, ForgeDirection dir) { + return pos.getLocation(dir).getTileEntity(world) instanceof TileTelePad; + } @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 80d151c8..3d7b6fe8 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -49,7 +49,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private boolean inNetwork; - private EnumSet connections = EnumSet.noneOf(ForgeDirection.class); + EnumSet connections = EnumSet.noneOf(ForgeDirection.class); private EnergyStorage energy = new EnergyStorage(100000, 1000, 1000); @@ -343,9 +343,12 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private int calculateTeleportPower() { if (worldObj.provider.dimensionId == targetDim) { - this.maxPower = new BlockCoord(this).getDist(target) * 1000; + int distance = new BlockCoord(this).getDist(target); + double base = Math.log((0.005 * distance) + 1); + this.maxPower = (int) (base * Config.telepadPowerCoefficient); + } else { - this.maxPower = 100000; + this.maxPower = Config.telepadPowerInterdimensional; } return this.maxPower; } @@ -390,6 +393,11 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei public float getProgress() { return ((float) powerUsed) / ((float) maxPower); } + + @Override + protected int getProgressUpdateFreq() { + return 1; + } @Override public void setProgress(float progress) { diff --git a/src/main/java/crazypants/enderio/tool/SmartTank.java b/src/main/java/crazypants/enderio/tool/SmartTank.java new file mode 100644 index 00000000..b99fa0d0 --- /dev/null +++ b/src/main/java/crazypants/enderio/tool/SmartTank.java @@ -0,0 +1,165 @@ +package crazypants.enderio.tool; + +import com.google.common.base.Strings; + +import crazypants.enderio.EnderIO; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; + +public class SmartTank extends FluidTank { + + protected Fluid restriction; + + public SmartTank(FluidStack liquid, int capacity) { + super(liquid, capacity); + if (liquid != null) { + restriction = liquid.getFluid(); + } else { + restriction = null; + } + } + + public SmartTank(int capacity) { + super(capacity); + } + + public SmartTank(Fluid liquid, int capacity) { + super(capacity); + restriction = liquid; + } + + public void setRestriction(Fluid restriction) { + this.restriction = restriction; + } + + 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); + } + + public boolean canFill(FluidStack resource) { + if (fluid != null) { + return fluid.isFluidEqual(resource); + } else if (restriction != null) { + return resource.getFluid() != null && restriction.getID() == resource.getFluid().getID(); + } else { + return true; + } + } + + public boolean canFill(Fluid fl) { + if (fluid != null) { + return fluid.getFluid().getID() == fl.getID(); + } else if (restriction != null) { + return restriction.getID() == fl.getID(); + } else { + return true; + } + } + + public void setFluidAmount(int amount) { + if(amount > 0) { + if (fluid != null) { + fluid.amount = Math.min(capacity, amount); + } else if (restriction != null) { + setFluid(new FluidStack(restriction, Math.min(capacity, amount))); + } else { + throw new RuntimeException("Cannot set fluid amount of an empty tank"); + } + } else { + setFluid(null); + } + } + + @Override + public int fill(FluidStack resource, boolean doFill) { + if(!canFill(resource)) { + return 0; + } + return super.fill(resource, doFill); + } + + @Override + public FluidStack getFluid() { + if (fluid != null) { + return fluid; + } else if (restriction != null) { + return new FluidStack(restriction, 0); + } else { + return null; + } + } + + public int getAvailableSpace() { + return getCapacity() - getFluidAmount(); + } + + public void addFluidAmount(int amount) { + setFluidAmount(getFluidAmount() + amount); + } + + @Override + public void setCapacity(int capacity) { + super.setCapacity(capacity); + if(getFluidAmount() > capacity) { + setFluidAmount(capacity); + } + } + + public void writeCommon(String name, NBTTagCompound nbtRoot) { + if(getFluidAmount() > 0 || restriction != null) { + NBTTagCompound tankRoot = new NBTTagCompound(); + writeToNBT(tankRoot); + if (restriction != null) { + tankRoot.setString("FluidRestriction", FluidRegistry.getFluidName(restriction.getID())); + } + nbtRoot.setTag(name, tankRoot); + } else { + nbtRoot.removeTag(name); + } + } + + public void readCommon(String name, NBTTagCompound nbtRoot) { + NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag(name); + if(tankRoot != null) { + readFromNBT(tankRoot); + restriction = null; + if (tankRoot.hasKey("FluidRestriction")) { + String fluidName = tankRoot.getString("FluidRestriction"); + if (!Strings.isNullOrEmpty(fluidName)) { + restriction = FluidRegistry.getFluid(fluidName); + } + } + } else { + setFluid(null); + // not reseting 'restriction' here on purpose + } + } +}