From fa7b9b49bc2bed3bfbcfb42f36b1b9627a409019 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 28 Mar 2017 23:21:06 -0400 Subject: [PATCH] Fix glow panel placement, fixed damage displays (again), start work on new inventory system --- .../mekanism/common/block/BlockGlowPanel.java | 2 +- .../common/content/transporter/InvStack.java | 2 +- .../content/transporter/TransporterManager.java | 16 ++++++++-------- .../common/item/ItemBlockEnergyCube.java | 9 ++++++++- .../mekanism/common/item/ItemBlockGasTank.java | 9 ++++++++- .../mekanism/common/item/ItemBlockGlowPanel.java | 6 +++--- .../java/mekanism/common/item/ItemEnergized.java | 2 +- .../mekanism/common/item/ItemFlamethrower.java | 9 ++++++++- .../mekanism/common/item/ItemFreeRunners.java | 7 +++++++ .../java/mekanism/common/item/ItemJetpack.java | 9 ++++++++- .../java/mekanism/common/item/ItemScubaTank.java | 9 ++++++++- .../TileEntityLogisticalTransporter.java | 4 ++-- .../common/transmitters/TransporterImpl.java | 4 ++-- .../mekanism/common/util/InventoryUtils.java | 9 +++++---- 14 files changed, 70 insertions(+), 27 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java index 7f67441b5..e21839142 100644 --- a/src/main/java/mekanism/common/block/BlockGlowPanel.java +++ b/src/main/java/mekanism/common/block/BlockGlowPanel.java @@ -154,7 +154,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side) { - return world.isSideSolid(pos.offset(side), side.getOpposite()); + return world.isSideSolid(pos.offset(side.getOpposite()), side); } public static boolean canStay(TileEntityGlowPanel tileEntity) diff --git a/src/main/java/mekanism/common/content/transporter/InvStack.java b/src/main/java/mekanism/common/content/transporter/InvStack.java index 5ac8ab11f..99f8b1135 100644 --- a/src/main/java/mekanism/common/content/transporter/InvStack.java +++ b/src/main/java/mekanism/common/content/transporter/InvStack.java @@ -61,7 +61,7 @@ public final class InvStack if(inventory.getStackInSlot(slotIDs.get(i)).getCount() == stack.getCount() && stack.getCount() <= amount) { - inventory.setInventorySlotContents(slotIDs.get(i), null); + inventory.setInventorySlotContents(slotIDs.get(i), ItemStack.EMPTY); amount -= stack.getCount(); } else { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index 50ebb065b..a95d49c49 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -151,7 +151,7 @@ public class TransporterManager ItemStack inSlot = copy.inventory[i]; - if(inSlot == null) + if(inSlot == null || inSlot.isEmpty()) { if(toInsert.getCount() <= inv.getInventoryStackLimit()) { @@ -240,7 +240,7 @@ public class TransporterManager ItemStack inSlot = copy.inventory[slotID]; - if(inSlot == null) + if(inSlot == null || inSlot.isEmpty()) { if(toInsert.getCount() <= inv.getInventoryStackLimit()) { @@ -295,12 +295,12 @@ public class TransporterManager public static boolean didEmit(ItemStack stack, ItemStack returned) { - return returned == null || returned.getCount() < stack.getCount(); + return returned == null || returned.isEmpty() || returned.getCount() < stack.getCount(); } public static ItemStack getToUse(ItemStack stack, ItemStack returned) { - if(returned == null || returned.getCount() == 0) + if(returned == null || returned.isEmpty() || returned.getCount() == 0) { return stack; } @@ -360,11 +360,11 @@ public class TransporterManager ItemStack inSlot = copy.inventory[i]; - if(toInsert == null) + if(toInsert == null || toInsert.isEmpty()) { return null; } - else if(inSlot == null) + else if(inSlot == null || inSlot.isEmpty()) { if(toInsert.getCount() <= inventory.getInventoryStackLimit()) { @@ -435,11 +435,11 @@ public class TransporterManager ItemStack inSlot = copy.inventory[slotID]; - if(toInsert == null) + if(toInsert == null || toInsert.isEmpty()) { return null; } - else if(inSlot == null) + else if(inSlot == null || inSlot.isEmpty()) { if(toInsert.getCount() <= inventory.getInventoryStackLimit()) { diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index d372318da..6b68605d4 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -42,6 +42,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.common.Optional.Interface; @@ -310,8 +311,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override public double getDurabilityForDisplay(ItemStack stack) { - return getEnergy(stack)/getMaxEnergy(stack); + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); } + + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) + { + return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); + } @Override @Method(modid = "IC2") diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 759b3c025..58b5cdf6b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -40,6 +40,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -336,9 +337,15 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public double getDurabilityForDisplay(ItemStack stack) { - return (getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack); + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) + { + return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); + } + @Override public String getOwner(ItemStack stack) { diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index b414145db..d12529028 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -52,11 +52,11 @@ public class ItemBlockGlowPanel extends ItemBlock TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); EnumColor col = EnumColor.DYES[stack.getItemDamage()]; - BlockPos pos1 = pos.offset(side); + BlockPos pos1 = pos.offset(side.getOpposite()); - if(world.isSideSolid(pos1, side.getOpposite())) + if(world.isSideSolid(pos1, side)) { - tileEntity.setOrientation(side); + tileEntity.setOrientation(side.getOpposite()); } tileEntity.setColour(col); diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 728222b8a..e384f697a 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -59,7 +59,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public int getRGBDurabilityForDisplay(ItemStack stack) { - return MathHelper.hsvToRGB(Math.max(0.0F, (float)getDurabilityForDisplay(stack)) / 3.0F, 1.0F, 1.0F); + return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); } @Override diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index a416e6ca9..0eff56906 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -16,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; public class ItemFlamethrower extends ItemMekanism implements IGasItem { @@ -111,8 +112,14 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem @Override public double getDurabilityForDisplay(ItemStack stack) { - return (getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack); + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) + { + return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); + } @Override public GasStack getGas(ItemStack itemstack) diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index c20c07960..0add4b69e 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -30,6 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -195,6 +196,12 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci { return 1D-(getEnergy(stack)/getMaxEnergy(stack)); } + + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) + { + return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); + } @Override @Method(modid = "IC2") diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 636f3557d..9e649d89e 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.relauncher.Side; @@ -51,8 +52,14 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor @Override public double getDurabilityForDisplay(ItemStack stack) { - return (getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack); + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) + { + return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); + } @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 5b0bcddc7..e58e25df6 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -25,6 +25,7 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -64,8 +65,14 @@ public class ItemScubaTank extends ItemArmor implements IGasItem @Override public double getDurabilityForDisplay(ItemStack stack) { - return (getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack); + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) + { + return MathHelper.hsvToRGB(Math.max(0.0F, (float)(1-getDurabilityForDisplay(stack))) / 3.0F, 1.0F, 1.0F); + } @Override public boolean isValidArmor(ItemStack stack, EntityEquipmentSlot armorType, Entity entity) diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index 16926977f..ce7083cdc 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -17,7 +17,6 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TransporterTier; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.block.property.PropertyColor; -import mekanism.common.block.states.BlockStateTransmitter; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.InvStack; @@ -43,6 +42,7 @@ import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.util.Constants.NBT; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityLogisticalTransporter extends TileEntityTransmitter { @@ -194,7 +194,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter