Fix glow panel placement, fixed damage displays (again), start work on new inventory system

This commit is contained in:
aidancbrady committed 2017-03-28 23:21:06 -04:00
1 parent 2aad738c3d
commit fa7b9b49bc
14 files changed
+70 -27

No files matched your search

@@ -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)
@@ -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 {
@@ -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())
{
@@ -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")
@@ -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)
{
@@ -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);
@@ -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
@@ -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)
@@ -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")
@@ -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<String> list, boolean flag)
@@ -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)
@@ -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<IInventory, InventoryNetwork>
{
@@ -194,7 +194,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<IInve
super.handlePacketData(dataStream);
if(getWorld().isRemote)
if(FMLCommonHandler.instance().getSide().isClient())
{
int type = dataStream.readInt();
@@ -66,7 +66,7 @@ public class TransporterImpl extends TransmitterImpl<IInventory, InventoryNetwor
{
if(!stack.initiatedPath)
{
if(stack.itemStack == null || !recalculate(stack, null))
if(stack.itemStack == null || stack.itemStack == ItemStack.EMPTY || !recalculate(stack, null))
{
remove.add(stack);
continue;
@@ -326,7 +326,7 @@ public class TransporterImpl extends TransmitterImpl<IInventory, InventoryNetwor
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getTileEntity().getSyncPacket(stack, false)), new Range4D(coord()));
MekanismUtils.saveChunk(getTileEntity());
}
return rejected;
}
@@ -90,7 +90,7 @@ public final class InventoryUtils
ItemStack inSlot = inventory.getStackInSlot(i);
if(inSlot == null)
if(inSlot == null || inSlot.isEmpty())
{
if(toInsert.getCount() <= inventory.getInventoryStackLimit())
{
@@ -170,7 +170,7 @@ public final class InventoryUtils
ItemStack inSlot = inventory.getStackInSlot(slotID);
if(inSlot == null)
if(inSlot == null || inSlot.isEmpty())
{
if(toInsert.getCount() <= inventory.getInventoryStackLimit())
{
@@ -443,7 +443,7 @@ public final class InventoryUtils
ItemStack inSlot = inventory.getStackInSlot(i);
if(inSlot == null)
if(inSlot == null || inSlot.isEmpty())
{
if(itemStack.getCount() <= inventory.getInventoryStackLimit())
{
@@ -502,7 +502,7 @@ public final class InventoryUtils
ItemStack inSlot = inventory.getStackInSlot(slotID);
if(inSlot == null)
if(inSlot == null || inSlot.isEmpty())
{
if(itemStack.getCount() <= inventory.getInventoryStackLimit())
{
@@ -550,6 +550,7 @@ public final class InventoryUtils
/*TODO From CCLib -- go back to that version when we're using dependencies again*/
public static boolean canStack(ItemStack stack1, ItemStack stack2) {
return stack1 == null || stack2 == null ||
stack1.isEmpty() || stack2.isEmpty() ||
(stack1.getItem() == stack2.getItem() &&
(!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage()) &&
ItemStack.areItemStackTagsEqual(stack2, stack1)) &&