From 528fecc2b5b310f7e75255736b77bb5d3044bd2c Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 19 Nov 2016 16:36:13 +0000 Subject: [PATCH] Fix a load of null issues, and get it to sort of work. --- src/main/java/techreborn/blocks/BlockOre.java | 2 +- src/main/java/techreborn/init/ModBlocks.java | 2 ++ .../techreborn/items/ItemTextureBase.java | 2 +- .../items/armor/ItemLapotronPack.java | 5 ++-- .../items/armor/ItemLithiumBatpack.java | 2 +- .../techreborn/items/tools/ItemNanosaber.java | 4 +-- .../parts/walia/WaliaPartProvider.java | 2 +- .../java/techreborn/power/TRPowerNet.java | 2 +- .../java/techreborn/proxies/ClientProxy.java | 5 +++- .../techreborn/tiles/TileAlloyFurnace.java | 12 ++++---- .../java/techreborn/tiles/TileCentrifuge.java | 2 +- .../techreborn/tiles/TileChargeBench.java | 2 +- .../techreborn/tiles/TileDigitalChest.java | 24 ++++++++-------- .../techreborn/tiles/TileIronFurnace.java | 15 +++++----- .../tiles/TileMatterFabricator.java | 6 ++-- .../techreborn/tiles/TileQuantumChest.java | 26 ++++++++++-------- .../techreborn/tiles/TileQuantumTank.java | 6 ++-- .../techreborn/tiles/TileRollingMachine.java | 4 +-- .../techreborn/tiles/TileScrapboxinator.java | 4 +-- .../TileEntityFusionController.java | 8 +++--- .../tiles/generator/TileDieselGenerator.java | 6 ++-- .../tiles/generator/TileGasTurbine.java | 4 +-- .../tiles/generator/TileGenerator.java | 2 +- .../generator/TileSemifluidGenerator.java | 6 ++-- .../tiles/generator/TileThermalGenerator.java | 4 +-- .../multiblock/TileIndustrialSawmill.java | 4 +-- .../tiles/storage/TileEnergyStorage.java | 4 +-- .../tiles/teir1/TileElectricFurnace.java | 8 +++--- .../techreborn/tiles/teir1/TileRecycler.java | 4 +-- .../java/techreborn/utils/OreDictUtils.java | 6 ++-- .../java/techreborn/utils/RecipeUtils.java | 3 ++ .../utils/upgrade/UpgradeHandler.java | 2 +- .../textures/blocks/fluidPipes/fluidpipe.png | Bin 656 -> 0 bytes .../blocks/fluidPipes/fluidpipe_extract.png | Bin 698 -> 0 bytes .../blocks/fluidPipes/fluidpipe_insert.png | Bin 689 -> 0 bytes 35 files changed, 101 insertions(+), 87 deletions(-) delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/fluidPipes/fluidpipe.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/fluidPipes/fluidpipe_extract.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/fluidPipes/fluidpipe_insert.png diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index c73afb1b6..b4e6d70a9 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -183,7 +183,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi @Override public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { - return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]); + return "techreborn:blocks/ore/ore" + ores[getMetaFromState(BlockStateContainer)]; } @Override diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index d149ec54f..713474813 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -397,12 +397,14 @@ public class ModBlocks { } public static void registerBlock(Block block, String name) { + name = name.toLowerCase(); block.setRegistryName(name); GameRegistry.register(block); GameRegistry.register(new ItemBlock(block), block.getRegistryName()); } public static void registerBlock(Block block, Class itemclass, String name) { + name = name.toLowerCase(); block.setRegistryName(name); GameRegistry.register(block); try { diff --git a/src/main/java/techreborn/items/ItemTextureBase.java b/src/main/java/techreborn/items/ItemTextureBase.java index c281c02cc..43b887ad2 100644 --- a/src/main/java/techreborn/items/ItemTextureBase.java +++ b/src/main/java/techreborn/items/ItemTextureBase.java @@ -10,6 +10,6 @@ public abstract class ItemTextureBase extends ItemTR implements ITexturedItem { @Override public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); + return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5).toLowerCase(), "inventory"); } } diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index 9fc756461..f42150fbd 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -9,6 +9,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -68,7 +69,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack itemStack = new ItemStack(this, 1); itemList.add(itemStack); @@ -87,7 +88,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) { - if (player.inventory.getStackInSlot(i) != null) { + if (player.inventory.getStackInSlot(i) != ItemStack.EMPTY) { ItemStack item = player.inventory.getStackInSlot(i); if (item.getItem() instanceof IEnergyItemInfo) { IEnergyItemInfo energyItemInfo = (IEnergyItemInfo) item.getItem(); diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index a8a650e93..57a8b38ee 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -38,7 +38,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) { - if (player.inventory.getStackInSlot(i) != null) { + if (player.inventory.getStackInSlot(i) != ItemStack.EMPTY) { ItemStack item = player.inventory.getStackInSlot(i); if (item.getItem() instanceof IEnergyItemInfo) { IEnergyItemInfo energyItemInfo = (IEnergyItemInfo) item.getItem(); diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index edac4d8ad..4abf8e228 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -52,7 +52,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { World worldIn, @Nullable EntityLivingBase entityIn) { - if (stack != null && stack.getTagCompound().getBoolean("isActive")) { + if (stack != ItemStack.EMPTY && stack.getTagCompound().getBoolean("isActive")) { return 1.0F; } return 0.0F; @@ -65,7 +65,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { ItemStack stack) { Multimap multimap = HashMultimap.create(); int modifier = 0; - if (stack.getTagCompound().getBoolean("isActive")) + if (!stack.isEmpty() && stack.getTagCompound().getBoolean("isActive")) modifier = 9; if (slot == EntityEquipmentSlot.MAINHAND) { diff --git a/src/main/java/techreborn/parts/walia/WaliaPartProvider.java b/src/main/java/techreborn/parts/walia/WaliaPartProvider.java index 618438b9d..3c81630ad 100644 --- a/src/main/java/techreborn/parts/walia/WaliaPartProvider.java +++ b/src/main/java/techreborn/parts/walia/WaliaPartProvider.java @@ -32,7 +32,7 @@ public class WaliaPartProvider implements IWailaDataProvider { return mop.partHit.getDrops().get(0); } } - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/techreborn/power/TRPowerNet.java b/src/main/java/techreborn/power/TRPowerNet.java index b05f07d26..178e095b6 100644 --- a/src/main/java/techreborn/power/TRPowerNet.java +++ b/src/main/java/techreborn/power/TRPowerNet.java @@ -34,7 +34,7 @@ public class TRPowerNet { for (EnumFacing facing : EnumFacing.VALUES) { BlockPos pos = cable.getPos().offset(facing); TileEntity tile = cable.getWorld().getTileEntity(pos); - if (tile != null && tile instanceof IEnergyInterfaceTile) { + if (tile instanceof IEnergyInterfaceTile) { IEnergyInterfaceTile eit = (IEnergyInterfaceTile) tile; net.addConnection(eit, facing); } diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 1b6d62431..509b2326c 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -132,6 +132,7 @@ public class ClientProxy extends CommonProxy { @Override public void registerFluidBlockRendering(Block block, String name) { + name = name.toLowerCase(); super.registerFluidBlockRendering(block, name); final ModelResourceLocation fluidLocation = new ModelResourceLocation(ModInfo.MOD_ID.toLowerCase() + ":fluids", name); @@ -146,13 +147,15 @@ public class ClientProxy extends CommonProxy { @Override public void registerCustomBlockSateLocation(Block block, String resourceLocation) { + resourceLocation = resourceLocation.toLowerCase(); super.registerCustomBlockSateLocation(block, resourceLocation); + String finalResourceLocation = resourceLocation; ModelLoader.setCustomStateMapper(block, new DefaultStateMapper() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { String resourceDomain = Block.REGISTRY.getNameForObject(state.getBlock()).getResourceDomain(); String propertyString = getPropertyString(state.getProperties()); - return new ModelResourceLocation(resourceDomain + ':' + resourceLocation, propertyString); + return new ModelResourceLocation(resourceDomain + ':' + finalResourceLocation, propertyString); } }); String resourceDomain = Block.REGISTRY.getNameForObject(block).getResourceDomain(); diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index e18edcb15..1b4b685b2 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -90,12 +90,12 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab --this.burnTime; } if (!this.world.isRemote) { - if (this.burnTime != 0 || getStackInSlot(input1) != null && getStackInSlot(fuel) != null) { + if (this.burnTime != 0 || getStackInSlot(input1) != ItemStack.EMPTY && getStackInSlot(fuel) != ItemStack.EMPTY) { if (this.burnTime == 0 && this.canSmelt()) { this.currentItemBurnTime = this.burnTime = getItemBurnTime(getStackInSlot(fuel)); if (this.burnTime > 0) { flag1 = true; - if (this.getStackInSlot(fuel) != null) { + if (this.getStackInSlot(fuel) != ItemStack.EMPTY) { decrStackSize(fuel, 1); } } @@ -140,7 +140,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab } private boolean canSmelt() { - if (this.getStackInSlot(input1) == null || this.getStackInSlot(input2) == null) { + if (this.getStackInSlot(input1) == ItemStack.EMPTY || this.getStackInSlot(input2) == ItemStack.EMPTY) { return false; } else { ItemStack itemstack = null; @@ -153,7 +153,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab if (itemstack == null) return false; - if (this.getStackInSlot(output) == null) + if (this.getStackInSlot(output) == ItemStack.EMPTY) return true; if (!this.getStackInSlot(output).isItemEqual(itemstack)) return false; @@ -181,12 +181,12 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab itemstack = recipeType.getOutput(0); break; } - if (itemstack != null) { + if (itemstack != ItemStack.EMPTY) { break; } } - if (this.getStackInSlot(output) == null) { + if (this.getStackInSlot(output) == ItemStack.EMPTY) { setInventorySlotContents(output, itemstack.copy()); } else if (this.getStackInSlot(output).getItem() == itemstack.getItem()) { decrStackSize(output, -itemstack.getCount()); diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 7c36945d6..72c35fb78 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -52,7 +52,7 @@ public class TileCentrifuge extends TilePowerAcceptor super.updateEntity(); crafter.updateEntity(); charge(6); - if (inventory.getStackInSlot(6) != null) { + if (inventory.getStackInSlot(6) != ItemStack.EMPTY) { ItemStack stack = inventory.getStackInSlot(6); if (stack.getItem() instanceof IEnergyItemInfo) { IEnergyItemInfo item = (IEnergyItemInfo) stack.getItem(); diff --git a/src/main/java/techreborn/tiles/TileChargeBench.java b/src/main/java/techreborn/tiles/TileChargeBench.java index d3d8a3fd5..0d7894cbf 100644 --- a/src/main/java/techreborn/tiles/TileChargeBench.java +++ b/src/main/java/techreborn/tiles/TileChargeBench.java @@ -26,7 +26,7 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I super.updateEntity(); for (int i = 0; i < 6; i++) { - if (inventory.getStackInSlot(i) != null) { + if (inventory.getStackInSlot(i) != ItemStack.EMPTY) { if (getEnergy() > 0) { ItemStack stack = inventory.getStackInSlot(i); if (stack.getItem() instanceof IEnergyInterfaceItem) { diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index de6a014dc..839bc7617 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -15,6 +15,7 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; +import javax.annotation.Nonnull; import java.util.List; public class TileDigitalChest extends TileLegacyMachineBase implements IInventoryProvider, IWrenchable, IListInfoProvider { @@ -23,6 +24,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor // Slot 1 = Output // Slot 2 = Fake Item + @Nonnull public ItemStack storedItem = ItemStack.EMPTY; // TODO use long so we can have 9,223,372,036,854,775,807 items instead of // 2,147,483,647 @@ -32,7 +34,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor @Override public void updateEntity() { if (!world.isRemote) { - if (storedItem != null) { + if (storedItem != ItemStack.EMPTY) { ItemStack fakeStack = storedItem.copy(); fakeStack.setCount(1); setInventorySlotContents(2, fakeStack); @@ -41,11 +43,11 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor fakeStack.setCount(1); setInventorySlotContents(2, fakeStack); } else { - setInventorySlotContents(2, null); + setInventorySlotContents(2, ItemStack.EMPTY); } - if (getStackInSlot(0) != null) { - if (storedItem == null) { + if (getStackInSlot(0) != ItemStack.EMPTY) { + if (storedItem == ItemStack.EMPTY) { storedItem = getStackInSlot(0); setInventorySlotContents(0, ItemStack.EMPTY); } else if (ItemUtils.isItemEqual(storedItem, getStackInSlot(0), true, true)) { @@ -56,7 +58,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor } } - if (storedItem != null && getStackInSlot(1) == null) { + if (storedItem != ItemStack.EMPTY && getStackInSlot(1) == ItemStack.EMPTY) { ItemStack itemStack = storedItem.copy(); itemStack.setCount(itemStack.getMaxStackSize()); setInventorySlotContents(1, itemStack); @@ -68,7 +70,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor storedItem.shrink(wanted); } else { decrStackSize(1, -storedItem.getCount()); - storedItem = null; + storedItem = ItemStack.EMPTY; } } } @@ -89,13 +91,13 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor public void readFromNBTWithoutCoords(NBTTagCompound tagCompound) { - storedItem = null; + storedItem = ItemStack.EMPTY; if (tagCompound.hasKey("storedStack")) { storedItem = new ItemStack((NBTTagCompound) tagCompound.getTag("storedStack")); } - if (storedItem != null) { + if (storedItem != ItemStack.EMPTY) { storedItem.setCount(tagCompound.getInteger("storedQuantity")); } } @@ -108,7 +110,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor } public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound) { - if (storedItem != null) { + if (storedItem != ItemStack.EMPTY) { tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound())); tagCompound.setInteger("storedQuantity", storedItem.getCount()); } else @@ -154,11 +156,11 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor public void addInfo(List info, boolean isRealTile) { int size = 0; String name = "of nothing"; - if (storedItem != null) { + if (storedItem != ItemStack.EMPTY) { name = storedItem.getDisplayName(); size += storedItem.getCount(); } - if (getStackInSlot(1) != null) { + if (getStackInSlot(1) != ItemStack.EMPTY) { name = getStackInSlot(1).getDisplayName(); size += getStackInSlot(1).getCount(); } diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index 957ce50b5..06b480807 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -51,12 +51,11 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory if (getStackInSlot(fuelslot).getItem().hasContainerItem()) // Fuel // slot { - setInventorySlotContents(fuelslot, - new ItemStack(getStackInSlot(fuelslot).getItem().getContainerItem())); + setInventorySlotContents(fuelslot, new ItemStack(getStackInSlot(fuelslot).getItem().getContainerItem())); } else if (getStackInSlot(fuelslot).getCount() > 1) { decrStackSize(fuelslot, 1); } else if (getStackInSlot(fuelslot).getCount() == 1) { - setInventorySlotContents(fuelslot, null); + setInventorySlotContents(fuelslot, ItemStack.EMPTY); } updateInventory = true; } @@ -83,7 +82,7 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory if (this.canSmelt()) { ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(getStackInSlot(input1)); - if (getStackInSlot(output) == null) { + if (getStackInSlot(output) == ItemStack.EMPTY) { setInventorySlotContents(output, itemstack.copy()); } else if (getStackInSlot(output).isItemEqual(itemstack)) { getStackInSlot(output).grow(itemstack.getCount()); @@ -91,19 +90,19 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory if (getStackInSlot(input1).getCount() > 1) { this.decrStackSize(input1, 1); } else { - setInventorySlotContents(input1, null); + setInventorySlotContents(input1, ItemStack.EMPTY); } } } public boolean canSmelt() { - if (getStackInSlot(input1) == null) { + if (getStackInSlot(input1) == ItemStack.EMPTY) { return false; } else { ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(getStackInSlot(input1)); - if (itemstack == null) + if (itemstack == ItemStack.EMPTY) return false; - if (getStackInSlot(output) == null) + if (getStackInSlot(output) == ItemStack.EMPTY) return true; if (!getStackInSlot(output).isItemEqual(itemstack)) return false; diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index d153e7eb3..8848f28a6 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -87,7 +87,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab if (!super.world.isRemote) { for (int i = 0; i < 6; i++) { ItemStack stack = inventory.getStackInSlot(i); - if (this.amplifier < 10000 && stack != null) { + if (this.amplifier < 10000 && stack != ItemStack.EMPTY) { int amp = (int) ((long) (getValue(stack) / 32)); if (ItemUtils.isItemEqual(stack, inventory.getStackInSlot(i), true, true)) { if (canUseEnergy(1)) { @@ -120,14 +120,14 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab } private boolean spaceForOutput() { - return inventory.getStackInSlot(6) == null + return inventory.getStackInSlot(6) == ItemStack.EMPTY || ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true) && inventory.getStackInSlot(6).getCount() < 64; } private void addOutputProducts() { - if (inventory.getStackInSlot(6) == null) { + if (inventory.getStackInSlot(6) == ItemStack.EMPTY) { inventory.setInventorySlotContents(6, new ItemStack(ModItems.uuMatter)); } else if (ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true)) { inventory.getStackInSlot(6).setCount(Math.min(64, 1 + inventory.getStackInSlot(6).getCount())); diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index 9a5efd470..5813532bd 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -16,6 +16,7 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; +import javax.annotation.Nonnull; import java.util.List; public class TileQuantumChest extends TileLegacyMachineBase @@ -25,7 +26,8 @@ public class TileQuantumChest extends TileLegacyMachineBase // Slot 1 = Output // Slot 2 = Fake Item - public ItemStack storedItem; + @Nonnull + public ItemStack storedItem = ItemStack.EMPTY; // TODO use long so we can have 9,223,372,036,854,775,807 items instead of // 2,147,483,647 int storage = (int) Double.MAX_VALUE; @@ -34,7 +36,7 @@ public class TileQuantumChest extends TileLegacyMachineBase @Override public void updateEntity() { if (!world.isRemote) { - if (storedItem != null) { + if (storedItem != ItemStack.EMPTY) { ItemStack fakeStack = storedItem.copy(); fakeStack.setCount(1); setInventorySlotContents(2, fakeStack); @@ -43,11 +45,11 @@ public class TileQuantumChest extends TileLegacyMachineBase fakeStack.setCount(1); setInventorySlotContents(2, fakeStack); } else { - setInventorySlotContents(2, null); + setInventorySlotContents(2, ItemStack.EMPTY); } - if (getStackInSlot(0) != null) { - if (storedItem == null) { + if (getStackInSlot(0) != ItemStack.EMPTY) { + if (storedItem == ItemStack.EMPTY) { storedItem = getStackInSlot(0); setInventorySlotContents(0, ItemStack.EMPTY); } else if (ItemUtils.isItemEqual(storedItem, getStackInSlot(0), true, true)) { @@ -58,7 +60,7 @@ public class TileQuantumChest extends TileLegacyMachineBase } } - if (storedItem != null && getStackInSlot(1) == null) { + if (storedItem != ItemStack.EMPTY && getStackInSlot(1) == ItemStack.EMPTY) { ItemStack itemStack = storedItem.copy(); itemStack.setCount(itemStack.getMaxStackSize()); setInventorySlotContents(1, itemStack); @@ -70,7 +72,7 @@ public class TileQuantumChest extends TileLegacyMachineBase storedItem.shrink(wanted); } else { decrStackSize(1, -storedItem.getCount()); - storedItem = null; + storedItem = ItemStack.EMPTY; } } } @@ -91,13 +93,13 @@ public class TileQuantumChest extends TileLegacyMachineBase public void readFromNBTWithoutCoords(NBTTagCompound tagCompound) { - storedItem = null; + storedItem = ItemStack.EMPTY; if (tagCompound.hasKey("storedStack")) { storedItem = new ItemStack((NBTTagCompound) tagCompound.getTag("storedStack")); } - if (storedItem != null) { + if (storedItem != ItemStack.EMPTY) { storedItem.setCount(tagCompound.getInteger("storedQuantity")); } } @@ -110,7 +112,7 @@ public class TileQuantumChest extends TileLegacyMachineBase } public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound) { - if (storedItem != null) { + if (storedItem != ItemStack.EMPTY) { tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound())); tagCompound.setInteger("storedQuantity", storedItem.getCount()); } else { @@ -182,11 +184,11 @@ public class TileQuantumChest extends TileLegacyMachineBase if (isRealTile) { int size = 0; String name = "of nothing"; - if (storedItem != null) { + if (storedItem != ItemStack.EMPTY) { name = storedItem.getDisplayName(); size += storedItem.getCount(); } - if (getStackInSlot(1) != null) { + if (getStackInSlot(1) != ItemStack.EMPTY) { name = getStackInSlot(1).getDisplayName(); size += getStackInSlot(1).getCount(); } diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 83dd65588..8d1768c58 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -61,10 +61,10 @@ public class TileQuantumTank extends TileLegacyMachineBase if (!world.isRemote) { FluidUtils.drainContainers(tank, inventory, 0, 1); FluidUtils.fillContainers(tank, inventory, 0, 1, tank.getFluidType()); - if (tank.getFluidType() != null && getStackInSlot(2) == null) { + if (tank.getFluidType() != null && getStackInSlot(2) == ItemStack.EMPTY) { // inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock())); - } else if (tank.getFluidType() == null && getStackInSlot(2) != null) { - setInventorySlotContents(2, null); + } else if (tank.getFluidType() == null && getStackInSlot(2) != ItemStack.EMPTY) { + setInventorySlotContents(2, ItemStack.EMPTY); } tank.compareAndUpdate(); } diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index a6a8da4dc..6c3a2a866 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -72,7 +72,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world); if (currentRecipe != null) { boolean hasCrafted = false; - if (inventory.getStackInSlot(0) == null) { + if (inventory.getStackInSlot(0) == ItemStack.EMPTY) { inventory.setInventorySlotContents(0, currentRecipe); tickTime = -1; hasCrafted = true; @@ -109,7 +109,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable if (currentRecipe != null) { inventory.setInventorySlotContents(1, currentRecipe); } else { - inventory.setInventorySlotContents(1, null); + inventory.setInventorySlotContents(1, ItemStack.EMPTY); } } } diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index 768b4e239..0ba2864ad 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -81,13 +81,13 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable this.decrStackSize(input1, 1); } else { useEnergy(cost); - setInventorySlotContents(input1, null); + setInventorySlotContents(input1, ItemStack.EMPTY); } } } public boolean canOpen() { - return getStackInSlot(input1) != null && getStackInSlot(output) == null; + return getStackInSlot(input1) != ItemStack.EMPTY && getStackInSlot(output) == ItemStack.EMPTY; } public boolean isBurning() { diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index 5c1d34384..bed403156 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -202,13 +202,13 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } } else { if (canFitStack(currentRecipe.getOutput(), outputStackSlot, true)) { - if (getStackInSlot(outputStackSlot) == null) { + if (getStackInSlot(outputStackSlot) == ItemStack.EMPTY) { setInventorySlotContents(outputStackSlot, currentRecipe.getOutput().copy()); } else { decrStackSize(outputStackSlot, -currentRecipe.getOutput().getCount()); } decrStackSize(topStackSlot, currentRecipe.getTopInput().getCount()); - if (currentRecipe.getBottomInput() != null) { + if (currentRecipe.getBottomInput() != ItemStack.EMPTY) { decrStackSize(bottomStackSlot, currentRecipe.getBottomInput().getCount()); } resetCrafter(); @@ -252,10 +252,10 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } public boolean canFitStack(ItemStack stack, int slot, boolean oreDic) {// Checks to see if it can fit the stack - if (stack == null) { + if (stack == ItemStack.EMPTY) { return true; } - if (inventory.getStackInSlot(slot) == null) { + if (inventory.getStackInSlot(slot) == ItemStack.EMPTY) { return true; } if (ItemUtils.isItemEqual(inventory.getStackInSlot(slot), stack, true, true, oreDic)) { diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index 9cabd98b0..b5c8905c1 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -97,11 +97,11 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl if (!world.isRemote) { FluidUtils.drainContainers(tank, inventory, 0, 1); FluidUtils.fillContainers(tank, inventory, 0, 1, tank.getFluidType()); - if (tank.getFluidType() != null && getStackInSlot(2) == null) { + if (tank.getFluidType() != null && getStackInSlot(2) == ItemStack.EMPTY) { inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock())); syncWithAll(); - } else if (tank.getFluidType() == null && getStackInSlot(2) != null) { - setInventorySlotContents(2, null); + } else if (tank.getFluidType() == null && getStackInSlot(2) != ItemStack.EMPTY) { + setInventorySlotContents(2, ItemStack.EMPTY); syncWithAll(); } diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index f48b6e9e5..5b0495d29 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -128,9 +128,9 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, II tank.drain(currentWithdraw, true); addEnergy(euTick); } - if (tank.getFluidType() != null && getStackInSlot(2) == null) { + if (tank.getFluidType() != null && getStackInSlot(2) == ItemStack.EMPTY) { inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock())); - } else if (tank.getFluidType() == null && getStackInSlot(2) != null) { + } else if (tank.getFluidType() == null && getStackInSlot(2) != ItemStack.EMPTY) { setInventorySlotContents(2, null); } } diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index e2022a86a..c15301559 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -61,7 +61,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn if(getStackInSlot(fuelSlot).getItem() == Items.LAVA_BUCKET || getStackInSlot(fuelSlot).getItem() == ForgeModContainer.getInstance().universalBucket){ setInventorySlotContents(fuelSlot, new ItemStack(Items.BUCKET)); } else { - setInventorySlotContents(fuelSlot, null); + setInventorySlotContents(fuelSlot, ItemStack.EMPTY); } } else { diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index b3e8b0da0..09504ef68 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -132,10 +132,10 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench tank.drain(currentWithdraw, true); addEnergy(euTick); } - if (tank.getFluidType() != null && getStackInSlot(2) == null) { + if (tank.getFluidType() != null && getStackInSlot(2) == ItemStack.EMPTY) { inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock())); - } else if (tank.getFluidType() == null && getStackInSlot(2) != null) { - setInventorySlotContents(2, null); + } else if (tank.getFluidType() == null && getStackInSlot(2) != ItemStack.EMPTY) { + setInventorySlotContents(2, ItemStack.EMPTY); } } diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 3c48745dd..510dedf15 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -124,10 +124,10 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab tank.drain(1, true); addEnergy(euTick); } - if (tank.getFluidType() != null && getStackInSlot(2) == null) { + if (tank.getFluidType() != null && getStackInSlot(2) == ItemStack.EMPTY) { // inventory.setInventorySlotContents(2, new ItemStack(tank // .getFluidType().getBlock())); - } else if (tank.getFluidType() == null && getStackInSlot(2) != null) { + } else if (tank.getFluidType() == null && getStackInSlot(2) != ItemStack.EMPTY) { setInventorySlotContents(2, null); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index 50c3da183..490e9cab3 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -86,14 +86,14 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha } public void addOutput(int slot, ItemStack stack) { - if (getStackInSlot(slot) == null) + if (getStackInSlot(slot) == ItemStack.EMPTY) setInventorySlotContents(slot, stack); getStackInSlot(slot).grow(stack.getCount()); } public boolean canAddOutput(int slot, int amount) { ItemStack stack = getStackInSlot(slot); - return stack == null || getInventoryStackLimit() - stack.getCount() >= amount; + return stack == ItemStack.EMPTY || getInventoryStackLimit() - stack.getCount() >= amount; } @Override diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index ef4d61f35..a011753f6 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -55,7 +55,7 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, @Override public void updateEntity() { - if (inventory.getStackInSlot(0) != null) { + if (inventory.getStackInSlot(0) != ItemStack.EMPTY) { ItemStack stack = inventory.getStackInSlot(0); if (!(stack.getItem() instanceof IEnergyItemInfo)) { return; @@ -68,7 +68,7 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, } } } - if (inventory.getStackInSlot(1) != null) { + if (inventory.getStackInSlot(1) != ItemStack.EMPTY) { ItemStack stack = inventory.getStackInSlot(1); if (!(stack.getItem() instanceof IEnergyItemInfo)) { return; diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index 2680e3b36..3d9b245b6 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -68,7 +68,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl if (this.canSmelt()) { ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(getStackInSlot(input1)); - if (getStackInSlot(output) == null) { + if (getStackInSlot(output) == ItemStack.EMPTY) { setInventorySlotContents(output, itemstack.copy()); } else if (getStackInSlot(output).isItemEqual(itemstack)) { getStackInSlot(output).grow(itemstack.getCount()); @@ -82,13 +82,13 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl } public boolean canSmelt() { - if (getStackInSlot(input1) == null) { + if (getStackInSlot(input1) == ItemStack.EMPTY) { return false; } else { ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(getStackInSlot(input1)); if (itemstack == null) return false; - if (getStackInSlot(output) == null) + if (getStackInSlot(output) == ItemStack.EMPTY) return true; if (!getStackInSlot(output).isItemEqual(itemstack)) return false; @@ -103,7 +103,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl public ItemStack getResultFor(ItemStack stack) { ItemStack result = FurnaceRecipes.instance().getSmeltingResult(stack); - if (result != null) { + if (result != ItemStack.EMPTY) { return result.copy(); } return null; diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/teir1/TileRecycler.java index 02ea4e613..cc7551bf3 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/teir1/TileRecycler.java @@ -72,7 +72,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv ItemStack itemstack = ItemParts.getPartByName("scrap"); int randomchance = world.rand.nextInt(chance); - if (getStackInSlot(output) == null) { + if (getStackInSlot(output) == ItemStack.EMPTY) { useEnergy(cost); if (randomchance == 1) { setInventorySlotContents(output, itemstack.copy()); @@ -98,7 +98,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv } public boolean hasSlotGotSpace(int slot) { - if (getStackInSlot(slot) == null) { + if (getStackInSlot(slot) == ItemStack.EMPTY) { return true; } else if (getStackInSlot(slot).getCount() < getStackInSlot(slot).getMaxStackSize()) { return true; diff --git a/src/main/java/techreborn/utils/OreDictUtils.java b/src/main/java/techreborn/utils/OreDictUtils.java index 700acc768..53cc41079 100644 --- a/src/main/java/techreborn/utils/OreDictUtils.java +++ b/src/main/java/techreborn/utils/OreDictUtils.java @@ -6,6 +6,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nonnull; import java.util.List; public class OreDictUtils { @@ -54,6 +55,7 @@ public class OreDictUtils { return false; } + @Nonnull public static ItemStack getDictOreOrNull(String name, int amount) { List ores = OreDictionary.getOres(name); if (ores.isEmpty()) @@ -77,8 +79,8 @@ public class OreDictUtils { return isOre(new ItemStack(item), oreName); } - public static boolean isOre(ItemStack stack, String oreName) { - if (stack != null && !stack.isEmpty() && oreName != null) { + public static boolean isOre(@Nonnull ItemStack stack, String oreName) { + if (stack != ItemStack.EMPTY && !stack.isEmpty() && oreName != null) { int id = OreDictionary.getOreID(oreName); int[] ids = OreDictionary.getOreIDs(stack); diff --git a/src/main/java/techreborn/utils/RecipeUtils.java b/src/main/java/techreborn/utils/RecipeUtils.java index e0884bc79..a73b3113e 100644 --- a/src/main/java/techreborn/utils/RecipeUtils.java +++ b/src/main/java/techreborn/utils/RecipeUtils.java @@ -3,7 +3,10 @@ package techreborn.utils; import net.minecraft.item.ItemStack; import techreborn.items.DynamicCell; +import javax.annotation.Nonnull; + public class RecipeUtils { + @Nonnull public static ItemStack getEmptyCell(int stackSize) { return DynamicCell.getEmptyCell(stackSize); } diff --git a/src/main/java/techreborn/utils/upgrade/UpgradeHandler.java b/src/main/java/techreborn/utils/upgrade/UpgradeHandler.java index 785268819..523dd28e0 100644 --- a/src/main/java/techreborn/utils/upgrade/UpgradeHandler.java +++ b/src/main/java/techreborn/utils/upgrade/UpgradeHandler.java @@ -29,7 +29,7 @@ public class UpgradeHandler { crafter.resetSpeedMulti(); for (int slot : this.slots) { ItemStack stack = inventory.getStackInSlot(slot); - if (stack != null && stack.getItem() instanceof IMachineUpgrade) { + if (stack != ItemStack.EMPTY && stack.getItem() instanceof IMachineUpgrade) { ((IMachineUpgrade) stack.getItem()).processUpgrade(crafter, stack); } } diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluidPipes/fluidpipe.png b/src/main/resources/assets/techreborn/textures/blocks/fluidPipes/fluidpipe.png deleted file mode 100644 index eb0c81ee9a629a13eca3b2cdba98041d15f4bc23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 656 zcmV;B0&o3^P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000tj000tj0U?{1 zY5)KL7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMIczh2P5=M_@<~KNR5(vnliTXC zQ4q%0UC1_jIdLlF03n1T`)%ZY94S%c8fDM?{pM?_?_l1UcQ((=de$r>BIfh?sD8a( zs$;R36bc1twOZ0{x20GtN-!9d@p!E9=kuw8tsh%#fgBEp7Bw0T1t^tD;&eJ?Hk)bu zdcCT?-EQVrga+jCc$jE3Dz#co27`fgyIlqFcs$bY_qDT~^nSnpo4|tDu{Z+Vhr^-N z>vbuY%L3?XwbJ0s=UEpotqgFrwAzbXqt-CKJs!qtQsOibM;**c4SN6(y2Fj)9L{002^eYPI@10tv}v zQj-}Q00ctefEc;>(1>AN$e{?^62`T`1^Zf& zy4p@mL-BgOHoM(UYfh(=IUEiK65&C0uh%o*v*{jC*laeH8+d`lFCS*PT$;sVVZOwx zt*dL-*e*ySk004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000tj000tj0U?{1 zY5)KL7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMIczh2P5=M`97#k$R5(vnQ^{^3 zK@9aT%p?-S8g_(|aG9AvBF!y{h69jvhkX@@|KWs$KmzfNsM&G)JyJ+Hxb1e?&-N>q zsH&V!C+frDK%GjZ^!*{ImSw4J+xnIbYBU*9 z*YLa3If%t#`g-?M-~argzz&DQ+Uxbc#jjQ? zkwhY)p-@PJ!5{^JAPg--;_*2D;g3Wj3UKfNjdQ`QAFkNB5L1^jaqJwfT&KVL$Y8a0UaR_K3pYipU+2KE|=+Vx7&=DX0yqwLZAUa z+i$-;n$PD+BzzbHKEwh5KmG?M9b%ADnL zDf9VUKq7dcu2!q!&c;1Ja;a1zH<%qHx_roBFpz$~FD~)4xw>YJ&4Oey8Lj+_kZAzm zU0@`$NLV<$1K5`&0630AjdsgV;qwiA0bprR8Oc~-v$g!-QJ@Pr&11rH;i@=-%XT`Q g<_L&40FL9xC&$+I(-CNyMF0Q*07*qoM6N<$g3CED_W%F@ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluidPipes/fluidpipe_insert.png b/src/main/resources/assets/techreborn/textures/blocks/fluidPipes/fluidpipe_insert.png deleted file mode 100644 index ac5f10c39ea7b3c04fea25d687a5f3f6e61d0421..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmV;i0#5yjP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000tj000tj0U?{1 zY5)KL7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMIczh2P5=M`6G=otR5(vnQ^}4R zK@9a@Al9&SLy$7$lwlY$IS$iFU?dRxDiHs}2?>D&;u}%3UA^z^3j=Msf>Jg%eB=)d^gZYScp zuEt_9jYgvs1cETM3~?NX|L`Xg2?aR#fX2CC*0d3~;IY+k?oBa5=v$H16M5r%`l%=s zG8#U&U`BfNG;MMOL=6T5k_8(H=m>%E;VL;sC`4Va*Xi%~`;3=vx67+SpanqNUw*u+ z=XoR&K8yh$VgUdk0-z1|1@dvPWZFb9+D_&@O8EOPau76QVN4qj5wr_(kObQj#$7O6 z;2-3|#yQAifpD09na}64SS)0-*~n_Oq6T3g6V*`>m61G~&1AV;GH1Kp%6h#PkO&^A zo6V+}*|-Nt{`~wTH<%qH8a`w)naFrN7DGI3uC85UyCAt-PQMoal4$_oU0@`;NLV<$ z1K5uw0QkO7jdnA|`zl)iEDb6n87pkJmLEI{bOEP*Ojs^l6#(#@v)L?1K)eO;eP8|o XG^+NBd_Lxj00000NkvXXu0mjf3Kt|3