From 45b48600d06f01bd39a8e4320e2e6eea3fd4d2d4 Mon Sep 17 00:00:00 2001 From: Xander Date: Sat, 5 Aug 2017 21:01:42 +0800 Subject: [PATCH 1/7] static field access to Class access --- .../mekanism/common/tile/TileEntityQuantumEntangloporter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 96c2449d7..62ca851d4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -410,7 +410,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public double getMaxEnergy() { - return !hasFrequency() ? 0 : frequency.MAX_ENERGY; + return !hasFrequency() ? 0 : InventoryFrequency.MAX_ENERGY; } @Override From 7b3f4e8e2aa88820920bd7e697966a6309618a36 Mon Sep 17 00:00:00 2001 From: Xander Date: Sat, 5 Aug 2017 21:07:19 +0800 Subject: [PATCH 2/7] Increase Entangleporter frequency to be able to store as much as ultimate tiers can transmit. --- .../entangloporter/InventoryFrequency.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 1fc76337b..491d4d9f9 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -8,6 +8,7 @@ import java.util.UUID; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.PacketHandler; +import mekanism.common.Tier; import mekanism.common.frequency.Frequency; import mekanism.common.util.InventoryUtils; import net.minecraft.item.ItemStack; @@ -23,8 +24,10 @@ public class InventoryFrequency extends Frequency { public static final String ENTANGLOPORTER = "Entangloporter"; - public static final double MAX_ENERGY = 1000000; - + public static final double MAX_ENERGY = Tier.EnergyCubeTier.ULTIMATE.output; + public static final int FLUID_TANK_SIZE = Tier.FluidTankTier.ULTIMATE.output; + public static final int GAS_TANK_SIZE = Tier.GasTankTier.ULTIMATE.output; + public double storedEnergy; public FluidTank storedFluid; public GasTank storedGas; @@ -35,8 +38,8 @@ public class InventoryFrequency extends Frequency { super(n, uuid); - storedFluid = new FluidTank(1000); - storedGas = new GasTank(1000); + storedFluid = new FluidTank(FLUID_TANK_SIZE); + storedGas = new GasTank(GAS_TANK_SIZE); } public InventoryFrequency(NBTTagCompound nbtTags) @@ -89,8 +92,8 @@ public class InventoryFrequency extends Frequency { super.read(nbtTags); - storedFluid = new FluidTank(1000); - storedGas = new GasTank(1000); + storedFluid = new FluidTank(FLUID_TANK_SIZE); + storedGas = new GasTank(GAS_TANK_SIZE); storedEnergy = nbtTags.getDouble("storedEnergy"); @@ -156,8 +159,8 @@ public class InventoryFrequency extends Frequency { super.read(dataStream); - storedFluid = new FluidTank(1000); - storedGas = new GasTank(1000); + storedFluid = new FluidTank(FLUID_TANK_SIZE); + storedGas = new GasTank(GAS_TANK_SIZE); storedEnergy = dataStream.readDouble(); From 81e56b207c5c9c94476c3aec9cf114934fbb1188 Mon Sep 17 00:00:00 2001 From: Xander Date: Sat, 5 Aug 2017 22:49:50 +0800 Subject: [PATCH 3/7] Store Quantum Entangleporter frequency (name and public/private only) in the itemstack when dismantled. Displayed in the sneak key info tooltip. --- .../mekanism/common/block/BlockMachine.java | 14 ++++++-- .../mekanism/common/frequency/Frequency.java | 34 +++++++++++++++++++ .../common/item/ItemBlockMachine.java | 20 +++++++++++ 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 690777493..61f0ba067 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -19,13 +19,12 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; -import mekanism.common.block.states.BlockStateBasic; -import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineBlock; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.config.MekanismConfig.client; +import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; @@ -36,6 +35,7 @@ import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityPersonalChest; import mekanism.common.tile.prefab.TileEntityBasicBlock; @@ -78,7 +78,6 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandlerItem; @@ -916,6 +915,15 @@ public abstract class BlockMachine extends BlockContainer factoryItem.setRecipeType(((TileEntityFactory)tileEntity).recipeType.ordinal(), itemStack); } + if (tileEntity instanceof TileEntityQuantumEntangloporter) + { + InventoryFrequency frequency = ((TileEntityQuantumEntangloporter) tileEntity).frequency; + if (frequency != null) + { + ItemDataUtils.setCompound(itemStack, "entangleporter_frequency", frequency.getIdentity().serialise()); + } + } + return itemStack; } diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index 059b80db7..5e80f9a57 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -13,6 +13,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.UsernameCache; +import javax.annotation.Nullable; + public class Frequency { public static final String TELEPORTER = "Teleporter"; @@ -147,4 +149,36 @@ public class Frequency return obj instanceof Frequency && ((Frequency)obj).name.equals(name) && ((Frequency)obj).ownerUUID.equals(ownerUUID) && ((Frequency)obj).publicFreq == publicFreq; } + + public Identity getIdentity(){ + return new Identity(this.name, this.publicFreq); + } + + public static class Identity { + public String name; + public boolean publicFreq; + + private Identity(String name, boolean publicFreq) + { + this.name = name; + this.publicFreq = publicFreq; + } + + @Nullable + public static Identity load(NBTTagCompound data) + { + if (!data.getString("name").isEmpty()){ + return new Identity(data.getString("name"), data.getBoolean("publicFreq")); + } + return null; + } + + public NBTTagCompound serialise() + { + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("name", this.name); + tag.setBoolean("publicFreq", this.publicFreq); + return tag; + } + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 27ae43d59..9e61191c3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -35,6 +35,7 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; +import mekanism.common.frequency.Frequency; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; import mekanism.common.integration.ic2.IC2Integration; import mekanism.common.integration.ic2.IC2ItemManager; @@ -46,6 +47,7 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.ItemDataUtils; @@ -241,6 +243,15 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + EnumColor.GREY + LangUtils.transYesNo(getBucketMode(itemstack))); } + if (type == MachineType.QUANTUM_ENTANGLOPORTER) + { + Frequency.Identity freq = Frequency.Identity.load(ItemDataUtils.getCompound(itemstack, "entangleporter_frequency")); + if (freq != null) + { + list.add(EnumColor.INDIGO + LangUtils.localize("gui.frequency") + ": "+EnumColor.GREY + freq.name + " (" + LangUtils.localize(freq.publicFreq ? "security.public" : "security.private") + ")"); + } + } + if(type.isElectric) { list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack))); @@ -414,6 +425,15 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec ((TileEntityElectricBlock)tileEntity).electricityStored = getEnergy(stack); } + if (tileEntity instanceof TileEntityQuantumEntangloporter && ItemDataUtils.hasData(stack, "entangleporter_frequency")) + { + Frequency.Identity freq = Frequency.Identity.load(ItemDataUtils.getCompound(stack, "entangleporter_frequency")); + if (freq != null) + { + ((TileEntityQuantumEntangloporter) tileEntity).setFrequency(freq.name, freq.publicFreq); + } + } + return true; } From aabcd0d77a6295ed808b50bd53dd3a22a92d8b72 Mon Sep 17 00:00:00 2001 From: Xander Date: Sun, 6 Aug 2017 00:18:39 +0800 Subject: [PATCH 4/7] add Anchor Upgrade to Entangleporter --- .../client/gui/GuiQuantumEntangloporter.java | 2 + .../common/inventory/InventoryList.java | 198 ++++++++++++++++++ .../container/ContainerUpgradeManagement.java | 16 +- .../tile/TileEntityQuantumEntangloporter.java | 83 +++++++- 4 files changed, 288 insertions(+), 11 deletions(-) create mode 100644 src/main/java/mekanism/common/inventory/InventoryList.java diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index fc524719c..785684520 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -9,6 +9,7 @@ import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiScrollList; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.frequency.Frequency; @@ -61,6 +62,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism guiElements.add(scrollList = new GuiScrollList(this, resource, 28, 37, 120, 4)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); + guiElements.add(new GuiUpgradeTab(this, tileEntity, resource)); if(tileEntity.frequency != null) { diff --git a/src/main/java/mekanism/common/inventory/InventoryList.java b/src/main/java/mekanism/common/inventory/InventoryList.java new file mode 100644 index 000000000..4ccec4d72 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/InventoryList.java @@ -0,0 +1,198 @@ +package mekanism.common.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ItemStackHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; + +/*Copied & modified from net.minecraft.inventory.InventoryBasic */ +public class InventoryList implements IInventory +{ + private String inventoryTitle; + private final int slotsCount; + private final NonNullList inventoryContents; + private final TileEntity te; + + public InventoryList(NonNullList list, TileEntity parent) + { + this.inventoryTitle = "Proxy"; + this.slotsCount = list.size(); + this.inventoryContents = list; + this.te = parent; + } + + /** + * Returns the stack in the given slot. + */ + public ItemStack getStackInSlot(int index) + { + return index >= 0 && index < this.inventoryContents.size() ? (ItemStack)this.inventoryContents.get(index) : ItemStack.EMPTY; + } + + /** + * Removes up to a specified number of items from an inventory slot and returns them in a new stack. + */ + public ItemStack decrStackSize(int index, int count) + { + ItemStack itemstack = ItemStackHelper.getAndSplit(this.inventoryContents, index, count); + + if (!itemstack.isEmpty()) + { + this.markDirty(); + } + + return itemstack; + } + + /** + * Removes a stack from the given slot and returns it. + */ + public ItemStack removeStackFromSlot(int index) + { + ItemStack itemstack = (ItemStack)this.inventoryContents.get(index); + + if (itemstack.isEmpty()) + { + return ItemStack.EMPTY; + } + else + { + this.inventoryContents.set(index, ItemStack.EMPTY); + return itemstack; + } + } + + /** + * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). + */ + public void setInventorySlotContents(int index, ItemStack stack) + { + this.inventoryContents.set(index, stack); + + if (!stack.isEmpty() && stack.getCount() > this.getInventoryStackLimit()) + { + stack.setCount(this.getInventoryStackLimit()); + } + + this.markDirty(); + } + + /** + * Returns the number of slots in the inventory. + */ + public int getSizeInventory() + { + return this.slotsCount; + } + + public boolean isEmpty() + { + for (ItemStack itemstack : this.inventoryContents) + { + if (!itemstack.isEmpty()) + { + return false; + } + } + + return true; + } + + /** + * Get the name of this object. For players this returns their username + */ + public String getName() + { + return this.inventoryTitle; + } + + /** + * Returns true if this thing is named + */ + public boolean hasCustomName() + { + return false; + } + + /** + * Sets the name of this inventory. This is displayed to the client on opening. + */ + public void setCustomName(String inventoryTitleIn) + { + + } + + /** + * Get the formatted ChatComponent that will be used for the sender's username in chat + */ + public ITextComponent getDisplayName() + { + return (ITextComponent)(this.hasCustomName() ? new TextComponentString(this.getName()) : new TextComponentTranslation(this.getName(), new Object[0])); + } + + /** + * Returns the maximum stack size for a inventory slot. Seems to always be 64, possibly will be extended. + */ + public int getInventoryStackLimit() + { + return 64; + } + + /** + * For tile entities, ensures the chunk containing the tile entity is saved to disk later - the game won't think it + * hasn't changed and skip it. + */ + public void markDirty() + { + this.te.markDirty(); + } + + /** + * Don't rename this method to canInteractWith due to conflicts with Container + */ + public boolean isUsableByPlayer(EntityPlayer player) + { + return true; + } + + public void openInventory(EntityPlayer player) + { + } + + public void closeInventory(EntityPlayer player) + { + } + + /** + * Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot. For + * guis use Slot.isItemValid + */ + public boolean isItemValidForSlot(int index, ItemStack stack) + { + return true; + } + + public int getField(int id) + { + return 0; + } + + public void setField(int id, int value) + { + } + + public int getFieldCount() + { + return 0; + } + + public void clear() + { + this.inventoryContents.clear(); + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index 7bbe35c28..6ba75b82a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -2,13 +2,17 @@ package mekanism.common.inventory.container; import mekanism.common.base.IUpgradeItem; import mekanism.common.base.IUpgradeTile; +import mekanism.common.inventory.InventoryList; import mekanism.common.inventory.slot.SlotMachineUpgrade; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; public class ContainerUpgradeManagement extends Container { @@ -17,7 +21,17 @@ public class ContainerUpgradeManagement extends Container public ContainerUpgradeManagement(InventoryPlayer inventory, IUpgradeTile tile) { tileEntity = tile; - addSlotToContainer(new SlotMachineUpgrade((TileEntityContainerBlock)tile, tileEntity.getComponent().getUpgradeSlot(), 154, 7)); + IInventory upgradeInv; + if (tileEntity instanceof TileEntityQuantumEntangloporter) + { + upgradeInv = new InventoryList(((TileEntityQuantumEntangloporter) tileEntity).inventory, (TileEntity) tileEntity); + } + else + { + upgradeInv = (TileEntityContainerBlock)tile; + } + + addSlotToContainer(new SlotMachineUpgrade(upgradeInv, tileEntity.getComponent().getUpgradeSlot(), 154, 7)); int slotY; diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 62ca851d4..4ca477801 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -3,9 +3,11 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.EnumSet; +import java.util.Set; +import java.util.HashSet; import java.util.List; +import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.gas.Gas; @@ -16,20 +18,17 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.SideData.IOState; -import mekanism.common.base.FluidHandlerWrapper; -import mekanism.common.base.IFluidHandlerWrapper; -import mekanism.common.base.ISideConfiguration; -import mekanism.common.base.ITankManager; +import mekanism.common.Upgrade; +import mekanism.common.base.*; import mekanism.common.capabilities.Capabilities; +import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.frequency.IFrequencyHandler; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.security.ISecurityTile; -import mekanism.common.tile.component.TileComponentConfig; -import mekanism.common.tile.component.TileComponentEjector; -import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.tile.component.*; import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.CableUtils; import mekanism.common.util.CapabilityUtils; @@ -39,17 +38,20 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; +import net.minecraft.util.math.ChunkPos; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; -public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandlerWrapper, IFrequencyHandler, IGasHandler, IHeatTransfer, ITubeConnection, IComputerIntegration, ISecurityTile +public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandlerWrapper, IFrequencyHandler, IGasHandler, IHeatTransfer, ITubeConnection, IComputerIntegration, ISecurityTile, IChunkLoader, IUpgradeTile { public InventoryFrequency frequency; @@ -64,6 +66,10 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; public TileComponentSecurity securityComponent; + public TileComponentChunkLoader chunkLoaderComponent; + public TileComponentUpgrade upgradeComponent; + + private static final int INV_SIZE = 1;//this.inventory size, used for upgrades. Manually handled public TileEntityQuantumEntangloporter() { @@ -82,7 +88,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } } - inventory = NonNullList.withSize(0, ItemStack.EMPTY); + inventory = NonNullList.withSize(INV_SIZE, ItemStack.EMPTY); configComponent.getOutputs(TransmissionType.ITEM).get(2).availableSlots = new int[] {0}; configComponent.getOutputs(TransmissionType.FLUID).get(2).availableSlots = new int[] {0}; @@ -94,6 +100,11 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp ejectorComponent.setOutputData(TransmissionType.GAS, configComponent.getOutputs(TransmissionType.GAS).get(2)); securityComponent = new TileComponentSecurity(this); + chunkLoaderComponent = new TileComponentChunkLoader(this); + + upgradeComponent = new TileComponentUpgrade(this, 0); + upgradeComponent.clearSupportedTypes(); + upgradeComponent.setSupported(Upgrade.ANCHOR); } @Override @@ -241,6 +252,21 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp frequency = new InventoryFrequency(nbtTags.getCompoundTag("frequency")); frequency.valid = false; } + + NBTTagList tagList = nbtTags.getTagList("upgradesInv", Constants.NBT.TAG_COMPOUND); + inventory = NonNullList.withSize(INV_SIZE, ItemStack.EMPTY); + + for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) + { + NBTTagCompound tagCompound = tagList.getCompoundTagAt(tagCount); + byte slotID = tagCompound.getByte("Slot"); + + if(slotID >= 0 && slotID < inventory.size()) + { + inventory.set(slotID, InventoryUtils.loadFromNBT(tagCompound)); + } + } + } @Override @@ -254,6 +280,21 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp frequency.write(frequencyTag); nbtTags.setTag("frequency", frequencyTag); } + + //Upgrades inventory + NBTTagList tagList = new NBTTagList(); + for(int slotCount = 0; slotCount < inventory.size(); slotCount++) + { + ItemStack stackInSlot = inventory.get(slotCount); + if(!stackInSlot.isEmpty()) + { + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setByte("Slot", (byte)slotCount); + stackInSlot.writeToNBT(tagCompound); + tagList.appendTag(tagCompound); + } + } + nbtTags.setTag("upgradesInv", tagList); return nbtTags; } @@ -706,4 +747,26 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp throw new NoSuchMethodException(); } } + + @Override + public TileComponentChunkLoader getChunkLoader() + { + return chunkLoaderComponent; + } + + @Override + public Set getChunkSet() + { + Set ret = new HashSet(); + + ret.add(new Chunk3D(Coord4D.get(this)).getPos()); + + return ret; + } + + @Override + public TileComponentUpgrade getComponent() + { + return this.upgradeComponent; + } } From 925e68b4c448f95c1e9bfd644df49710a42b4e0d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 5 Aug 2017 13:07:09 -0700 Subject: [PATCH 5/7] Fixed Transmitter textures --- .../opaque/pressurizedtubeadvanced.png | Bin 2223 -> 1956 bytes .../multipart/opaque/pressurizedtubebasic.png | Bin 2297 -> 2032 bytes .../multipart/opaque/pressurizedtubeelite.png | Bin 2233 -> 2049 bytes .../opaque/pressurizedtubeultimate.png | Bin 2193 -> 1959 bytes .../pressurizedtubeverticaladvanced.png | Bin 1383 -> 1079 bytes .../opaque/pressurizedtubeverticalbasic.png | Bin 1383 -> 1074 bytes .../opaque/pressurizedtubeverticalelite.png | Bin 1394 -> 1070 bytes .../pressurizedtubeverticalultimate.png | Bin 1395 -> 1060 bytes .../opaque/thermodynamicconductoradvanced.png | Bin 2150 -> 2077 bytes .../opaque/thermodynamicconductorbasic.png | Bin 2160 -> 2089 bytes .../opaque/thermodynamicconductorelite.png | Bin 2150 -> 2102 bytes .../opaque/thermodynamicconductorultimate.png | Bin 2144 -> 2092 bytes ...thermodynamicconductorverticaladvanced.png | Bin 1394 -> 1091 bytes .../thermodynamicconductorverticalbasic.png | Bin 1382 -> 1086 bytes .../thermodynamicconductorverticalelite.png | Bin 1385 -> 1080 bytes ...thermodynamicconductorverticalultimate.png | Bin 1385 -> 1085 bytes .../opaque/universalcableadvanced.png | Bin 2094 -> 1968 bytes .../multipart/opaque/universalcablebasic.png | Bin 2080 -> 1939 bytes .../multipart/opaque/universalcableelite.png | Bin 2042 -> 16106 bytes .../opaque/universalcableultimate.png | Bin 2055 -> 1930 bytes .../opaque/universalcableverticaladvanced.png | Bin 1390 -> 1086 bytes .../opaque/universalcableverticalbasic.png | Bin 1389 -> 1087 bytes .../opaque/universalcableverticalelite.png | Bin 1385 -> 1083 bytes .../opaque/universalcableverticalultimate.png | Bin 1386 -> 1081 bytes .../multipart/pressurizedtubeadvanced.png | Bin 2223 -> 1956 bytes .../models/multipart/pressurizedtubebasic.png | Bin 2297 -> 2032 bytes .../models/multipart/pressurizedtubeelite.png | Bin 2233 -> 2049 bytes .../multipart/pressurizedtubeultimate.png | Bin 2193 -> 1959 bytes .../pressurizedtubeverticaladvanced.png | Bin 403 -> 1108 bytes .../pressurizedtubeverticalbasic.png | Bin 395 -> 1108 bytes .../pressurizedtubeverticalelite.png | Bin 404 -> 1105 bytes .../pressurizedtubeverticalultimate.png | Bin 390 -> 1111 bytes .../thermodynamicconductoradvanced.png | Bin 2150 -> 2077 bytes .../multipart/thermodynamicconductorbasic.png | Bin 2160 -> 2089 bytes .../multipart/thermodynamicconductorelite.png | Bin 2150 -> 2102 bytes .../thermodynamicconductorultimate.png | Bin 2144 -> 2092 bytes ...thermodynamicconductorverticaladvanced.png | Bin 519 -> 1126 bytes .../thermodynamicconductorverticalbasic.png | Bin 413 -> 1112 bytes .../thermodynamicconductorverticalelite.png | Bin 430 -> 1123 bytes ...thermodynamicconductorverticalultimate.png | Bin 422 -> 1106 bytes .../multipart/universalcableadvanced.png | Bin 2094 -> 1968 bytes .../models/multipart/universalcablebasic.png | Bin 2080 -> 1939 bytes .../models/multipart/universalcableelite.png | Bin 2042 -> 16106 bytes .../multipart/universalcableultimate.png | Bin 2055 -> 1930 bytes .../universalcableverticaladvanced.png | Bin 514 -> 1125 bytes .../multipart/universalcableverticalbasic.png | Bin 428 -> 1124 bytes .../multipart/universalcableverticalelite.png | Bin 438 -> 1123 bytes .../universalcableverticalultimate.png | Bin 415 -> 1110 bytes 48 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/pressurizedtubeadvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/pressurizedtubeadvanced.png index 45e7a81953a423be3899f84837f11ed130f3164f..3ee9d925b7e0a6658bd235f5c76eeb05eb191ea5 100644 GIT binary patch delta 1319 zcmZ24xP*Vg9Ytdc1#?S1LsLr&BNH73BLhP-eFIB-fFgRC znJHFKy@t5-PA+0fi7|CDH#apkGBq@`Faug(W@%<_;Am;!Y-a3YW^Q3(siaU`5|o-| zm6D%anwy$e0<$0mXaQ6&P#<=^lZ}|2>Z5Fr<}om^hKm!zjG3fn8rs!d61qu%%m| zv(Y7)<=TNqUAyOQ+!BzsbhD9GN$|h(3um73+dMb^|M|C&h0R%^@0)%i~?}P)4;$1MjAnBE3O6Kx_z7Z_y6#@9+$7Yi(DAM@n-oH zwr}Upo^^CAFl1m-0HLOxl@nfZZYo{<`F$MgH~#W3Y~TFP`MiDoBQTDU_25ycaU5Yr z{6Tm1lO@`M?23NA?Wuoq=f}BNp)7~~w6wq5B8(s1`EuLURKc?@K2tNlj}lkRBtrLt;hT;lrmTB*?|tX*(|yL-x$3xRj}W8O8Se3kO; zp5Euk#}RvdXZCr$0JoDzpZDx~_C#l2-;o{4&+<0?dF?tSX@dLn#N~o%a#6Hbz`He5ZX4aWzk&o|ARee;xgdwmq zb6w@zbEj5Sb-#LP+$?O*re0K49lvXuNm#^g_jlV)Xq~7pvMgI)eAwpZk!Raa|2r*z zR_t}5`?>Os0&x{yk%gAy!|Qh zbdKAao*!B@S8x6G?B$|~51%-$%F|iB{KO~0jr)}UO*emjF->=3Qp?)UHupURCDkow zM|D;deRVT3`?fYfY1ipb`qxU!`ZcR>YI=yc=1-c%%Q-Ld_LTE|O>-Ql=-2w0WGQP} z$J7h9{#<2vZ`E}Z;d#H$&2+nSa{s=0WqtPI;&*Cp?zD=#?IfS_;_jJ+osRpsc71up z)-A<(%4kXfd)wvnzmC~`=|68>_pCQHo?Fy&_u4MAmmfD2DLp>WQStHg_bJxLHwlbE_E9u!dfNBv#n-2;m>(*dxTt<&v0;9jyUA>+mN3b6WgXQ^ z^!1OLNzV~nRe9!4-r8fm{tHDMoVp#~8<+i^eIw1`+p@PEhw>{jw*AT3{8u&mP5ILe zF$|TT3j4NS=h=6v%UixC+Bf>%%jF{HJm=N$#krhnNclZOeR=a|!Q1P2)-ZNH^z6~x zv@Jqf==ajE3MWff)hqEGKUz2WaGaji8m^oSLytKh;?(4?t!4`|Jrp+K$Gd6gpEHLl zM=J}5DqmX|dj0xBU|L`Bsn>DU{q&PQ)A}dW-{jY|xzkpC<(t3o$$tu0e>yobusA@_ zL{lphlO-ig`)0SpbC&CoDf`8P&nl<?M8KUx3) delta 1588 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 Bd_MpH delta 1663 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 Y2-9JxYgD5oXJLw=QTN!_*#@Nj36C{&$p8QV delta 1597 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 U>!G=ZmJC4P>FVdQ&MBb@0GOyYkN^Mx delta 1557 zcmZ{kdpOez7{^DGQbfnSVbTe?Y`-zH*|5uxP^%+p$#Trh5yR##3>6BcLmrpfo}z{o zdE9B_aaYmBC3m4*3dNyQT8>WjXYYUS`+Ps&_rH&D*HxwT5nTX)W3Z+G+R_Y#Hin~+ z02+bBA^@Zb62JjS912+`(U3Yt!jM2q48;xrEG+;4v>;+g7zzlY&`5K0OG|U&UU&pM z=w5z%s>hfB$|Eew?t#fc0}yv zKNN-xV99&o!6DAxEF3e?E0paW5c0F1x!M1N1%Jh6ptg{BM!M!)2t-E8fkJeN7vg;}rP z82=JmewLRsGc)r?x^J%PY_mGqQ+)=XxpFfzk!uZ&mx4o}aS%m_v@K*C8}F|7^&k~Ru3?SD*BhmhsuUG znz6Y}m9OHM>@GEr2HEw}2U|J1$Ga&@*rtNBRAmi4t0gV`FIEY@_4#&w_KF>%s5wJrmM2|m&(kdyzQ`$AUgJJl z@L5>tXkF@AKPb}3S!l^YP)*V%l|=w6X-`*Sz8GgeSYUDM_FACT@^D(9G?^=0XSje< zF-34*p28VEOrSlO*HfTv0iLU|Lbe*&`F*^{(Ie#9Oe7Z9+>`zE22oMj@S(qCmjKC4 z)AXrX9q2i|?)G3zTsc-31!Fs<8VA@&UQ`~rFabRoN!Qh6Dj9ZcaiZ<7)e{&OBsa7f zGOGCMZlBlW%eH@dxqWZ3b1wOFzdzuaicaBGWItihA%MIN|8(x5X;E*nSwq*XX1*vB zm*d%Yi}71pX!n5PXu!0`I45etDQyFql9P4$m}YaG-Tf3QS*J0Y_+|cX+BU7qwe8gO zyXx)?eb>rtA3}$`4ue`zvpO^1ccu(lrahK=7jY)sc>|rs7zJ@iJ*rS{H&0@| zbE@4>U@oid+qOqnzNsgt&25>}-wC5t1>E0PscxDb$$~NRBwq{qJSc^OK~{+Q6Fx)S zjq2YEJN(K{ml{mkOJY(BZ3^S2TQ5b4O$UxHHUwhlg9T%f2kEe0M#IR5YzMN3!9nkb z)jfKRvEin<$^9G!uytap&{&wxOD>JhRBIgfO8@eS6iKkXtQEVOdsivaCaU3mh%7|f z_MBUa_~V;eTS09)Up!vpwo@7UT?#S&jz@+>(c$(q@J?5FT=pFeM+vRS#g>R{`6&%4 zIC4`4kfVr0b1MuZBcph0&zPQQ8fLT}e_lZ@L3e8$ME|>Ac0#1Sc_WI=+ku2AUA2Rm SpE&snvN;YQl~O|bGvPmwcC)zv diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/pressurizedtubeverticaladvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/pressurizedtubeverticaladvanced.png index fa0f5fd8ce218c0aa9776652d581341d9df58b6d..f7381776beee45901d135f2a534d329bf349f0c7 100644 GIT binary patch literal 1079 zcmaJ=O-K|`93KJ(AYrGrESg%NZK3L-lMA(EG(EX&@kyVk)Pc=O)-^ZWh(zyHU((9?Zn zd+nZDilVkBj!H?gZ*y18Ch~vXFn5P+yK%f9_o6|ZQ*20eXea|g!cc}_5-Qr*iD$5l zqAHv8R6p*QyF?WkUd6?D^M*y(6xG(Aw-j|4VvvDDx*4ID9?sH0*CKRZKxSnt2DAFn zaU1rIcc;|xVO7xR_QRkpFA@g^#0tn8Bc>zfBXrTPNY1XAp+OOXha>cwsD8Nz#E=a^ zz#H_aoG%PQf|m;jVcy>gc$Nz?tiW)756g+HAhH}NeKd(?YlC7^>MX?~w+NlZ*b*5g zm&oz$2GnIv@3sI8KI4DK(JN$vh0$ORHL zqJ-2@1DZG?MQCF2YPu$dJ3>Aw6b**_l8@u!Awi0TB~I{3QGu0$L9WbAm=0D<6_&aB zA8z2kTrp-t1tU9!&`7y^Jz0d2lSLMY#oTU%z`;J<)KJbjAh`6$uA7xnWoE*=g0{enNvvp#_?akUL{FL7i4?-sJpV@+@v9q>fbnP3HdHyP0(QjtVOx9(i2tFE~`|LNSqU}oaSr7HSBQ)6x8 z^78V_GhcstF3y0%g-X!y{>E&&Feld!TtB_JK20rt$p&s6Z*F#-HxUwegiNp BVh;cS literal 1383 zcmV-t1(^DYP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90S+}i z?G%py007%bL_t(I%e7N64#F@Dyf~2tN z)+iyW1b9m9vvaz0MAI}L0FFE0yw?DLvMiAbV+;V`aJ}I4oO2Y4bx~n!aIE45?|rtB zh@$h7=?Al!0ml*%frwBS6}XC^`ca^kz*qfxw2i?B?oA&SM2>U zYaoPx5CZ*R;G9do!j&f?^n+P6NHS>KHaTD%#}#`s@g8uWQ!!1`ANC+_9JsCvkLk}5I`4B|WOJH<^q!4;Z2qHm<&gic7U=Ex)=lp!%|9}7G^rxHl zl$EY8B?zJ{xmV8MeU-OXF2nzK>t2rFtpX)-s2R4QykY}F(qJnflZMg`GCROaK6ihKGD-JsJ zy}dSQ?rqAdy`8F{QT4mXI#_$-vE1gfl zuu`c7$EHfPOe3j7uoEL(e#0NvN6cK_&Zqjs+Vyd9X z)&Ft>OLE1y4HN|JEQDRf?xi~*f=&mt$aviAR+!v+NH;Z@ceZ)uEvN;yehO#}HZ;h& z`iS}>8icUG#3B&^Yv4Tnv6vJS__!2eW&kcapM{b>9zOh?b8ttIoHqonrP>9DcaF{8@LTvrqi`xOVjNhwT!N-^SuYDvDxuU)#>4(Ixuyk_S^3(-)o){m1%uL$*~K+yjPq|G|Bg4$It!&Dv)7{ literal 1383 zcmV-t1(^DYP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90S^HM zLeYBw007%bL_t(I%dL|!uEH=7MBlERI?+ee0V!q59EPj>6a2$)l^g=-Q;?R#rhr(^ z$Fh)MD$6^&9?g!WZCejues}DT7J#a%NMRTT04@j5{C5ICm*VYw4p?imjSDx1T|2u4pzr(SfTn2z z*DM~02qHpJmpJE=uf)!)Dn(re5B@3G0MK<^a=2@L=M002ovPDHLkV1j%dmwx~N diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/pressurizedtubeverticalelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/pressurizedtubeverticalelite.png index d5129eab0543c3a53e2daaa0afb0d4363696c441..8b1160ed96c2e741c176833137a788bde5095210 100644 GIT binary patch literal 1070 zcmaJ=Pe>F|7@sUc7YoUQ*2Tw^VbRXN-EnsYw_0a*b!pdRThK$1volY3u$ec_Je$>m z#9MSJ=nw?aDY_J!ML`~d=up@(0{d%+5D%dcU9&gqu68g7-n{ode!uVgeShAy!GXR# zp#vd`qV{C^)jZjogVoqT{tIpM6|(KesbPEujbdMOA(b>x5rT}Rjln$BjLC~{VGl*^ zJZu(*@o+9H>&RlX0K=3mhp;KC=S11j^l^wm5ssO5f?k<>NdwbJ&_iO5%Q*@xnf+5P zJTo;=(5J?A$)Hah2R&t(IItkrK-s!rdvZBJSN+Q59GF=eR3UggL9dG%&J6+uxe$m< zcUb2maS)RjUXBs27I+@gN`#=GZsF78q zPgu~#88tx@3uBmu9FN2mo{uWAs2btag&Ia~0ig@^?hTd@MqUXyKv9Bj#X#4PX&cD*js)ecsfDh22^wh^S)f`U+1x^d zBnZj0lu8i|LZH7lrAW!BC`yXN3#oXTu5pbma<6gI|K+ko3>!4}pJvxhWP*a@#^{pE z#_&U%OuS1*``l^mJ$V*)GitI>{#blEJ6jwXx$$gy@$%g2!jrLP4s>?@&cy#L-wc5} zO*CHn@MCRlEdq9cwyrmgyR+{`?mf6aKfPmmCfhRo?NH;LWwxCXA6F_@)P|GH;A%%Z z$i8~ISKIg6Y{|VjI(_!u;#KbC?OlFHA=cXZ*+14I-B|g0esO83@7I^>&$C_Mcj4o+ lA<%YxrShVQK6Pt_YG|e!M1TJ0r-x$jf-|WB^-=H0%wORCTlD|{ literal 1394 zcmV-&1&#WNP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90S^d# zo@w6z008DmL_t(I%e9j+j)O1|MW4q$07Xhl7b&O^+NG4=I35}RvMeJN!!Q8wb^E~F&j84r%x%f55o1l92qEki zipb`?y!2iBGJ_Z^B7%sJ+maB%E(@(STI&_|Z3f1B|8p^Bw=l+TM9ggo;{|}au9FR{ zwF~yzd_FZ$N}-gZ?^?X~$tkh&B0}G_iw0{3_otDns!BE($8o`a*XOMd;ytHgnx=p7 z!K^`UOPq5!=YB1Wv9n%(>w~=w%nUZ0dG|Ly0Mn*!5URAIe*gdg07*qoM6N<$f)ItB AfdBvi diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/pressurizedtubeverticalultimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/pressurizedtubeverticalultimate.png index 3b01d901df2a7f84d7655d6eb12db908bc898c4a..b2e9870ed69d86964807f6bf743a4bcccc1a09cd 100644 GIT binary patch literal 1060 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 BoznmS diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductoradvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductoradvanced.png index 892815da8338df408146ae15ed902ea4d9e85e48..cc5ae1ab00886162e0852931de2f7d5fa489da35 100644 GIT binary patch delta 1441 zcmZ{jc{tR09LEP~T3SbJVl6|hXfgAfF_(J=6FuodqRBObA*PIR>0~&)v60iUP?|>l? z@BkdC4~Y)F?CfmrL=C6=Qc3(nGkUY+B;6o zsCa#vbyA^tontMXVfiTD+ou7REwEHIkzO3&&a`wIcON$0ae6ZJkyj z*2|EvtvB9ZO>PmO*wgv6_2RR5x_9F|1HFS|t zyB|=$war&MT_Nd;o6M<1?>$)0BbwUbZu)(eF1F*EzH{9;TgoM7RF{|7|43LwiSo3`X!78ACB%)F z+SfHPiGiYUy6&JAuO~}b$w3yOUlk^iWcX&zbJuug$(Mfg5 zNt9_i-jHn_E$W;P(fj2st-SVn_&T^`pzW|$D7Zz`^D=@9GyF--i-)F@+7UTQ>bsTZ z_i6l@Ct`8hQ8U(&o6vGaeV#yWlE>PT;rHB=RtO6pq=WP1ow2rcISqz!#HC*i zxgMPtza1WHdVN=W*|S+Z*n5N5DG9jx?zeTUUTgD8xlqA7$F5Ok%2z) zL!BEsusX52x>v_DTQ-Thf}5J*_o?;v2-|*7iQ_UOjq#Q04YAMmqf=a8iN!Anh((5q z7q;M~AA6=VxOrNY>J`1_82|n3hK#?A$XRfQ*^ZlICJ3@BAx|715|%U1;YoRQRq3%L zmRQL@N4ufyFNEI+p3pBb);Yj&kcSV3ra~z+;lb_hoCBo7coK_0!shd^#5LIF8?yvasEub?+Bx~=CUa)+k+9;ZCSNwK_ zy`>QjH0UiH%zhM?6<6K`HhSZ7BcfG7VJRfPGyP6lfV$Ps*^P?@(#u1P3Qcu416IKa zOi&9rrA@FFwI}zn#+xf%!gaS;@@j3K=y}t|VpLR9N%z+YAPU>sQL#0?+T>j$7_c0PXomnceY?SYRB3|7N+YK8zl| s))dBkvuO+eBHNwf|7{(%aWp{&qzX0M{H@5vmCYA`u8Y2!iI@Ey>iJNHQUy@F)TvVQqo}&Ec9? z7(o;Y);1uR=@H=RWlO}tw>L(89`Mid-z5%tAiYJaRTs!p#+N zgyXH(0$&~E+)PZgWplyh9*+cDJkQH5atNAdk}Sl-BmsyOAPI?3XE0dbgvp zs;Z#JQLe$I(S$-%b4wL%782V~W@Zu!V%9$aB43XIh{zYTOh<8#nw|K^?mk3Im?!*R!`ZZz9{-gyzb@e6_Po%VI37kSBa^0OXYk%WzpE1 z@!y@Fohr^%Zy2+kD}{4q{VL%FnXHwqjpcPC%Zbl?hW*1MYPgZI6!8pucQe?T5bPXt zgo>D-rNb*xJFM-nYMhOQ+WC&*%_3|@j-EYPo6pb}uZBeAHnI-CYVq19Xc7uH52@3h zOs-!H*Uh568R{NsvK(rQFo53TQ4ifA0iD&8Lw>^Gk!)!_criks){lY1&nOo*FoTUeE!T3G= z!n^spZmY9PUN0>qMv3FOxNwI9fi?=3D}<`jTDugug*6)N?QrGC-#4`?J(cItdrq;x zMa%n0=h`32Q}6bKm)_89rNd4#P=tqg1AR}fKRvXNW1X$gh>vwG30jS-q|)!?cOpD( zoF02MKjC+v_i=qleS6|XfE8f@Vhqk=o_n&t0219*Xus#=k_Kd&K zHJO*i>=Ri2$y}-lPb|PpSdu6I>8i~HVB4Kv0|By~2!LO-Hx5U^!XMn3N a5h6g4{le$L+ksKQcG;5biA997-2VaJXq&MB diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorbasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorbasic.png index 9d94375271634d1ae0ef9eb5441d41dff4a501e8..f23015a0dbf5f1609d9c62bc8fb5de1b0be660f9 100644 GIT binary patch delta 1452 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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorelite.png index ca3d14994c25b07fbf1f7c492efb9a3f45c44a21..644afed9ea522974ed3f251a128a8f5cb431f823 100644 GIT binary patch delta 1466 zcmZ{kc{tR09Dv7>)bccp!V{W^ZHqC#In5ZxjIr)<A?X!9EXPkPj*x#yif=f3XX!4uqX-u0A^Sm#*9oteow*xNF;)S z1T>*B!53_8@s=Us5xyaGe@lvyruYXI5Wv8HVR8S*=3JCyc%jKyEEH^m?+7_0#brwI*@aP(*58KLyZVE>SauL6cx@P!p~|IOwgq{!@{Mwv_yNSbR& zAvwjoS>V_ODLJe0$BObs+@l(Td#pS?4%|*og@TiX*W@+wFWA3$K6kj@B#kY5>E*-m z2|><*xD}yJ>m1KQem}t7Ej>b))4Qo7aH)FOuM{<3UE3ZJy-OI2y1Ah`Qxof#=l@A$ zi2CR=w$Qn~AQHtli`X31y8`BobO)>3t=ml%s6wE&d~h(^!|A2ROBkTPrQ&5EgqPrnWX7g(%pC5)U;aF-F2n*@f=9ej(YF- zh%ofe$wTR7Egwc*vLE|YG36#?U&aR#>;hsV=7g2buL`F4my$PWz!E#Ho};@*7E;ud zoFKB0js{jtN>BdKF4gE{8io38l4FqJ+s5wW5a zFlB0YW6!z_tSf(B$h9$_()5TniP7WuRj9{~KPmrIXkvV&gHzFr%I@w^W=wAl4&>+y(rx!gl3@*d~<%3m>ACr~H&bc}d=^`NA3g=k^%L zG9VDDXRUi{>@|f!%)$g7)#Z9W1r&6TD=^$2L=!i0&x*IUN}{>8leu2)Ql0kImiM`z z%PQm2b&u8KQ%pr(td?e6S5)74+0t9<>8kLIYCmoiF>;FCJGWwbh`2j_h|NTBvNRGy zR{q$%Hc0c)j=wccd%FB_u%rJ&KQAzMs6TS$&@wo*)3eG+EA^71Wi|U<_e6`}b$u@@ zV4QEcHi0w>=ZrqmmcFK#A~}mt+=B3F(*m1tYezdpZ+c9uN`!>4iyV;icp_5||!QgA{VoJ{EQnJ`|2F-505 zSeMo@_LqgUj_5wM`{)pu_$tb(Ziz~D(@zRypIK}vqWZ9k8bn!M4er55jqi618rk$f zwyQ&1S-)zRPwQ9fvsv4kDtjtQ9krah95uRO75{YY3Xzj&^nO++HD-MrtaYo4Epa0L zy8E51w3?%OAaLNMLG#& z|3Y^02 aO2~lj5K&?34adnK@v}6eQp(9^lm7(UeT-TF delta 1514 zcmZ{kdpy$%7{(W4r9P~5+)qXwmm2n)Hrq5ZHVr#PMCRl=j57|KTP_nt5hcp~(h-Gn zEjsCt)G%YMTt_H!EH1b_n&I3%KKLvfoE7HvR8lMW*Q0CN}sh-j=npie-e3=jkYhCtFcRfmN# z{-98BWIra$)z6(qHp8oLU3BSm58PK)pY$U(HBijMN#6uXBwsYr1GTTGf)1pg}dXP0Mm*(`7u_S*c4e>FeOif5=CVg z=*L9W-*v1Y9C}c!8nujK80Xky$LL|vdpYg-;U5-9d{(o@9*S2`UK+`m|D|$#mS4eN zTMv7q8P9gFQV85*QBs&p&uZN{oD&{sd>J@C8xMnmz|kNmNbD$RJ80XN?TCC^l1)fR zU12i3JsB70ih1X98DFwCnB(Q+BL&|cr|?}20*ie{OUXJDo=I&Tj@{!u_S|Hv9K2od zSkK0?Usk7!*I;UvG<@qb8wLVLzjK&-@+7*@#@;@?u(Pdytv&hvnK0iC(Y@L}=4(WAZ3z$G-z0h_+iQI0 z-^Hh+=6=fL29-xkaSqJ>4#p|YiL}+=X@?go_@3Qp3)VFuw6nwa+zl5dWEUV}&KBL? zH_&LfM@OJ|cJ?Y;9db9Lcv>5DUfs~Japj{BA9;@T?}MMljS@RG^Z9VN6Bdi!=MWKj zNPGkxbHGWM(Ih1iOBQ-N887jUO4m`HyYAnJd>tt}$#&7GLDw(HgXyhi0tU~5uj9Kd z^Tja6;JZP8RpUUczhATa2uQZX|#ytx@=Uc??6I%A$|Jiv`_9v3thMcUc* zCY?H6b}fpEAJmrj5=$R=V<)CYSy;1O9PFDLDi>$CK4|Mb>m{@4&8kJMM08u>(%Y{u zrK_9L>_cjF(OB&1UL&oC;d3^_H%CT`CQHoVaS1Z7gQkYBk3U~2%Piu}_k+Xco2I&# zWNI^I+}OU^rM$ z%im)=F-5$&!6_~?u5AZLLv21Udlfo-9#LH3SjcUisHJE0zOwZ4JQ*9Zw*0;;BI**; zR6Wh1i9&Oz_O|ATdq)tCMCnbj9W5((Pn@W zdmR~|wA&&;fWsKvlWKIRmKU_58tZW&R&L5-?~8?BS}xN6wz6fwU;(<=e10OT>ydHw zw13U%+wyEZ@U&Z!yNRDoHy0B~AM2omU*;+(y=86Q$lkQ7ED)~11kM+I=YpBMkp}OY zk%sIj>YT||oEhe-wneI&DHXXv=}Ze%dnW=k WfZW*4ywX|@+8Q$PSF>`0OU!@c$)+X% diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorultimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorultimate.png index 6e77a0a1163f75f7a538faaa12a9cd213c7341c1..c582a0f19d9c16ebb16ef7ebc7865771104d528d 100644 GIT binary patch delta 1454 zcmZvbdpOez7{|B66CtJ)o?PY<%5AgzJj#Ydktj~CmCHyN7L#p1LMNAsZj!k~E?b>k zLagIbR%%$e#XihtsSF4AZez9 zE#WwIP>}0%ZnvFE+oXSgXzcrekjv?b(3I`qEEnk3omZGp#hqD>N*eWV*$K(kV+om9 zS7&mPlngiPu)eTRS8iX}-V=(-2DF;;7d6m^$Xnal{- zDB*!OCijay{SGhF_smJYNf?|yc|@$5IhM|T$kT48kJlHc1%4o$UMTc>z3Xx{uL0kc zv{D-OY+ASkJ<$|2q^1vfMLJ6?)1a>ucOU%1U6&~m#AmJ;w`rby3a}RXJD$&;o+~U( zBEK$;n$@2f7k&9S^MRmG#_zvL`ux;>iEiZmvck8X!ot)V`Zubt5cOstv6rSQxbazJ zjb?m@Zv{1-B^-(8ENv0mKGB4X@U>1d7F)P;O-+nZ`oWdm<{G$QuR4$$+az5vpyzmN zYje6)CW8!bt||i#rlt%WPPrvz1LqBHaUs_$) zhx2G-Rb@dzWtJXBy!dzBo;q4joRT=rbBnI4g6zks)HA^pSWp|IiMg&fZ&z8=^|q0{ zub>EDa9w0MU&~FNHFZ+q@O?9Y+c8&FJ%VeME$cT+q5*`T)qdETM>r$Gf=->E6Rh4t z@Wo!`_P4&BS$-UL>q4$s)hE*!`<|oK*>>k6C-C=@e^<-JiWctmEl!lAES?Fe^}Vl` z^G7~vG*s@Qb1LE6Sem}T=8aR@*&<{0S`*^7q#h%*Pj8E?rQ)OBsaFhU`1Yt&v5tSmW7N%d3Om8rX%F7J@5z@_NaRS_lcu1_t%{d_f1ts5wAZ+VCJ0CniU1I6#NYjkGA>r{ z+G1;_(fEv;A4y&3xsM6r?9)Yd&p>@w)AUX26kJoB{EY{kRjAK9aC~NjD0Ox-4`B}s zkG~qepX%UdB~EPkSQiHjvUm2LQ$U+)lDir5a*1Wrvk>U&-<^@n+aiy=tk><1R|7ed z)3LFf;?8X#aG_TQfip^C9VxMQaj)2PZai>hZGoaeg_yu4Ir%Tbnj|WX<{b*6VU&J` zI)z))tlHD3ypPaWjDOkH**869@Lmj7y13`(4j2mi;Q$#0EL{UhfjmZWUlH1UgCI#c M*g4xiBA&YV56hU9p8x;= delta 1506 zcmZ{kXVck{II-DbZeO+J|JLU3T@Vq1C*x>zA_QV-M3;HI zH=az#ITKv45CsD1G&CwPX>)jlTUY`sIW9at=^uR99R8~o_kY@aoIZssfpwSy0Ic1Y zN)9-n94gunYe_Rb5}A^62R_&&K0`1TmD^L+qfr~qBcp8u1XBmv>DTu%C>e`U)^MK{ z2$X-(t<~1B?9E3BnV;EN5A!USLvhQE{EKGEl4)oDyNB!$-S885jG+P%+0Ce9uh4i5 z?@68f*j&hQ;i2K&Znx{I7cq?TEA;&4^tYY^ilIQsv0m2Yi-~|{0dME&P1eouN za~v){S1Jdjm+X#T&1Dx}cQa>g9A7IKJaOX05d*TB{=fHL00LOxWhuTxIpgu5xsLXXw2UFRc6C=){ zni)ZU?z3P})>V~Z&{J%{zouTMmBB^obsB#Tr5l*QWuH%A&>a?^c!`AA3?^|n| zbvn^he~ZY<(wL)+sy|)0<~H;31^snQ{a*J;FHOl=nd^s>*_X1jr<7dhS9MwD(GbJL zQWmu;K$8&bnx`Zwv~0eQ@OUM!&T4pPV3GKIke|fN$bRXFa-v{-1UW%YVow-UzglyV zYTFRpBa<%W3c~5rfgrLCf)kJU2&1m zcZsewcBp49F~nh2KX@5!dujRIygjx*Nv>NzdcieAVa-nkk(Upmviu253yhD zp;ZA)(*e@HV%jHwkmt$N(!1@c(EA_^z-!m&)G@E{$ZDFU2AGmwy z%!1)B2LjZ;_Ko12}nV=`-f$mnRonr%}iBLzgcN$g$uQX?F1)GZsV1eFz5R@9_ b--Ve2E0v2?CPD`%V6J>={?zM~-Mqg5k#e45 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorverticaladvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorverticaladvanced.png index 70a830e786ff2e2b79b8df88cdc3e071ad2db781..64eb8a68e8d75cba5944a46f98dc6bbdef4452e2 100644 GIT binary patch literal 1091 zcmaJ=J8aWH7jq+-^}rW>gI@QQx!)o1)sIS6JnM2&0)(G{WLSvsbW(_dgpi8yEp&_ntt=<7fRAuMF z&gEtuTW+OLq-3nG+AN52tZ4>$&7fVJhksKzU;>6!Y7 z#vB?FKu!V<#EFJjpg$!fQ*xY_r9>(v#ATkTaP>KIuWhEc^0=7IaBaopWOqNKH!#hz3E)n4CaMvkKKQQZh3uEC*C$~ zIad>I>{?hiA*@~A;-4Nq^!RJ(Ip3re&wd_#Y_%P1{P5%5o{>fCTgF3^Yck>aX!Jl> z={tJr6HO~%vQy0C4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90Sh+S zld*6B008DmL_t(I%dL~a3W7isMbD_vPHZ6*giyG&T_4a#^%;FsAJDG7f)p)8DtCc8 zErtnm#t`am=JIBE+;`s{ktB%(h~pT5AP4~1o{sFF0I-|DVZ8yMEK2~gECaw{0P|^R z<$ZXXNGXj=$8iR0?{ld0^;TH9p+I-CDX`UC*ZsKr-GjDm74baAK)*Lk)X4K(&HX4? zE?0_QQu0;+;QRh(10jU9^AP%;8498(QgfdrX__iN3yBu0UR9NSgl{|VqOR+aIk*>A zZfrq&&@@di1RY;Gap-&YzZ{I+f>!YM>DRyT0;hCcp4zdXQ2+n{07*qoM6N<$f_3Dc Av;Y7A diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorverticalbasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorverticalbasic.png index e2bba0da0d41660edaffece7db1d3e2c975c9fb4..74cd20e848183807640ea67545c62b70201e989f 100644 GIT binary patch literal 1086 zcmaJ=TSyd97@q2-o0b%X6*P??neEQZ-ezZT&E1*Z+H!4Mw_GX6aptI#&YW@P=#BjE>AnJBGrmS=WM7D!Y&4^H6C+<_ErbeiiV2VkZBIwfg z3|gRhuqmqyb}PI}?W!m1905Df0g_2a?=ft_iBNNX1$=hRG)2xqPQ`7m)lc8|T8T-zUbxd^iw_CwP%5ag&CPWJ3WZ zuJ)H3U6d<`7LXCNvJm!^x|i;P2-;oHBt_Bf7DsMx(F_&l?HaedMYX`v`hl9Tpia)! zN6;3~5DY}wsKmMYeXjl}FUArv(I1cV2}a}+RFSJLkb99U{+CN*F|^y(kR09&zWgEpI7mZ_SeQr@)4N-zyGgwqB)ota$F+i_2$+Mq95O zeh?fUZAd>c3g=h7E5E|t>_5VVd)73Z{P1I4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90Sp(~ zyEo|o007!aL_t(I%dL_<4uU`sMjs2dh>7(oabrd8RZKh}hw%tTC2TD*QrO6k1ujuo z)I`5#Co`MLH*dy?qNoN?N&yfA0RY?O0TG`8s5TQ;y9EGQmI06?2>^ltjb>wO+?8j7 zx~_XgA;e&=eTO>V(u+0jIWV1U4s1Esbzf?~GpMSn2|SN)Wd8Rc8fmQ`bKg*52*5r) zqxBU4-}he|IF4iOJftqOo&zamb1<_L$N1PVSkIAi3P7Ic_7UFg{8>d&{P_+HgR(3? o5(nrq``;aWy9MK*<@76qJ921Uff@tjrT_o{07*qoM6N<$f^#*E6951J diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorverticalelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/thermodynamicconductorverticalelite.png index 799ddbb8e08e5f745b2f2c7f5d57091c6028291c..2bc39b9582ba51bcb8dfc9b4245ab0812890bb2b 100644 GIT binary patch literal 1080 zcmaJ=S!mQi7!Fmjs8tljDuQDywMBPxGVP0=s$DPxRlR@99oR@w zQ)-QD4(C$qBn_E<)x-D;rcKxs)wrf$t6C4lpaXUpR)qe1?IsNjJwmqxQf$hO!EU3e z=)eud=B!ri(L|kIvl=uOB;vq?SOo=hv*k*K2tDpsB4^Lc&|n;bdm{92QMpta#E=6) zz#sH!TtgUyL_Zf0!@RHx@GKW(SdrlbAInLsD6t$UeKd*Y=$%qVNt9xdTZHb$*p?V3 zpU?aA4SwWwF`Ouh49hb-?;{AG+izjD;IrK2We*B;HOH{Afh^#8R69^Fj?hHu?-Wcs zm6~vDxurspk}(CsNR#fDm91vthj3r`piK|bNdxjMv=1nq4-L3G$8; zqf0Im!w)So@eUd7ffJXmkY{l=sYJ7d7YEm0m|d}K{^-ENJ;#r=t*ibteecpU?XR~T z*4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90Sr6n zV_OOU007-dL_t(I%dL{l3W7isg+Fy@DL#M*($LD4wCGKGgr2Q8X%Rj^Sb{`5AzX$( zEo>xpEJ4p^4tIvbo$p>F2!a|wN(q4DH~^gDHR5>$pm6r=b$TQl97fFZ`PMw~C@zcn=hV rvMm1+2k0|fZV#qTL3Pk_n#o|W*>+Y6 zA_Iw{1bfWtrJ@JTpa;nydWaGudP>R&A1bLHiXeh6(3x%5dXNUroO6D@@BhF5a?T_Z zd#fsIDhYz9inWO;ysvWB$};?av0-KcZyQld7wUk$C?}bK2rIA$kTFf_11TUW`J>aI zks!*qtLZM(6>k@0sJSHv~bNLNzy$jkbUtXaGs1tsT)V!46RczXCoxW||@k5R?f~e?)b~lVlW{ zfb_cqE}8WPNsf23em>~&?It}88=x7UW_>P(6&PM%ShDz0IGU;S3MsL*7z^J*R6jz7 zK-0Ng&YknRq1i{XJkQgNhxT|}7~!(=I+ARcZfz@h5P>C|s)1Cfla5EJ2WC--!b<<7 zpc(P_qGR1E77CY)wk3mR-3+a1PF@AHg;LfAnrR4+l)9JfhX`8z&>*8xr&}D^(5dPQ%vn2}@)p$sQ#}ThRugJu zp+17Tga$vyhrN-gqrp?qA7LY6B;aQQQNPIgB2*T&Pm&Rgfr@8+$yJW%> zSfjMI+G*ccZP1p4xC&V ztE{VdLNR0Wfr{S4vmXv-eq@I~W*g>K3_m;c{OjoC`BD4F?A4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90Syg4 z!vE3$007-dL_t(I%dL{J4uUWgMNa`o32sg#D8>aRf5FkjpLO&XoSckN5+)a-!BLvFV_QZ_Cv%WADvXIt{=axnTv2Rg~rfvINO_Qzd+24z_)<2ZDYe&2wol_ZH8{R|L77?aynXV&Pz_k94ya=~`57HPfQa20BivMe)y;oHpLmFM}N_dqi! risC16fI74P?LpTm=ng7QeHpv}`&3-fFgRC znJHFKz0SDwPA+0fi7|CDH#apkGBq@`Faug(W@%<_;Am;!Y-a3YW^Q3(siaU`5|o-| zm6D%anwy$e0<$0mXaQ6&P#<=^lZ}|2>gTChY+ztuQSfwe45_&FX7*`+;XsjN)|WHA z7hVZU?9zCc*yUEEz%9&m^@v2cl(}ASePgt6?9Kq;@GdFgUcJ(V+`@M^1c+zcnULU^ z$q;ye{i&jfhx^8*mkSe?#1-T{WqZwYxID~!`}bv+@6Y*s)^d6IjsT66WW(Ke&uy`r ze6rqPZMcZ)`s>Q4jV@Q+V`EleV1l70Mgay0iaf<~tz6r;k8Qh(s!r7EQuTXhD6%;) zuz=8pIY4EVl8yp1KGjcLyuM1K`tJVsLKm5LUHfcityb;U6*NIs|0QGKC*_3;Bg^M~ z-6LcJH2y@)R*BED3SU~ymVNC%X}aW{&ecs{Zn15dB^5Du$;Qon>}%)n^#<~ZM~gRX zikZe3v@qgSbH-n(dF9V9DDZY!?TecHU~jbT)~|XSouVi799?oRBYey6`o7IIGv7_v zDXsgzDvyz0sW$!F>Psbm#eTl@slQ)wd-3f)hVAoAJt8+;zE^Sd;pCP5hxfna;r$l3 zuRtww$*-9k8`WkUtld+#&_$$v&&x1v#>|{Mk&&i?fB*YUmcZDAwOfBjRA*&ki@xajf33r@SH zdmeFXx3+%OCujZS^Y!vFkB$6Vi~hBgtS{&eT$f_7Ab4Nrq))dx)%!2s4`z*9fB5OT z%*?+16|Z!3*73FfJS9B$`nmh1`OkD@l6K}MsYPn=YM+c}ZGKUBbFpA~?BN)rpHCxi zpSV(gV`<6CXXb926A%14x}}awS6=bA^^@{UrY{P?D^GMq8ENw^O|AK`L;u0b+mAI0 z&U|xcdwfZBpO5eYnNm*O|EJ#MMOFGHAIqwnS+V-sj*GKDke;ppm0 zqi3FfFMU!t8+Ghn_tnOfEst|!vYwv4;+rzh_wxFqA5ItBpBDM}^n0a^)B07`pG$IX zKDoeiJjrW>@sLSO0=0?WVQ^hSGb*35j8Zs}Mo19m_ zc7FefP2T0}SGmuc5>sFD!?JRp^|$5w)};8nWe;38d8%Fhn%@`LvTrnhI(VWb=FC?S z3NWu2z%yj`O@Br<2E(3ttD-O6(PsbxPgg&ebxsLQ0GqNysQ>@~ delta 1458 zcmZ{jc{tPw7{`YkvGX`KSy#CV)oA87W0;u`V@zgiT$?jT%%BYDY&?bNkZ~(vvE$r%c5DCZeLjD^@AG}Xe|>(Jt&z(d(*ytwBkXYijX@#N zFbyOEK*JGOIDpVc05|}FLn7+7l||eP0HP(z2#Ev$j3EG68e$PhBMcHxFd|x5V$mpq zmPX{IATk+83J4AJ3ZVFq2qs#>&2buyiu;-czL(7o5v95zEe!BjES`X{#C|OxU@<5R z5f7N-F<1+fmPTlpy^k-B8b}Ghl_?or+UN#%K2M=;)wIm=Au@Vx&{A}c# zg`(a-RR@L6X`1fMiN_KP#wrPlSvq9tv}60}-u9a9((Q?dz57o>R2~0xNKj$(^B%Z1vXQ&eelp)a~^X)w|MD7Ku3EC^gT(jtg5VTdU~-W zn#UdTMdd>$Kwsnjrj40KUZhu|SLAZ60eOYL9R!75f$aSs2{QZ`PBC7EpN)Qn_$U~-L*$CzCNY&+t(6`7CR%SzLYDTIn z<4|FLu(bLnLwX3NJy_;qL&t%ddZh*_M-r99%peM8lzNx-3nwv{nYopZ3l6>A;)k2p zkp$32ET)#)%*f8^JT-7Lt5md1V5((Tn^nPoLR#2x%nuwNbQer@|#!-=Cwjp^?MpU;KY zzf(*}9$(X@z&T`4{d$;jeqRV9aO!yM2f``4oDaulctm|IxC+|W$@~mbWr`KE`IN+R z++0bjm~3k3pC`3EtWxT8F)aw&SwNM;wD(2biY-3Eg8MU41%GexKz7JVTI5mO7tXLw zK<@Gn{>vaUb092@H9WxGI?XGJq>C?S<&MgBgoQ01$$y;W_GRIDMPj9&AlK=x_7ZG6{HS6=)a4wKIyCVZra$1%oa zgZ(_&c`fDTw3xQxXR3rn7ruw9>x}xGeszy}a>aqxx7KpKp#;u&cl&*>)>%%q;wFHQ z#${iF2VQjN|5Du-v8BrFkN6d}Zc}@aW-1n+?me$SSi3R5dbv%dXDOzz&D2D|&|F9X z52%U1E^F2K$?f(ogJ)ACwC|$*7b)ze-fFgRC znJHFKy-qmvPA+6hjWKmHH#apkGBq@`Faw%zW@%<_;Am;!Y-a3YW^Q3(siaU`5|o-| zm6D%anwy$e0y94aXg*XgP#<=^lZ}|2>T{p1{>{L^!tCkd7*cWT&Fr)O!j2Nh?&peo z2^?-W3t(aq6%a~x5s4D&xmdCJSaZ1OWBCOiTNL9w4m7h1?|tbgq<7Ec;i69VMVuUL z-Hi!Ln_7gt8k0mc;SvW5(Uv z?^3Vi^jOsO=C#j}v9Y33`ARGdi~?}P)WE<2Mj8ICI#K?by1Ko$|L=e0qBi-4DR=wf z!r!W%UANzVteD_9BZ+~<0fbs2K07XA|1dB5>%0%g->zS^y65)$s^>yd_q8qT{uJ;? zwrH|})v-8qwAgu+?62?9Iqg)pTg|WbNc=x~t)a^Dd8F#| zV{gUpu5aOCQeZH;7UlDU%i!0c?9Z=`zmW(ludv#o&G`4URK(jS8@=@$q-5n5vuI8e zX-JCM#t^jd%}Sm}SF?q(C$PEZmhauMN8iP-d#%g4i+@gCpRm3*wc_F9hWfw%-iX~z z+#9WWygu;$k#*-6`0g~ee`t4Sky-NnU1II?e_LfmF)hg!I=Sn-zUeOcIeTVCz6~>5 z_cP%_b@rc=FS8G4mA$mSnBu&|zt2+t^ew@UE9M^)|0^0)clgTcSFe@381qtY^L6~K z&bhs1npD8Q)?4;E9G9o-%Rcf}Co$jrY_=xISh%b6(4i+EAKt@%if$ z3JgpNkFzGc_#L_D!Ml7h+4CQRm%DuT4_-H+-mdKI;Vst0NO1vB>(^b delta 1443 zcmZ{jdpOez7{@1yNLFqsm!TYr?6=wMH?7%bSWHBXB62AbVy+c)Nso#qGACtck$Z$( zN+LBQ*HCgPo*tK(TpP_QI?i)C{dIbu?_clpem>v7-gE^HH1)kU0KiPa{QwGsM4${| z2snT;hJ(fc+z1X}0XP-`uUJ)+IDsIU5J8YghLb@w0Fcoj+ycZPF_uJtK*WF~qz)`H z;5?Ozr3BJLPX&7UP%Lmd>zn<4e%{!hti^BG^xzFXu9ip(5P?COpe#`)>wXjgM3YHG zA_4>~P-r-kqywXe9`QMi^$zk13-AdH{m<{c?*GZ6e#fRGB#Dg9)n}(55UEs(1;HtD zXy$HvkRnZq*WIzQjR4&YHOP9i|T*ev^FO=d;U6yLpH!5pLeT{J!#?6A5J&ZxDb#pmwS!27!eJ!9+xHI)9Xa^mT6J%JX=$MXZhU9-HZsQGUIxD41vck_kH z8fU%%77m7W@5;w!MusA%6@`h})*zeCVBnQ5@7ZLoY1NC2@I_nJUVrDp@HTBJqji+B z(fU(A43Y{mnf#}fllHg*ty?pQz=+U0mRWfb9FEIe!b}z8)ks3N%DdN2uDL~7UbdIr z9`q`6gRbSg$B4wPw`-(H`=aGe`b|WDVF&RhBg#z8s5ZycVsG=r=0Bt0D{~_5gUY$9 z_Z}6s?_wV8tIr+NELH1eR9I&9XmW(Eq9Ca}a(*C@>RzDa@CKK`6vZZgXj?c~ zQZzl6zI1Wz`1Y#AxGbC7QqA)+ebqwNhQ0Sy71D=k(WfKNdfjRKYqbRTww5v2|9Vn9 zJ1=qwuPX26X<0FUxP6t6;YkdNw>II`PE1vX&py>-6c?G@dSW+Cmpx`I-!)i$Uu<9Y zNZbAyokDjm8a5jUw6bDN)Ox7e+;CXd%?Zw_Cm5;~<7Rgy%h=GHX4J%3dHl5)WoOJk|7mSSM}+9r@Gk%N0*~yf(hTZBV?>6CU4wxQyi0M)c%6@x$#JNy?Mdzt&!mn zgpR;}m{-&=cjbKMc0oT*mk1}kCo_BJi=QbENstUtmU z>v-|Y^=vJ^-$cl?O^v#({|~2lDT?={6pT^1Vfc4Fn?~u?v@#_v@76Ob!As8zYZvXr zdL_F=K1m3rR9~VI$-GeiLIJFXb+?;;ebT;WH2^IV435fuY#5kvfFABRTPg@+*E499 z?d4y9GF`qVnZ0JK-)g4C{VG?Z>5-XBEl~rqeB3h|crqI$ppedd*W?u2<1s_0M*OjB zj_$a_j0TkICym7TaxO$B7E;)oQqsrf4{99XDM||uNbb&Tf0BmZx@F7%yyuI@F~%y) z77hMm)bib^+ONEUZx!}X)(*&e&w85v@yW!tb)1xiL!@hXZny>}7qUJSvYka4(IftE DQ231N diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/universalcableelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/universalcableelite.png index 4470d888db0ed47481d9caf14067de4ad32acba9..2b298f13c21e2cd09c1494fe61f5ed0cd693f552 100644 GIT binary patch literal 16106 zcmeI3d0Z3e8OH}@J#bYnt5RKK)YYw$NkYiANi+};kI3l)))j|j2$3WclK=t11GOHg zwTkWnDoQ=7t56qpJyuX!PnIfpfGDWdu8QtjFId5&GdW0j2~+#&{yF(fCVAfHeSYuz zexLW4e`Zz0jLH2y{5&8C>OUn+7KQ)LCBA)n;CF4?9Sr~Js}GAeLQp>+;_C(#Y#9PU zLWMde&J-t~E>vJz2BO3gQHEKo$7@57Xrft%$MtT4PGpJyeKp=pbY?#gV$7}c-Gjt}z?5{J9 zvWnPsWT;VLQ0q-*Ppp^<3)u39u9V5t0@wjObLTQUcop?FC?n z2qsdeQFqRqwX}0W?US(U1R&P9FxY@1_{508FwKVy2Mlra%b|wK5EI&oG+!9V7P16( z(j6k!nt+BJQ>v3Px@Z8|A~c+8f*SZ4u0%}82dOyMb<$BPgh`k|i9 z9feLcJI(@OFs8u_c(+gqzUR0qb{S<~`cizSC03~s$SRTQAVk%<)UitchaJEBNz+;1 zx$|Vb6A?$55Z{0B)qq&mJxc_4DRUaM#TQ3x@S0RheIA>Me_$4Iw}m>p!O(c}P-iz7 z>WG}FQ=24gTWdhEQxtLDS~D7rKVza2ZeU7wF`$1zK0T)6<}3f>=xOXHEPu7w&k@?J{>dcHm$0k7Go?rYfLCH39%3Hz{1? zd;l+n3jjiHQn<+Z0A30g0EFD6aFO!?yc8|~2)Rk&BIg5mDO>;$a+AVE&Ij;PxBwvJ zCWVWf58$P60YJ!23Kuyaz)Rr*fRLLME^eZc@0&`2b!D z7XXCZq;Qe*0lXA000_BB;Ueb)cqv=}5OR~kMa~ECQn&yhfZ<{ju3mFZwOdxteu_Q`MIJ{Pp)&vqC)~_emXBAE*b-a&7N9 zXtieIuClVShrhgU_F;Y6TJ$f&vEqAqwZ-@T6z1*`wA#%RvRpZyLB2P9WUU86eZ(Q> zZvJsa?z+i)BzdXjW9RpCs#dHVKKevLXr%AnOl5P;rbXMTS{J{pe>%Th_4m4jtbyaE zG6rW~YWl-Ji^iNt=<9*^!f<`o^tKUq-h`MYG>>>;G~f2hxKZwYs4(!a>H>P&rjO1S zk4lUQN*v^toLj}6lvmqx7cH`4_o3eL5knNe)y6KBHZ;w?^001y-)EcFCTIOL?f%I{ z@9uJM-%a5~z71h3+UH2WPkVl`;Z?4x&)Bb4)z^NLzwGJFo{8VA^u76_ic@{<^71mV zJhQgmuV`)Qt)cm~p_u2{Cvwi2zR%~+Z11t;)QZwxJ4V0C4!my^FZ_JZ+D6WB{mAj3 z)80LJc5V$TH}YNmVa4RDug&{vN+UzX1#PS&{L=92-jzfCTzI;4M~ip<+t`Dms%7CX zJqM4>8_lk|S99a^m96DvOYhZ`ysY*3%ySfL_<2#;w5i;lvz~9m{#|!+Sor{kn?{_eQ zp}FmK<(AkAZOy@|RlYX{{^nJ*?A6Lo#{Vqc?Di3N&et_wkI{>b2hz5t^gljm=32%Z zW^K{Qw)N^%@MjoX2jV<}{yL{fRL;D`>OlbT|>+uI0&t}g1Hm#+^zvRi~ zGxNUP-LBtWBJf@PFd$!cYs86gUO?^_h8;%-&8m7dN?u*`;}>gwCPyJAuvRWZ)ZtN7SQb@aK;ZB+{^x7n*a{clCTALlz^ z{Ilt|it`EzBg~6#TzD2KeS60JEiJz7hdHlT4rn=;bMf@~C9}7r4l)|@zLaMDw6QuV zFUPH%Z9^u?FN{n-OIWJ{*`R=%yizu{JvRD5lupyE4e$-1RE>l1AYCT700 zcduSMXPh#=a9TOuwU=@)T=y!@oO~#Ja$ET(W#j1f?CrFjL#zvixQ~STEVf<);@%8{ Z4mEDCY`U_%lz1C`O2`aZNzmM!{{SF$H5&i` delta 1566 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 E9~2>Jy8r+H literal 1390 zcmV-!1(EuRP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90Sy@> z7%Q&;0081iL_t(I%dL_zZp9!FL?4T#bmmJ`q>JRzr4N$BcCIEz@oUvTh zGp

#+Wxn&Y!ZMi)Bj1v(-M2ImGW5gMo@$ps>!5NFz8m)EK{Ck2XgzyKN z=7C(-6@a8EaUBh4&us wJUBQUz0y_LtKGn`K&Kz~pnKR9tZO0`- zB7!0)DhNtn6$&cyp};6KiX!VJ5{jZA>BUIsrHF{m*sk_q4a~XxeBb|n|K*%+N$#mw zv2g`K5EbzzDTViy?q9YPudmlVyM?z6D3(F3unXm63lI?%b^24xb>f&z6~b}_W0o0v@y^$m_GE4=`bouFGY!qn{81B%qtFx4JNunAKHJz7)V z0cCGdXRvvSel76XppW)xf5nln8Hf`q@bIL z#Jpp}E))uvjB#X>;b@l8bvLg$w2e|=LB^tJJKb*rCIxJmwG`ZsuBsv#*Y5v;Tp(5> zNKnb@z(8>+OkoSHYN}Aj2gPU*uYSqLaj{@Dz)5111#aCxxeOM=xXt~m*+mncAon;w zy7)3b{J_8yZ{g9tgPtG6&*ElWilm)4XU}n~C)kxGYvscuU8&(C}&VFNz;R4TfTfkqf^o0OOKVY1}K)DZ;rm`|6ICb z;N*ewd#gTN8Ky6%Z-4cbzxT(tHIyuyo=G}86BV;H=7G*v+VRo0hxym#m0Krko8#NR z4VAQ3O};&N;m7)qdk!^?yez#!?`>iyA7!s6^P8K8er4b78(2cjWOC`NQ}BuVq~o!q JbR*hv;x~ijW-9;y literal 1389 zcmV-z1(N!SP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90SzPK z6!IMa007}hL_t(I%dL_za)dApMW1Ed!lp>=B9xR&4wD1!Rnl;RGzoDh@3Wwxpd})by`k~U*$wZ5D`KMgb*;cNqGONh+u4k)*7vK;{1Dp%6oqYRrQpd z=lQ<<2Pem6R8UGCIsw!%J8N}-g(Ifru& vV;j8phiylWu}#8}Q_csuzWd0hDe8k8K`C=7Hv?S600000NkvXXu0mjfy=R!7 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/universalcableverticalelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/universalcableverticalelite.png index d321c97b28ecbb374d9a6c393011f16c9156d235..949156a17715d645f487bac1ff65b492fecbd5ec 100644 GIT binary patch literal 1083 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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/universalcableverticalultimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/opaque/universalcableverticalultimate.png index c9b47052e5b666c2c811303d2215879d034fa0ae..e0cd14ab9bf6554181b549fc65cff1cf7ec8e1b8 100644 GIT binary patch literal 1081 zcmaJ=O=#3W6b>r>7eV|%Js6`%g>Ew0ZFe)Fsq7}ZcEv4qU1-&dX)+g(tT~PRxY9c_nTkcquUmeY$k_rD=Fw6V&W!lL2TOA+fWwiX7`Dg zsFq=t?zVExq&agyHn7d>0fsNyE@d-J?cSoR8y$$SEvU_M6mII#6OOe^g=?zGfQ+l6 zcB{U}Lx*}Aaz;;w0Zndi9a~$JsRJ7koh{m(jxQG#Zq~0%&w*Ls*jWhaP`Ei!&6!44 z#U5g7_-M!wBN7{fyjTOJaCH?M24YkIP!Ov_K$HQLfykCVjz;s$RynJsO0noo;o1pt zWkDzu3Vb2LW3NpRA%p@53*m5xB0_$*L-bn}I9C|6cJq!aArFzzgOudy8y?6+f=Rn?$dF}AYFa!g$C_XOoFsYRaEh0K(PZFaUk zvbBJQH~5U+HeE+U>%;z7%g=+)7P1B>lCI-)o7wT8)Pn4g-qbJv0@$0q={bMyZm)&l;ls)%} z-#7rasj=lBA1H78D=**K{b}39%AdCM<#)bq4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jK%90Sqtl zxsP`M007=eL_t(I%dL_zZp9!FL?4T5D=E@P$S95Je1sf3M{wsVvSObgP9GWgMFg_> z-&NR#5i=|cGpg_V2+(yM0Q&ot&z}zfhG76;97h1&p5OU>`T}5GR{(^ftZ`h`Bd$px z#+Wxn&Y!Wx724h!YV(M2ImGW5gPl@$ps>!5W9w8m)EK{Ck2XgzyKN=8oL9 z4S=L6aUBF=@1X{zSn1|Ix$sO!lvZ2$lO07*qoM6N<$f_{ddAOHXW diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/pressurizedtubeadvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/pressurizedtubeadvanced.png index 45e7a81953a423be3899f84837f11ed130f3164f..3ee9d925b7e0a6658bd235f5c76eeb05eb191ea5 100644 GIT binary patch delta 1319 zcmZ24xP*Vg9Ytdc1#?S1LsLr&BNH73BLhP-eFIB-fFgRC znJHFKy@t5-PA+0fi7|CDH#apkGBq@`Faug(W@%<_;Am;!Y-a3YW^Q3(siaU`5|o-| zm6D%anwy$e0<$0mXaQ6&P#<=^lZ}|2>Z5Fr<}om^hKm!zjG3fn8rs!d61qu%%m| zv(Y7)<=TNqUAyOQ+!BzsbhD9GN$|h(3um73+dMb^|M|C&h0R%^@0)%i~?}P)4;$1MjAnBE3O6Kx_z7Z_y6#@9+$7Yi(DAM@n-oH zwr}Upo^^CAFl1m-0HLOxl@nfZZYo{<`F$MgH~#W3Y~TFP`MiDoBQTDU_25ycaU5Yr z{6Tm1lO@`M?23NA?Wuoq=f}BNp)7~~w6wq5B8(s1`EuLURKc?@K2tNlj}lkRBtrLt;hT;lrmTB*?|tX*(|yL-x$3xRj}W8O8Se3kO; zp5Euk#}RvdXZCr$0JoDzpZDx~_C#l2-;o{4&+<0?dF?tSX@dLn#N~o%a#6Hbz`He5ZX4aWzk&o|ARee;xgdwmq zb6w@zbEj5Sb-#LP+$?O*re0K49lvXuNm#^g_jlV)Xq~7pvMgI)eAwpZk!Raa|2r*z zR_t}5`?>Os0&x{yk%gAy!|Qh zbdKAao*!B@S8x6G?B$|~51%-$%F|iB{KO~0jr)}UO*emjF->=3Qp?)UHupURCDkow zM|D;deRVT3`?fYfY1ipb`qxU!`ZcR>YI=yc=1-c%%Q-Ld_LTE|O>-Ql=-2w0WGQP} z$J7h9{#<2vZ`E}Z;d#H$&2+nSa{s=0WqtPI;&*Cp?zD=#?IfS_;_jJ+osRpsc71up z)-A<(%4kXfd)wvnzmC~`=|68>_pCQHo?Fy&_u4MAmmfD2DLp>WQStHg_bJxLHwlbE_E9u!dfNBv#n-2;m>(*dxTt<&v0;9jyUA>+mN3b6WgXQ^ z^!1OLNzV~nRe9!4-r8fm{tHDMoVp#~8<+i^eIw1`+p@PEhw>{jw*AT3{8u&mP5ILe zF$|TT3j4NS=h=6v%UixC+Bf>%%jF{HJm=N$#krhnNclZOeR=a|!Q1P2)-ZNH^z6~x zv@Jqf==ajE3MWff)hqEGKUz2WaGaji8m^oSLytKh;?(4?t!4`|Jrp+K$Gd6gpEHLl zM=J}5DqmX|dj0xBU|L`Bsn>DU{q&PQ)A}dW-{jY|xzkpC<(t3o$$tu0e>yobusA@_ zL{lphlO-ig`)0SpbC&CoDf`8P&nl<?M8KUx3) delta 1588 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 Bd_MpH delta 1663 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 Y2-9JxYgD5oXJLw=QTN!_*#@Nj36C{&$p8QV delta 1597 zcmZ{kX*|>k7{|x4YZSYK9Lvy9pOSL?$J{ykkC`!(E7$l$%!WzCFoP|}G||d^M5*MK zOpK&WRx&nsC`UDpM9VN)F-ktxlv-`ui+$1a?s-1X_xF4EO@KA2+IUgbsw8SAT0RV>u05S%|qi`Uagdq~`Knw+q zHbR^Vi*Rxx&{&aCM_B<(8p+yd^I{ep97sTaVUgcr^EmQ>M~DCgNwh?5hT|}w3vhT8 zNC9!61wcaKkSMYdA~MR2d5jPk9uOVIWJP@~2;40AkHvk9%|j{>c_!x{IY1!a?V*uC zk5l8X3!Oss$lJOlC&Kcsm9fi3%7*7spi1N|A%|?`%b*?!itlnXv{}@MX-aqm2=$DZ z>CsH+NU&2TBU~GZq{OYn-ekz0L2sHSHgyJ)PB#kfeL3@7aJUet!l6gUBC%Kp}Dn$mi|Q%Px;X zioHFTi*j07t>4!-q7(p6S#rk@w6)2TVApj1_YH%Dq-wd31-OmX^zNE^aZ=pKxGCL_ zJS}S)jQ4Y7Y$ZJb6+Z`W=JI}3b#Zc9CoqveF-oN2Ew`jpnJeRh1vsT^;Ie++L&N!{)curbbq1#T~y)vF_Z)OWv?8Y^U9{Q`*^m z{li>e+^sm7ZU>pqvCk;ha4c9Ol>z?72hW|bO>|y)(=2#iP2IcnyY_(JlnvL;F-Z8a zOmm+94)p(Ht^@l-vWhh?n5}nVKN_$8F{IEwwoE>!drIs&9_BWF zNekS0@bXm>$0Vkb=Q#sU6S3~lRMkC`)xE7Eqo;SSi+{5+TZKz4F~!9(FRQ!?qIAkM zgVmG7CRHx0YtIJ?XKyg3Y}UIM+$9$2^&Br3jV)^qs+<$5eeug;9Y4SB{NOY%*4YxO z&P8_yKhzk0^uROcW#?+sM;3YN&CB~LcbQmWUWh+j4_t(U zzS)J_o%2e<%iB!pU~JMtQRQf8epRej;qJ-me15)jkmKyz+jI00|FJ8524$YL{S94L z!d*_=3^OHRZg&Smik~|-tWWMi!mAV%TCVbRDW#`(FA^M zq!s#tRWYxPXL|8gg&L~~>zi?@A1!3!b$y>G?IyH`6}2mf$68057xb=bw>r4q&9xLv zn;c{J_S)5PA1X5*ngW?ip+6LeoRQ&Lens=bx3{4*K%bwA*C03sTtj;&a2zM9^@Jzc40s1TMhX<=uH5uc!L$=DQ9H;SW$R(Ow;)a$d#EKo1wS+`>K&Ky z4qcCp9#VM*ha2`l+kUYYg*XtM7qj)4FH8xX1>-uberYGYPX8HHeda0Z(LEUjgs6dr zY36GB6*F|5MsN1XqW+{L-y@eBiRtx&rLS+qqicLiUT0~m`Cz5=sDl&1H6L4>ExE6} z1YNjl{ng5g>vhfM%4Cuxak*%&Pk(I`MKVhCP#3Zdnqp?# zBTNdCwN`AidpTQ_*Nehai_?y)=Groh>y&yL+8yd10!E(KHv)O7!P&XBboXfu&*p!XJXWKNi zU9d67V6l<~ji+n&FW56PpIhuZ^4e?rxIwWS3yhx%@AFR$5t^+1;OC|KHnJxqEdx#~{+G{5D=-?Y0X zZLY7Wk>P6UW)xrmBb~|YC*>4&%5=p^WTrT^&w&(n~Bw@Gnt=FmF@luU2XVhdH&a({i?tB2#Ell zF(p3R@MV2NxBjASE9%blKYZM$G0oAjb;W}JdO{s3p*;;bRyN9R?%ygO)Ud0px}GD^ zEWzP>c})+mY}Fa7cQtYWM#qZ8+}&&LJS;X3{P(pmYfVAY1mEX5^`FnSZTqzA@6+Rp z#ox-sJlmX+lg;(cxJhpR_9qFh?E6<&Fn*l8zv@ApO2n_%!8N~LCmo5e+V}RG)yLfn znoQ~qAKlhrvt(MyVdlPPVpqh2I|cH$Ym9zu`sE$Fa(z)|WmM!=Q^h?WM4!a$oblB> z_I9Y?594ha@1uUrUG?R+o(aEYJxi>}#NT>lJGNa9@Y>rp%_BwgjPFt>(|ty^0=*?W z-X*Py&X9S%=GDqBmNfOrev(a5DS1gdPZ?B6{rWla-4TVzda`rDl9 zMd7DJ<$VKoS^b}CIBn{dj)zyBX06}+?@asq^Vd7yE&9`a?UL`ZHtyB+VeiCi??P? zw4HZh<1uMvVg4>vHcKrIwxq=TBge7P*;!PS!ouP>ibV>De)$o#C)qHt;6 zIRB;5mJ@eP=5sYZ78dkow|>>mW5Rv2U#e_94Y@s$&I`gyj7Rv$gkq_4Jd428SLj>$s+S zm6vb7!dQ_n2NPllQBeE4Z$^%s;;C|%a!u=${P!oG`EGj7%zE%B*36giExdt|VF$mM U>!G=ZmJC4P>FVdQ&MBb@0GOyYkN^Mx delta 1557 zcmZ{kdpOez7{^DGQbfnSVbTe?Y`-zH*|5uxP^%+p$#Trh5yR##3>6BcLmrpfo}z{o zdE9B_aaYmBC3m4*3dNyQT8>WjXYYUS`+Ps&_rH&D*HxwT5nTX)W3Z+G+R_Y#Hin~+ z02+bBA^@Zb62JjS912+`(U3Yt!jM2q48;xrEG+;4v>;+g7zzlY&`5K0OG|U&UU&pM z=w5z%s>hfB$|Eew?t#fc0}yv zKNN-xV99&o!6DAxEF3e?E0paW5c0F1x!M1N1%Jh6ptg{BM!M!)2t-E8fkJeN7vg;}rP z82=JmewLRsGc)r?x^J%PY_mGqQ+)=XxpFfzk!uZ&mx4o}aS%m_v@K*C8}F|7^&k~Ru3?SD*BhmhsuUG znz6Y}m9OHM>@GEr2HEw}2U|J1$Ga&@*rtNBRAmi4t0gV`FIEY@_4#&w_KF>%s5wJrmM2|m&(kdyzQ`$AUgJJl z@L5>tXkF@AKPb}3S!l^YP)*V%l|=w6X-`*Sz8GgeSYUDM_FACT@^D(9G?^=0XSje< zF-34*p28VEOrSlO*HfTv0iLU|Lbe*&`F*^{(Ie#9Oe7Z9+>`zE22oMj@S(qCmjKC4 z)AXrX9q2i|?)G3zTsc-31!Fs<8VA@&UQ`~rFabRoN!Qh6Dj9ZcaiZ<7)e{&OBsa7f zGOGCMZlBlW%eH@dxqWZ3b1wOFzdzuaicaBGWItihA%MIN|8(x5X;E*nSwq*XX1*vB zm*d%Yi}71pX!n5PXu!0`I45etDQyFql9P4$m}YaG-Tf3QS*J0Y_+|cX+BU7qwe8gO zyXx)?eb>rtA3}$`4ue`zvpO^1ccu(lrahK=7jY)sc>|rs7zJ@iJ*rS{H&0@| zbE@4>U@oid+qOqnzNsgt&25>}-wC5t1>E0PscxDb$$~NRBwq{qJSc^OK~{+Q6Fx)S zjq2YEJN(K{ml{mkOJY(BZ3^S2TQ5b4O$UxHHUwhlg9T%f2kEe0M#IR5YzMN3!9nkb z)jfKRvEin<$^9G!uytap&{&wxOD>JhRBIgfO8@eS6iKkXtQEVOdsivaCaU3mh%7|f z_MBUa_~V;eTS09)Up!vpwo@7UT?#S&jz@+>(c$(q@J?5FT=pFeM+vRS#g>R{`6&%4 zIC4`4kfVr0b1MuZBcph0&zPQQ8fLT}e_lZ@L3e8$ME|>Ac0#1Sc_WI=+ku2AUA2Rm SpE&snvN;YQl~O|bGvPmwcC)zv diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/pressurizedtubeverticaladvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/pressurizedtubeverticaladvanced.png index 0150d9e317cf16b46adee842ff9b985a9ba20fd3..925fc81926bf1abbe1d5b4fcc53dbc3ee5b6f578 100644 GIT binary patch literal 1108 zcmaJ=TSyd97@pFii<)F~gJ>F~(%QN0n9k%Ty0g|+Yql=BQB>p1ah=wgGtL~_QF^cp zqRT^=;aedU22lk05Li?c-M|VdB9UGyih`o3mmZ`u=4uaZ182^K@B9AC`OdN0noYTL zmd+svA~(EQj^a7T8?$EOe|_8T4|rOFLUB|Fn@~!z0a2;JMnHxQB>|#9(b`)dgK~n% zTBXP0C?44+snDPm4@0|#h1mpAUg27bngob!1PR>?P+tdcQ>3m1sD_dV8?l0*S>N1Y zgSw8InA(w4MUAT1NS3=27BB!(NY`jF9mx$)bN79;qdR&<11) zz22vC{xY&uq`4BYj2G6CJj<u#p-Fm*N+WDT0SagOrv$^A zlr^1+HsOXbu3|A9&3YxJfsx4np@uPuc2E>d<@--zC)REOCJG$bW~=z(nhL#8mK3ys zf}kCPuqEBa+GdEL(+n*#81%YUO0H?pO%0};qH#_nB85!{DW(d-a)81rw61HCC{~9A zmai%mWS-+fr6M2XLRDpgAPOO#^^0k)4AnLRm?+KFrnte3T+a@Mg(J(r)(-%!+J*)> zUbduX&PB|qH^J31=Te!G%iv@f?{fdT?DP?Kkhh$)F5XO<>&pIsRYH`N<++x?Qw9b`1y2{pkch*{TQ+U_b-sb+RHfh> zU!z$kf_RFbok>hlU{X<2TQo!R#~-mdcYjKT>IxrbXl5*D;NI0RV}Zm~T}Q*upSAz+ zIk5fz|6g4{VrBumjI&+0?dZo0d(=0YROx}`-A&dywQu$eo}+-+AW z+`ESe2^Y0vODHl4{ZZ??hogj?|k3=?qsrO zZ}qyZ>nMtp6M$&x=IBfLH-}Pf=9yiZ&Uqp62y=V zK`YbdQ~8z<2nr0}Dun!j-N4WBZ7e6Se89)?A}5F(4^}>!M6 zvTQDwV{$DFvWHk+5CoR(;3_H^l*M71IQ^Z1 zVXexV&Ptg`!PvZFu{^`MDV2b-{C}untfC#9f`9z}Q`kw5T98da2W4%QT-;!z8_E)6 zHdHXO(+C|YRWUh?Fmi^G1!6I`YC*8GPd7D`b9OCrWLZp@4pvMRCZsS;R2W^?L?I|} z(NIVT1|&bv$Ai&mBq{`Akv3k62ZWGN;z~%(8qmZguJ(r;Da&=+!LUeV3EKKGsCC)M z0Ly8MdU-FwvU)3At-O~|SuRV=uWa?-3V&pL|d( zE;JtUHf<+18m=sEf4$)*)maJnO&tYq=Y^^Ifsftmn+j9~_4$+e=GDT9HSRl4#CxP0 I(ScLH0CquXtpET3 literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH`NyL>8d2?GP8gr|#RNW|gfEt@v|I^V$ZZ_4Te zH+RjBn7CBp*_oM#PdKo6`1rUOevW!zZ!vr6XTGi|wKhgJ=64KYC5`s}b_yR|Rwi+7 znyJ$w)4=oZ|9}6u4Mq?7BGS^*{_rJC6m%#!7o<63;@Ol6`&k@;&g`~+bqcC8{{L@1 zX(V#@jJ^N812@;FHxcB1K(U3PZ%BAqK&t}F@j)aVN| z3yc!l#JA1F;6vwxi4z6Wn|_wRlMj8xlw$nyz#5eR8&5A(M4G^D-eUgo zs&voIcjx7`wzBK>Y-4{hf#c$1Ny~$O{%Si-TlgZC+e^u1b+y~#1cs=i`5pQEe|~@O n*UD^YniSCS%y#ib7Y+vAsHiz%Q*YM*gN?z{)z4*}Q$iB}e<`1l diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/pressurizedtubeverticalelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/pressurizedtubeverticalelite.png index eceee137ced43f1ca142c28b660831d260935fdd..4e53d188e09f1cd1beda45189c537196670c90e3 100644 GIT binary patch literal 1105 zcmaJ=TSyd97#_=ND7vapvd_Hgl$#W4l_E zL=-(n5gYU(n)Fa%K15Lv5#4aX5`!qnm%@i0j0&U+*co%Jhqi$;=fd}W|K)t=T%u)f z<*Mpc6h&3WqDqp?72fbIC;tOIho;F?g~MswiaK#tbs*KGqYemSrrHIQP}O^nJco@G zwREeIO5=3AS=5jjP(4f_XWE2KQH{HDwyJeQ3_4(!VM+ANy$3WfbcsF~inDQBh8ZK; z=fKv!mXy}ltqD54YbR*TiA2DJSOq!ru;q$5iJsRL$=W++XfO}K-4gvfsdPL6WaK~) z3e@>EuC@Wx3jr=9H1NS4fM>Znh7}kt=w~^R6-1T;3m;9QIeMp!lLnaAb)Z=L6;ySl@p=?oh zpo)=`Lg;X@i-`=v$ju-d$ggxeC&HOlaXESO3F}l;nDLFl`c9fsSz$>JbN- zV7_e8D4mO3Qg4B)m(E2g$z@0~jCZ+zU3T$^ILKQrT9<4V%?~Z&c!yX!*mh-#Jd1}h zr74wr({XEb^!qqfK2f)+;y7B*7cSSHJzutRXlUr?T+PPuPhX?U^5f+f?wtI{Kbo7H zt9nrut*CkW?3wRLbD>bE0N1Y#kM*zaf1l6iK|Z~qz5m0^)C0RU{jRNjqP3@!0EMx*^$J=*~;OopQ{%7r>_V&02%!M|DU{IWx^e>%*@RA9dQ5FWjI?;h&sWHY$oSm zO9KO+2+`vNIl=sYeTFPU@tOJT=(5o$AU+r93Q|88u%kQR@87?;UB|*gmWBWR{i9Mz z`2GTloVB$zQ6-b6rY7!0_rc3y{rZL#tm#qkyFLz|o^e ziE5IirKSC+N_zlby^at3`SXW5?Eyp4(e?lx5+Qm#BPW=@Z_bisD0OwpK0000vEQZo9eT>OyO>uIWQUvol8>Z01Ze$9A;n zo?%Zu^q@o!A=FbrQuNS6bk*{q8+7rZhk_IelOTu)?ToqFL)*ZabK(2G|8l-F)Y9Bo zyl%@nilU0+O;VD~8{AQ}mi+hi?VlmjX57$$TTvIz$QGn_t0)aYT$j6H63S}-p(n78 zqVg)VR0r-z>=6~D`(+p7cXX4mDXK2)n6lCfF-XI1%?Qz7@7$$I9oGqp(M7 z8n9sNKyykN=v4%j4(|eWjz|P_h-KjD2Mt?vLiCcZNY?H#LxUvqi@c?{($*#&2mgvLuZ?gaZ literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH_i<&KMiE&~Iju&0Y-NW|gfEt@v|I^V!ja@6+W z8+#}I2}>oOotb&~gaeC*kB^Jt zI5*9F5qO}<|MCC-|4(v)G z?o|yS7tn zrirPkyRhQN&IuDI3Z^&xRR7YiRmupo_Uq{kkqKAiEULa}1p02;vSrKvkWBsutFM1- zw6Fgcu+mn+=$709XC;^Z^d~IEf8W+_;&IiF{-Ap3qK3qWFvEM_7^?RA diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductoradvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductoradvanced.png index 892815da8338df408146ae15ed902ea4d9e85e48..cc5ae1ab00886162e0852931de2f7d5fa489da35 100644 GIT binary patch delta 1441 zcmZ{jc{tR09LEP~T3SbJVl6|hXfgAfF_(J=6FuodqRBObA*PIR>0~&)v60iUP?|>l? z@BkdC4~Y)F?CfmrL=C6=Qc3(nGkUY+B;6o zsCa#vbyA^tontMXVfiTD+ou7REwEHIkzO3&&a`wIcON$0ae6ZJkyj z*2|EvtvB9ZO>PmO*wgv6_2RR5x_9F|1HFS|t zyB|=$war&MT_Nd;o6M<1?>$)0BbwUbZu)(eF1F*EzH{9;TgoM7RF{|7|43LwiSo3`X!78ACB%)F z+SfHPiGiYUy6&JAuO~}b$w3yOUlk^iWcX&zbJuug$(Mfg5 zNt9_i-jHn_E$W;P(fj2st-SVn_&T^`pzW|$D7Zz`^D=@9GyF--i-)F@+7UTQ>bsTZ z_i6l@Ct`8hQ8U(&o6vGaeV#yWlE>PT;rHB=RtO6pq=WP1ow2rcISqz!#HC*i zxgMPtza1WHdVN=W*|S+Z*n5N5DG9jx?zeTUUTgD8xlqA7$F5Ok%2z) zL!BEsusX52x>v_DTQ-Thf}5J*_o?;v2-|*7iQ_UOjq#Q04YAMmqf=a8iN!Anh((5q z7q;M~AA6=VxOrNY>J`1_82|n3hK#?A$XRfQ*^ZlICJ3@BAx|715|%U1;YoRQRq3%L zmRQL@N4ufyFNEI+p3pBb);Yj&kcSV3ra~z+;lb_hoCBo7coK_0!shd^#5LIF8?yvasEub?+Bx~=CUa)+k+9;ZCSNwK_ zy`>QjH0UiH%zhM?6<6K`HhSZ7BcfG7VJRfPGyP6lfV$Ps*^P?@(#u1P3Qcu416IKa zOi&9rrA@FFwI}zn#+xf%!gaS;@@j3K=y}t|VpLR9N%z+YAPU>sQL#0?+T>j$7_c0PXomnceY?SYRB3|7N+YK8zl| s))dBkvuO+eBHNwf|7{(%aWp{&qzX0M{H@5vmCYA`u8Y2!iI@Ey>iJNHQUy@F)TvVQqo}&Ec9? z7(o;Y);1uR=@H=RWlO}tw>L(89`Mid-z5%tAiYJaRTs!p#+N zgyXH(0$&~E+)PZgWplyh9*+cDJkQH5atNAdk}Sl-BmsyOAPI?3XE0dbgvp zs;Z#JQLe$I(S$-%b4wL%782V~W@Zu!V%9$aB43XIh{zYTOh<8#nw|K^?mk3Im?!*R!`ZZz9{-gyzb@e6_Po%VI37kSBa^0OXYk%WzpE1 z@!y@Fohr^%Zy2+kD}{4q{VL%FnXHwqjpcPC%Zbl?hW*1MYPgZI6!8pucQe?T5bPXt zgo>D-rNb*xJFM-nYMhOQ+WC&*%_3|@j-EYPo6pb}uZBeAHnI-CYVq19Xc7uH52@3h zOs-!H*Uh568R{NsvK(rQFo53TQ4ifA0iD&8Lw>^Gk!)!_criks){lY1&nOo*FoTUeE!T3G= z!n^spZmY9PUN0>qMv3FOxNwI9fi?=3D}<`jTDugug*6)N?QrGC-#4`?J(cItdrq;x zMa%n0=h`32Q}6bKm)_89rNd4#P=tqg1AR}fKRvXNW1X$gh>vwG30jS-q|)!?cOpD( zoF02MKjC+v_i=qleS6|XfE8f@Vhqk=o_n&t0219*Xus#=k_Kd&K zHJO*i>=Ri2$y}-lPb|PpSdu6I>8i~HVB4Kv0|By~2!LO-Hx5U^!XMn3N a5h6g4{le$L+ksKQcG;5biA997-2VaJXq&MB diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorbasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorbasic.png index 9d94375271634d1ae0ef9eb5441d41dff4a501e8..f23015a0dbf5f1609d9c62bc8fb5de1b0be660f9 100644 GIT binary patch delta 1452 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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorelite.png index ca3d14994c25b07fbf1f7c492efb9a3f45c44a21..644afed9ea522974ed3f251a128a8f5cb431f823 100644 GIT binary patch delta 1466 zcmZ{kc{tR09Dv7>)bccp!V{W^ZHqC#In5ZxjIr)<A?X!9EXPkPj*x#yif=f3XX!4uqX-u0A^Sm#*9oteow*xNF;)S z1T>*B!53_8@s=Us5xyaGe@lvyruYXI5Wv8HVR8S*=3JCyc%jKyEEH^m?+7_0#brwI*@aP(*58KLyZVE>SauL6cx@P!p~|IOwgq{!@{Mwv_yNSbR& zAvwjoS>V_ODLJe0$BObs+@l(Td#pS?4%|*og@TiX*W@+wFWA3$K6kj@B#kY5>E*-m z2|><*xD}yJ>m1KQem}t7Ej>b))4Qo7aH)FOuM{<3UE3ZJy-OI2y1Ah`Qxof#=l@A$ zi2CR=w$Qn~AQHtli`X31y8`BobO)>3t=ml%s6wE&d~h(^!|A2ROBkTPrQ&5EgqPrnWX7g(%pC5)U;aF-F2n*@f=9ej(YF- zh%ofe$wTR7Egwc*vLE|YG36#?U&aR#>;hsV=7g2buL`F4my$PWz!E#Ho};@*7E;ud zoFKB0js{jtN>BdKF4gE{8io38l4FqJ+s5wW5a zFlB0YW6!z_tSf(B$h9$_()5TniP7WuRj9{~KPmrIXkvV&gHzFr%I@w^W=wAl4&>+y(rx!gl3@*d~<%3m>ACr~H&bc}d=^`NA3g=k^%L zG9VDDXRUi{>@|f!%)$g7)#Z9W1r&6TD=^$2L=!i0&x*IUN}{>8leu2)Ql0kImiM`z z%PQm2b&u8KQ%pr(td?e6S5)74+0t9<>8kLIYCmoiF>;FCJGWwbh`2j_h|NTBvNRGy zR{q$%Hc0c)j=wccd%FB_u%rJ&KQAzMs6TS$&@wo*)3eG+EA^71Wi|U<_e6`}b$u@@ zV4QEcHi0w>=ZrqmmcFK#A~}mt+=B3F(*m1tYezdpZ+c9uN`!>4iyV;icp_5||!QgA{VoJ{EQnJ`|2F-505 zSeMo@_LqgUj_5wM`{)pu_$tb(Ziz~D(@zRypIK}vqWZ9k8bn!M4er55jqi618rk$f zwyQ&1S-)zRPwQ9fvsv4kDtjtQ9krah95uRO75{YY3Xzj&^nO++HD-MrtaYo4Epa0L zy8E51w3?%OAaLNMLG#& z|3Y^02 aO2~lj5K&?34adnK@v}6eQp(9^lm7(UeT-TF delta 1514 zcmZ{kdpy$%7{(W4r9P~5+)qXwmm2n)Hrq5ZHVr#PMCRl=j57|KTP_nt5hcp~(h-Gn zEjsCt)G%YMTt_H!EH1b_n&I3%KKLvfoE7HvR8lMW*Q0CN}sh-j=npie-e3=jkYhCtFcRfmN# z{-98BWIra$)z6(qHp8oLU3BSm58PK)pY$U(HBijMN#6uXBwsYr1GTTGf)1pg}dXP0Mm*(`7u_S*c4e>FeOif5=CVg z=*L9W-*v1Y9C}c!8nujK80Xky$LL|vdpYg-;U5-9d{(o@9*S2`UK+`m|D|$#mS4eN zTMv7q8P9gFQV85*QBs&p&uZN{oD&{sd>J@C8xMnmz|kNmNbD$RJ80XN?TCC^l1)fR zU12i3JsB70ih1X98DFwCnB(Q+BL&|cr|?}20*ie{OUXJDo=I&Tj@{!u_S|Hv9K2od zSkK0?Usk7!*I;UvG<@qb8wLVLzjK&-@+7*@#@;@?u(Pdytv&hvnK0iC(Y@L}=4(WAZ3z$G-z0h_+iQI0 z-^Hh+=6=fL29-xkaSqJ>4#p|YiL}+=X@?go_@3Qp3)VFuw6nwa+zl5dWEUV}&KBL? zH_&LfM@OJ|cJ?Y;9db9Lcv>5DUfs~Japj{BA9;@T?}MMljS@RG^Z9VN6Bdi!=MWKj zNPGkxbHGWM(Ih1iOBQ-N887jUO4m`HyYAnJd>tt}$#&7GLDw(HgXyhi0tU~5uj9Kd z^Tja6;JZP8RpUUczhATa2uQZX|#ytx@=Uc??6I%A$|Jiv`_9v3thMcUc* zCY?H6b}fpEAJmrj5=$R=V<)CYSy;1O9PFDLDi>$CK4|Mb>m{@4&8kJMM08u>(%Y{u zrK_9L>_cjF(OB&1UL&oC;d3^_H%CT`CQHoVaS1Z7gQkYBk3U~2%Piu}_k+Xco2I&# zWNI^I+}OU^rM$ z%im)=F-5$&!6_~?u5AZLLv21Udlfo-9#LH3SjcUisHJE0zOwZ4JQ*9Zw*0;;BI**; zR6Wh1i9&Oz_O|ATdq)tCMCnbj9W5((Pn@W zdmR~|wA&&;fWsKvlWKIRmKU_58tZW&R&L5-?~8?BS}xN6wz6fwU;(<=e10OT>ydHw zw13U%+wyEZ@U&Z!yNRDoHy0B~AM2omU*;+(y=86Q$lkQ7ED)~11kM+I=YpBMkp}OY zk%sIj>YT||oEhe-wneI&DHXXv=}Ze%dnW=k WfZW*4ywX|@+8Q$PSF>`0OU!@c$)+X% diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorultimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorultimate.png index 6e77a0a1163f75f7a538faaa12a9cd213c7341c1..c582a0f19d9c16ebb16ef7ebc7865771104d528d 100644 GIT binary patch delta 1454 zcmZvbdpOez7{|B66CtJ)o?PY<%5AgzJj#Ydktj~CmCHyN7L#p1LMNAsZj!k~E?b>k zLagIbR%%$e#XihtsSF4AZez9 zE#WwIP>}0%ZnvFE+oXSgXzcrekjv?b(3I`qEEnk3omZGp#hqD>N*eWV*$K(kV+om9 zS7&mPlngiPu)eTRS8iX}-V=(-2DF;;7d6m^$Xnal{- zDB*!OCijay{SGhF_smJYNf?|yc|@$5IhM|T$kT48kJlHc1%4o$UMTc>z3Xx{uL0kc zv{D-OY+ASkJ<$|2q^1vfMLJ6?)1a>ucOU%1U6&~m#AmJ;w`rby3a}RXJD$&;o+~U( zBEK$;n$@2f7k&9S^MRmG#_zvL`ux;>iEiZmvck8X!ot)V`Zubt5cOstv6rSQxbazJ zjb?m@Zv{1-B^-(8ENv0mKGB4X@U>1d7F)P;O-+nZ`oWdm<{G$QuR4$$+az5vpyzmN zYje6)CW8!bt||i#rlt%WPPrvz1LqBHaUs_$) zhx2G-Rb@dzWtJXBy!dzBo;q4joRT=rbBnI4g6zks)HA^pSWp|IiMg&fZ&z8=^|q0{ zub>EDa9w0MU&~FNHFZ+q@O?9Y+c8&FJ%VeME$cT+q5*`T)qdETM>r$Gf=->E6Rh4t z@Wo!`_P4&BS$-UL>q4$s)hE*!`<|oK*>>k6C-C=@e^<-JiWctmEl!lAES?Fe^}Vl` z^G7~vG*s@Qb1LE6Sem}T=8aR@*&<{0S`*^7q#h%*Pj8E?rQ)OBsaFhU`1Yt&v5tSmW7N%d3Om8rX%F7J@5z@_NaRS_lcu1_t%{d_f1ts5wAZ+VCJ0CniU1I6#NYjkGA>r{ z+G1;_(fEv;A4y&3xsM6r?9)Yd&p>@w)AUX26kJoB{EY{kRjAK9aC~NjD0Ox-4`B}s zkG~qepX%UdB~EPkSQiHjvUm2LQ$U+)lDir5a*1Wrvk>U&-<^@n+aiy=tk><1R|7ed z)3LFf;?8X#aG_TQfip^C9VxMQaj)2PZai>hZGoaeg_yu4Ir%Tbnj|WX<{b*6VU&J` zI)z))tlHD3ypPaWjDOkH**869@Lmj7y13`(4j2mi;Q$#0EL{UhfjmZWUlH1UgCI#c M*g4xiBA&YV56hU9p8x;= delta 1506 zcmZ{kXVck{II-DbZeO+J|JLU3T@Vq1C*x>zA_QV-M3;HI zH=az#ITKv45CsD1G&CwPX>)jlTUY`sIW9at=^uR99R8~o_kY@aoIZssfpwSy0Ic1Y zN)9-n94gunYe_Rb5}A^62R_&&K0`1TmD^L+qfr~qBcp8u1XBmv>DTu%C>e`U)^MK{ z2$X-(t<~1B?9E3BnV;EN5A!USLvhQE{EKGEl4)oDyNB!$-S885jG+P%+0Ce9uh4i5 z?@68f*j&hQ;i2K&Znx{I7cq?TEA;&4^tYY^ilIQsv0m2Yi-~|{0dME&P1eouN za~v){S1Jdjm+X#T&1Dx}cQa>g9A7IKJaOX05d*TB{=fHL00LOxWhuTxIpgu5xsLXXw2UFRc6C=){ zni)ZU?z3P})>V~Z&{J%{zouTMmBB^obsB#Tr5l*QWuH%A&>a?^c!`AA3?^|n| zbvn^he~ZY<(wL)+sy|)0<~H;31^snQ{a*J;FHOl=nd^s>*_X1jr<7dhS9MwD(GbJL zQWmu;K$8&bnx`Zwv~0eQ@OUM!&T4pPV3GKIke|fN$bRXFa-v{-1UW%YVow-UzglyV zYTFRpBa<%W3c~5rfgrLCf)kJU2&1m zcZsewcBp49F~nh2KX@5!dujRIygjx*Nv>NzdcieAVa-nkk(Upmviu253yhD zp;ZA)(*e@HV%jHwkmt$N(!1@c(EA_^z-!m&)G@E{$ZDFU2AGmwy z%!1)B2LjZ;_Ko12}nV=`-f$mnRonr%}iBLzgcN$g$uQX?F1)GZsV1eFz5R@9_ b--Ve2E0v2?CPD`%V6J>={?zM~-Mqg5k#e45 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorverticaladvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorverticaladvanced.png index 04cb6f017e5935c734d0cd258102ad8b0c445583..b2e007636be7fc7c4084a5143b5c1a27f399081b 100644 GIT binary patch literal 1126 zcmaJ=TWHi+7)}vfEf&NF#Vd!ninqySCgV)vWNV$YcEr>=j?P$$m?o#4*hx+{IkPiU zL`p@(3!)+_MYQXRH&lG^Md}TGQBg!e5d~3Hd{C%(p&+d5N$pf0oDH0u3*Yzsm-C%% z%}q;ds;5*_6jhUGRFY&K=Z`U?$$w40^$nROODZQ&x7Y(}h4-hL#M8JYr14S!mds0!Rhjb;f_K#T_3_)!N|$4i_jaXc9QXcEme+NGq@FdU2QWIBtn zBe86uP+$rn2Du$9FNz||1=(OQKo9}1WMi!uu)UdO1qFJ#YdY9OHt-d-Hk8LQO)~vn zg5`|J+TL)RNW<8o=CC}&`6ZQss`~#>%Njv@I0=8``%7UjRdOJkgdWPfI=Q&^nSLlo zin~z5$W0-XD|fLui!k!C$N}-V-?a#slQwMw6}-7a995MPwud!ahY3Zdi3($yh7{(N z2+#4Mh@b>{zCIEaBT*$JDDiMKDuxuH%vF${x1f#7T;m5X60P?ih9FbqjE06id>c?!}^!|(`A>Bh=cs)h;_+k#Qe}Ej(3T*b31PKl4tQK zq12^{Pxh_suer{RzwE`T8vpKjHnq>FUiKw-ZCdX6;l1I~>F|;PCht8B)AcWt!u~sN8oJ%j|F(|xcGapM=htms g@$&1H2kGuA>b2T)WbeKHQ~t|O)Hf;TmaOmj2Bk!QWdHyG literal 519 zcmV+i0{H!jP)0hCEZ zK~z}7?N_}@#6S?9{gKncVi69TfYnI~OD*CH*h?z$83dbq1`FY^&KsojDa6M5u2*t* zoFHcvlB`A8WPgI$TMt_{=L`&wj_b)fF@5tdr)(Gp;GA0@h7bZx z`vnFt#>OG^J7eHUYh6I~n(KFi8MR?8SM@;t`c`2< z=NUbI&ja267dUD{Ll1O$7Z5@W3~ZbM^}oRMEmjF2M0*~vwjaV=pr|c#w$%Ut002ov JPDHLkV1kll)+GP{ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorverticalbasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorverticalbasic.png index 6d125d44d1fe08a2d937a2925e1bf13c8554a0e2..11e70b3b42964cd80d6d2dcc8d37e3fe6fd1d406 100644 GIT binary patch literal 1112 zcmaJ=TWkzb7@jCX(?%j9O329&(dh2XY`5Lcw5xV!cG=WcZI`YRI-NP~PTH9>X3pB( zx+Fy65)rhG2ck^`FM#4$^#N1Arfb*TOO=Q&YVlW@B1(3I|m!; zR}~k|FQh1{II>!bk-5kjGp3XOhScVFWGca-1a3raI4xU{3aF?Rf`~4+!x)s+?6&)` zhN23VYVib4MArxk(%rIyac6XsuqmphHeB#;*Ff($%5xDqXt*)MNxAphGN!jNWP3LdH*z>k4G;95XZ+hu{uB{X3~dv;m07 zf}p}(=~B4zD&XVYTm@g{@s*1pwxH$Dh0m)u!Bz9;63EMCNHUCbxqn@D?uas;|q_uC+|@^%M zx1ZR#E$`1>69$);j(r{4YMz{Zo{o+UU*-KObwZ3v! T<14j)hx67Wp?c|Jux0Nr>O^;I literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH_a=6?3=0tN;~El(H6kch*{TQ+U_b-sbc#ME@+ zPM+dtXA)hWN&A0pU;RAdS6d?xJapf}5%VwSnw!Yi&dyGaXZLrNav!ZxYhz?%e#am- z$@Bz=!pD0Ff{QOO{{R19J<1pen1SH1e2wFoBQ2r)Hx)lTKgn(}Tekbg1aD^M`5YG? zw@fkl@czF2qRX6mwu=KD5-mSW`&9Jc{r&wbm~?bPzA7#(ak{YW!i9h-AwQ3Q6rZzp z?XqJBfS};x$>=$+e*XOFewy)5;DHk-Jc{nAoovr2WvsF^mSSZoKKSbD>cB@QYJzQS zc=Gl3avG{QuzLP=68V~$nfc$dh@omu;4QfypP!%4s7{!m?)1gNeZBMt#-uBYrW?Pg za$B76;5X}wLZ`R87;Je1WSCA=&P&}Qvw(?#LE=g3bkm0`!hiwE;OXk;vd$@?2>{&0 BtwI0* diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorverticalelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorverticalelite.png index 434aeaf9a80906a1f37fafae0fe6af370e565284..ac5d40a3c4819013bc1843914fdaeb5cd690af08 100644 GIT binary patch literal 1123 zcmaJ=TSyd97@jiiLJD2zVlUHJQsK^J+lw>pChpFf3y#^k>}P24uCfeH;V` zBCk}7Cs0DF5frG?vV)=1x{28Y5vWL;veE_+*#ufNBS?K1c|ehx8l)P$5-XWu(5h8; zS)jhFHm-EFDZENmY$pS00So8=$z)pJZ`eXQNX_aBce?mM^SEq9VkfQOn;Z4 zn{%>;ooN$p7?YMwhND@hq%2U9{twmlIkb&p;7`8)6t?4?CSYQ~h8>oIFRr=731tdl z3&;psaR~QkyI9u>5wu&ONruBt*ZkzB2F*}m%HBN7kt88%*hn@M5EX+IR-rXb6+98Q zhjaTX{T|WHaS?y0isi+SFXZ)vL_S;<&T>Vlbm+i9S+4qr8_LOb?4X-CvIs2g08pze zsFSm03tH}6%5&;vxN7cP_?%n@C&M_G``2Y>kFbNB<(zf#X3qS;z>c@DwTCOW=i_HF z6%{Mv>F4KnjTAm&S00*Zm(KN^Dj1Kfs!kS`J}zSCzdyS;k>~3_DTXhUZanI-?L@OTLafOi8n)eCklo>96U3*zHi&>Yscy1 z@83;No*x}e9OmT+ gA5PtSF!W`4lDIo@bY0!HGRt}P(MYX$JCr>33vW_-?EnA( literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH_aJuks1gn@z4+SA1`B;s)LmQ9;}oo`?@JFb-?ezS(`K^oW3=IX3{)yh6w{XV!BL)W&4#*yG zTE*sS8f)?UrM8b@m+XiC|LYf-8XFr6^ChXN?WywMYy7=k@9@nz5l18>a@xbBB!0Mb z$f++`(pdlh-^4k77ryqmF}glIu=#q32K&E%f4j8~9C8Yk7xGf?c`FH5y+WSkwTFkA{=k Vk#a%PVt^sb;OXk;vd$@?2>=@7w}Jow diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorverticalultimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/thermodynamicconductorverticalultimate.png index e0e5beb74c631baf05ef9c8335469bd80d532d4a..c2f5b3d64a72c551f746c6659462dd691cc944ba 100644 GIT binary patch literal 1106 zcmaJ=TSyd97@jgR#Iho#B5E4xBDp&=>#pkzZtCu+E$o=BTW%rJICFFdn>pjm(H$)! z)E8fRkf4VMR17M}Ck@LaC@O@K9_)hMq3EHYq6<_$bjDokp>5#Ix$u48e>vajtF5VC znYA&CAc&RWJwg=E+0Iz89RClrH@wBu22>eGb+8#FB@+-83Ty&oSd&^n6i7;E+Y~4z zh>Y!OERN!0gqNY_mK==R)(p%hh|)6KkmOc?$R^OD>H+G*#C3{Pl>k-m6B*G6frPrJ z%LH{@H8HuXRpu0`Y&ThI^H@LwNFr_Rh;H$AfST9k@!C12DRLfyS_9PYq~c;N8Gvb_K&u~1$k_#V&qnS!G9~G(=V&PqYN+4wL zG@VQ)-N_<1G+Stv<2ah}&>oKqBV1OejwIWqTlpyk0a&uB8c2mY=_pD~upI>`oayfp zG-FX#w-(xj8%EobL9=egDJcaM#s5P!Z4qsuDEO1_KZUJWrvd0Fuwc6>k3sV>$gAc9r`8e}Nsbj?rhtXFjfCar>bjwteB-9nNsgRl^wu!>t%72fCP zDvE+3*6$TOEL-WX2(m#TSnOkqLq37^22)%C%IzA^QHrbl;d;_?9Xn_Sjw}FE?Ep%Z z2{m%QY+g;9ORy@f-U3%ip9_r-~^DE&FGxuv7y z%8t_P(9ova>&@v;TG#N~cdPnNev6!b*LSBa^8Dve!6E8gfA#0NybGp%w_)JwNPhXy zhnzDF1z&G9X0AJ!Jm0r<+0xO6$|W(HyRpP;v$wlv2hUEt8S5$RdH?n4{ob25<0l&F zu}4cbXB9R)xbvMJpIke7Zbm?*0V=(sg_Q literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH`_aMqS~Rt5$}V^0^ykch*{TQ+U_b-sbc#ME@+ zPM)7XfA*aCv+}F-!&mzI@0>dT1Pip^aZaDVaUGj$ZBmj_*U#;FcbyF9cP2I*Y_M)< z4dK<&isE?@*r4OKk@?^M|NdLjfZ&khnIkRX{3jI)o}V*iN^*48=H;nTa_JWix^!TF z{eKTX^%qrciyIadJvg;mcFJ_-`v3o2MH3PiuHxrhD(v>8T z7Yq0G(jOR;t}L2v402q;gWs$#3Z35WVzA{6kYQT*Tg diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/universalcableadvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/universalcableadvanced.png index d45989bf93a59497f9f7a694e358a1020ae3dae5..ec69ef7845d941f4fb904fa06fd64546136f2950 100644 GIT binary patch delta 1331 zcmZ1{uz`QV9Ytdc1#?S1LsLr&BNH73BLhP-eFIB-fFgRC znJHFKz0SDwPA+0fi7|CDH#apkGBq@`Faug(W@%<_;Am;!Y-a3YW^Q3(siaU`5|o-| zm6D%anwy$e0<$0mXaQ6&P#<=^lZ}|2>gTChY+ztuQSfwe45_&FX7*`+;XsjN)|WHA z7hVZU?9zCc*yUEEz%9&m^@v2cl(}ASePgt6?9Kq;@GdFgUcJ(V+`@M^1c+zcnULU^ z$q;ye{i&jfhx^8*mkSe?#1-T{WqZwYxID~!`}bv+@6Y*s)^d6IjsT66WW(Ke&uy`r ze6rqPZMcZ)`s>Q4jV@Q+V`EleV1l70Mgay0iaf<~tz6r;k8Qh(s!r7EQuTXhD6%;) zuz=8pIY4EVl8yp1KGjcLyuM1K`tJVsLKm5LUHfcityb;U6*NIs|0QGKC*_3;Bg^M~ z-6LcJH2y@)R*BED3SU~ymVNC%X}aW{&ecs{Zn15dB^5Du$;Qon>}%)n^#<~ZM~gRX zikZe3v@qgSbH-n(dF9V9DDZY!?TecHU~jbT)~|XSouVi799?oRBYey6`o7IIGv7_v zDXsgzDvyz0sW$!F>Psbm#eTl@slQ)wd-3f)hVAoAJt8+;zE^Sd;pCP5hxfna;r$l3 zuRtww$*-9k8`WkUtld+#&_$$v&&x1v#>|{Mk&&i?fB*YUmcZDAwOfBjRA*&ki@xajf33r@SH zdmeFXx3+%OCujZS^Y!vFkB$6Vi~hBgtS{&eT$f_7Ab4Nrq))dx)%!2s4`z*9fB5OT z%*?+16|Z!3*73FfJS9B$`nmh1`OkD@l6K}MsYPn=YM+c}ZGKUBbFpA~?BN)rpHCxi zpSV(gV`<6CXXb926A%14x}}awS6=bA^^@{UrY{P?D^GMq8ENw^O|AK`L;u0b+mAI0 z&U|xcdwfZBpO5eYnNm*O|EJ#MMOFGHAIqwnS+V-sj*GKDke;ppm0 zqi3FfFMU!t8+Ghn_tnOfEst|!vYwv4;+rzh_wxFqA5ItBpBDM}^n0a^)B07`pG$IX zKDoeiJjrW>@sLSO0=0?WVQ^hSGb*35j8Zs}Mo19m_ zc7FefP2T0}SGmuc5>sFD!?JRp^|$5w)};8nWe;38d8%Fhn%@`LvTrnhI(VWb=FC?S z3NWu2z%yj`O@Br<2E(3ttD-O6(PsbxPgg&ebxsLQ0GqNysQ>@~ delta 1458 zcmZ{jc{tPw7{`YkvGX`KSy#CV)oA87W0;u`V@zgiT$?jT%%BYDY&?bNkZ~(vvE$r%c5DCZeLjD^@AG}Xe|>(Jt&z(d(*ytwBkXYijX@#N zFbyOEK*JGOIDpVc05|}FLn7+7l||eP0HP(z2#Ev$j3EG68e$PhBMcHxFd|x5V$mpq zmPX{IATk+83J4AJ3ZVFq2qs#>&2buyiu;-czL(7o5v95zEe!BjES`X{#C|OxU@<5R z5f7N-F<1+fmPTlpy^k-B8b}Ghl_?or+UN#%K2M=;)wIm=Au@Vx&{A}c# zg`(a-RR@L6X`1fMiN_KP#wrPlSvq9tv}60}-u9a9((Q?dz57o>R2~0xNKj$(^B%Z1vXQ&eelp)a~^X)w|MD7Ku3EC^gT(jtg5VTdU~-W zn#UdTMdd>$Kwsnjrj40KUZhu|SLAZ60eOYL9R!75f$aSs2{QZ`PBC7EpN)Qn_$U~-L*$CzCNY&+t(6`7CR%SzLYDTIn z<4|FLu(bLnLwX3NJy_;qL&t%ddZh*_M-r99%peM8lzNx-3nwv{nYopZ3l6>A;)k2p zkp$32ET)#)%*f8^JT-7Lt5md1V5((Tn^nPoLR#2x%nuwNbQer@|#!-=Cwjp^?MpU;KY zzf(*}9$(X@z&T`4{d$;jeqRV9aO!yM2f``4oDaulctm|IxC+|W$@~mbWr`KE`IN+R z++0bjm~3k3pC`3EtWxT8F)aw&SwNM;wD(2biY-3Eg8MU41%GexKz7JVTI5mO7tXLw zK<@Gn{>vaUb092@H9WxGI?XGJq>C?S<&MgBgoQ01$$y;W_GRIDMPj9&AlK=x_7ZG6{HS6=)a4wKIyCVZra$1%oa zgZ(_&c`fDTw3xQxXR3rn7ruw9>x}xGeszy}a>aqxx7KpKp#;u&cl&*>)>%%q;wFHQ z#${iF2VQjN|5Du-v8BrFkN6d}Zc}@aW-1n+?me$SSi3R5dbv%dXDOzz&D2D|&|F9X z52%U1E^F2K$?f(ogJ)ACwC|$*7b)ze-fFgRC znJHFKy-qmvPA+6hjWKmHH#apkGBq@`Faw%zW@%<_;Am;!Y-a3YW^Q3(siaU`5|o-| zm6D%anwy$e0y94aXg*XgP#<=^lZ}|2>T{p1{>{L^!tCkd7*cWT&Fr)O!j2Nh?&peo z2^?-W3t(aq6%a~x5s4D&xmdCJSaZ1OWBCOiTNL9w4m7h1?|tbgq<7Ec;i69VMVuUL z-Hi!Ln_7gt8k0mc;SvW5(Uv z?^3Vi^jOsO=C#j}v9Y33`ARGdi~?}P)WE<2Mj8ICI#K?by1Ko$|L=e0qBi-4DR=wf z!r!W%UANzVteD_9BZ+~<0fbs2K07XA|1dB5>%0%g->zS^y65)$s^>yd_q8qT{uJ;? zwrH|})v-8qwAgu+?62?9Iqg)pTg|WbNc=x~t)a^Dd8F#| zV{gUpu5aOCQeZH;7UlDU%i!0c?9Z=`zmW(ludv#o&G`4URK(jS8@=@$q-5n5vuI8e zX-JCM#t^jd%}Sm}SF?q(C$PEZmhauMN8iP-d#%g4i+@gCpRm3*wc_F9hWfw%-iX~z z+#9WWygu;$k#*-6`0g~ee`t4Sky-NnU1II?e_LfmF)hg!I=Sn-zUeOcIeTVCz6~>5 z_cP%_b@rc=FS8G4mA$mSnBu&|zt2+t^ew@UE9M^)|0^0)clgTcSFe@381qtY^L6~K z&bhs1npD8Q)?4;E9G9o-%Rcf}Co$jrY_=xISh%b6(4i+EAKt@%if$ z3JgpNkFzGc_#L_D!Ml7h+4CQRm%DuT4_-H+-mdKI;Vst0NO1vB>(^b delta 1443 zcmZ{jdpOez7{@1yNLFqsm!TYr?6=wMH?7%bSWHBXB62AbVy+c)Nso#qGACtck$Z$( zN+LBQ*HCgPo*tK(TpP_QI?i)C{dIbu?_clpem>v7-gE^HH1)kU0KiPa{QwGsM4${| z2snT;hJ(fc+z1X}0XP-`uUJ)+IDsIU5J8YghLb@w0Fcoj+ycZPF_uJtK*WF~qz)`H z;5?Ozr3BJLPX&7UP%Lmd>zn<4e%{!hti^BG^xzFXu9ip(5P?COpe#`)>wXjgM3YHG zA_4>~P-r-kqywXe9`QMi^$zk13-AdH{m<{c?*GZ6e#fRGB#Dg9)n}(55UEs(1;HtD zXy$HvkRnZq*WIzQjR4&YHOP9i|T*ev^FO=d;U6yLpH!5pLeT{J!#?6A5J&ZxDb#pmwS!27!eJ!9+xHI)9Xa^mT6J%JX=$MXZhU9-HZsQGUIxD41vck_kH z8fU%%77m7W@5;w!MusA%6@`h})*zeCVBnQ5@7ZLoY1NC2@I_nJUVrDp@HTBJqji+B z(fU(A43Y{mnf#}fllHg*ty?pQz=+U0mRWfb9FEIe!b}z8)ks3N%DdN2uDL~7UbdIr z9`q`6gRbSg$B4wPw`-(H`=aGe`b|WDVF&RhBg#z8s5ZycVsG=r=0Bt0D{~_5gUY$9 z_Z}6s?_wV8tIr+NELH1eR9I&9XmW(Eq9Ca}a(*C@>RzDa@CKK`6vZZgXj?c~ zQZzl6zI1Wz`1Y#AxGbC7QqA)+ebqwNhQ0Sy71D=k(WfKNdfjRKYqbRTww5v2|9Vn9 zJ1=qwuPX26X<0FUxP6t6;YkdNw>II`PE1vX&py>-6c?G@dSW+Cmpx`I-!)i$Uu<9Y zNZbAyokDjm8a5jUw6bDN)Ox7e+;CXd%?Zw_Cm5;~<7Rgy%h=GHX4J%3dHl5)WoOJk|7mSSM}+9r@Gk%N0*~yf(hTZBV?>6CU4wxQyi0M)c%6@x$#JNy?Mdzt&!mn zgpR;}m{-&=cjbKMc0oT*mk1}kCo_BJi=QbENstUtmU z>v-|Y^=vJ^-$cl?O^v#({|~2lDT?={6pT^1Vfc4Fn?~u?v@#_v@76Ob!As8zYZvXr zdL_F=K1m3rR9~VI$-GeiLIJFXb+?;;ebT;WH2^IV435fuY#5kvfFABRTPg@+*E499 z?d4y9GF`qVnZ0JK-)g4C{VG?Z>5-XBEl~rqeB3h|crqI$ppedd*W?u2<1s_0M*OjB zj_$a_j0TkICym7TaxO$B7E;)oQqsrf4{99XDM||uNbb&Tf0BmZx@F7%yyuI@F~%y) z77hMm)bib^+ONEUZx!}X)(*&e&w85v@yW!tb)1xiL!@hXZny>}7qUJSvYka4(IftE DQ231N diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/universalcableelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/universalcableelite.png index 4470d888db0ed47481d9caf14067de4ad32acba9..2b298f13c21e2cd09c1494fe61f5ed0cd693f552 100644 GIT binary patch literal 16106 zcmeI3d0Z3e8OH}@J#bYnt5RKK)YYw$NkYiANi+};kI3l)))j|j2$3WclK=t11GOHg zwTkWnDoQ=7t56qpJyuX!PnIfpfGDWdu8QtjFId5&GdW0j2~+#&{yF(fCVAfHeSYuz zexLW4e`Zz0jLH2y{5&8C>OUn+7KQ)LCBA)n;CF4?9Sr~Js}GAeLQp>+;_C(#Y#9PU zLWMde&J-t~E>vJz2BO3gQHEKo$7@57Xrft%$MtT4PGpJyeKp=pbY?#gV$7}c-Gjt}z?5{J9 zvWnPsWT;VLQ0q-*Ppp^<3)u39u9V5t0@wjObLTQUcop?FC?n z2qsdeQFqRqwX}0W?US(U1R&P9FxY@1_{508FwKVy2Mlra%b|wK5EI&oG+!9V7P16( z(j6k!nt+BJQ>v3Px@Z8|A~c+8f*SZ4u0%}82dOyMb<$BPgh`k|i9 z9feLcJI(@OFs8u_c(+gqzUR0qb{S<~`cizSC03~s$SRTQAVk%<)UitchaJEBNz+;1 zx$|Vb6A?$55Z{0B)qq&mJxc_4DRUaM#TQ3x@S0RheIA>Me_$4Iw}m>p!O(c}P-iz7 z>WG}FQ=24gTWdhEQxtLDS~D7rKVza2ZeU7wF`$1zK0T)6<}3f>=xOXHEPu7w&k@?J{>dcHm$0k7Go?rYfLCH39%3Hz{1? zd;l+n3jjiHQn<+Z0A30g0EFD6aFO!?yc8|~2)Rk&BIg5mDO>;$a+AVE&Ij;PxBwvJ zCWVWf58$P60YJ!23Kuyaz)Rr*fRLLME^eZc@0&`2b!D z7XXCZq;Qe*0lXA000_BB;Ueb)cqv=}5OR~kMa~ECQn&yhfZ<{ju3mFZwOdxteu_Q`MIJ{Pp)&vqC)~_emXBAE*b-a&7N9 zXtieIuClVShrhgU_F;Y6TJ$f&vEqAqwZ-@T6z1*`wA#%RvRpZyLB2P9WUU86eZ(Q> zZvJsa?z+i)BzdXjW9RpCs#dHVKKevLXr%AnOl5P;rbXMTS{J{pe>%Th_4m4jtbyaE zG6rW~YWl-Ji^iNt=<9*^!f<`o^tKUq-h`MYG>>>;G~f2hxKZwYs4(!a>H>P&rjO1S zk4lUQN*v^toLj}6lvmqx7cH`4_o3eL5knNe)y6KBHZ;w?^001y-)EcFCTIOL?f%I{ z@9uJM-%a5~z71h3+UH2WPkVl`;Z?4x&)Bb4)z^NLzwGJFo{8VA^u76_ic@{<^71mV zJhQgmuV`)Qt)cm~p_u2{Cvwi2zR%~+Z11t;)QZwxJ4V0C4!my^FZ_JZ+D6WB{mAj3 z)80LJc5V$TH}YNmVa4RDug&{vN+UzX1#PS&{L=92-jzfCTzI;4M~ip<+t`Dms%7CX zJqM4>8_lk|S99a^m96DvOYhZ`ysY*3%ySfL_<2#;w5i;lvz~9m{#|!+Sor{kn?{_eQ zp}FmK<(AkAZOy@|RlYX{{^nJ*?A6Lo#{Vqc?Di3N&et_wkI{>b2hz5t^gljm=32%Z zW^K{Qw)N^%@MjoX2jV<}{yL{fRL;D`>OlbT|>+uI0&t}g1Hm#+^zvRi~ zGxNUP-LBtWBJf@PFd$!cYs86gUO?^_h8;%-&8m7dN?u*`;}>gwCPyJAuvRWZ)ZtN7SQb@aK;ZB+{^x7n*a{clCTALlz^ z{Ilt|it`EzBg~6#TzD2KeS60JEiJz7hdHlT4rn=;bMf@~C9}7r4l)|@zLaMDw6QuV zFUPH%Z9^u?FN{n-OIWJ{*`R=%yizu{JvRD5lupyE4e$-1RE>l1AYCT700 zcduSMXPh#=a9TOuwU=@)T=y!@oO~#Ja$ET(W#j1f?CrFjL#zvixQ~STEVf<);@%8{ Z4mEDCY`U_%lz1C`O2`aZNzmM!{{SF$H5&i` delta 1566 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 literal 514 zcmV+d0{#7oP)Wa#4r$jjwA7rR?!9#gy<2e=qOTCa|-T2!v!e!1RQ}2a0Nt(lyaeoR|<+2 zB!u#zVTnB+L(*x2^>f7W1E1kq?~ibW{jCjOcJCq zj1>^6eCloqC_dZ%n)iTBd4H4u#f0`i;MWaRKF*ZABWDva-W#|E{!T0AWmzr{g3IU) zljCCGJRs7fHQ%k1Q*2D{f!nm*XSAzNpeWQ5x^DNrJiorH0D#8OVQ$Za{$6do&N?Ng z`26)ASbY;xI;EJ&v`WXsqF-nX*~cMGNO|TTf)2Mpn(Z&5<1Of+2Xq65@_Lda>=V;g z5s~Nl@9BXy0i*aFj0emEeHAePxD<2B>vBUCQ}Hcl&=|5Fpd8VdJ$l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0z*Q}aq-dQ%X3&2Z`kC5PMspv^9+MVV!(DQ-pixe8!!TV>*Q zi!n~~pn6kqyTt^jUVWfr^g)q}6xlE#UbL=}T{ezFc@tgu*wrSgr71=ix^K~uc7IZA#t9`)SB(mFQqRJ`8 z$;&inSQ*S$=xdNnt~ti_S7BoK1arsO>-#orOV-|Kb*ALd)ul<>He}2?ru|hixix>r zLP<5rB>p3v8;@_Dq0cJyYw3YFg>8R$^n)Jl*!Pn6czQ=ttGZ0Zf}j1h)>jK8j{Zoj k`|My-!BJcv|5Eb+!_kt;&cQ1pr*L9r$fU2sj9G~mOG+%8VteC#8gb-{n}fzkxny-FL2!LPu#GIh?cW|h@D2W16ETkC_548Fwg7;-t{EkK zOgg}Gz{UKeHxNQ8H3a!S8Y5l>n?FGi^$J28b&M-M@dLj8{nOz5fZHejUI~*Q@Qg1T WSZ)B8F|~{U0000 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/universalcableverticalelite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/universalcableverticalelite.png index 8e2050436ebf3ec502d82141a7a7ba74c2b7cf76..88c56690d782762053c061dced28d646c05c38a1 100644 GIT binary patch literal 1123 zcmaJ=TSyd97#>PQ#G=bnAv%qe8tq)xb$4fSt=!qIEyrwKOGKn`=I9PObH1q7yj@2zw`g!+27c( zc242qLV_UX#MX&%JQlfMK|cO(PPI+oVG)Y7peERf(y|4JH7e`?WK5U4Kpez`YozOY9zzZ z0%SGq_b6OdkPPrNSIq~#z7?dG<@^lGGn~)EastZ>EJsd16wYR;okCoUPUpg_5S2v8 z6c{F*PSfcs8d_Zp$MZbHdKs_RgCjh4pMhk@W7uU`1`*hbrI|>B2I(@&9WaGL6ju8C z2)a2#YuM9e!Uba-*iSHyjpE>s-hUF?i9QoBabUxgrQpVOmbs}+ zA#4E|K`Q}aPqvDUNr<4GgeDmdyHyL260W literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsRYH_qy}X)Pl!1ZK+0(@_B;s)LmQ9;}oo`?!&R`adw7b^Tfu+Mnz?1=A%9FNf!&Y^&Q9*vE80`*Xg0LA&-GX0s97l zpam$;|6i{g#Ix5W+L-ZE}kG-Cnth1dBtsdagIddkeq%+6_PYUkXJ%(t&++h)5!+v1j- z!UT?sk7f48xO=v^PZPTO&iUHmAJ25+KD#e&SQ2x-? ey5DAIVPLrJRDM6dSyBiX!VI3SelF{r5}E+X{IGlg diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/universalcableverticalultimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/universalcableverticalultimate.png index 2f43142347ffb24ced7535c15e493bf496797513..77046403107e2e63ade53cb63fbe9fe713c17920 100644 GIT binary patch literal 1110 zcmaJ=NlX(_7#?k+#Na|=6x72wO^jPRGX>htK*ga`uxhcE%Ayj9fez_o$#AtU--867>yG@L-+f&0F$)-@m-?9gWu2 zE?%^15kU}(!`s9do(t_!umJxXk}aR{RDwcHs2;YXlw<-zP+%J%!d}#ucIlQgryv4LHdOI1}LoJR#k-; z7^ak|<~U!O$g*t6$CY}y8m~W89TGSp!5@s{4Ub zV?vFbDw|jH=i`LWUL zcsu=K^x}={+u4TZ)6YNFwoI(Nuq08dXOr3QUGVCcbIU8Q#P*bpI)CopdwcZ}OK_Y3 zB?S$;vqfjRsUO1Q%(3c>ko;W%Kudvf^UQ`-08)lKI?{ph^L-vce&K5fIP%-x~0ZzlV893mV<;pzi=;E>p7 Ozw~gZPP|p!+W!Zl<8+V! literal 415 zcmV;Q0bu@#P)q}{6^xOE{y1uxJWc$0R~vvk{==so;W6vds2;#O!IS4uM4NsDM) zWL8O&nGAWaFOT`YFF*><^W-VGm+o^sJ&cvLBuN+mKoA59N!unB_~Z&WzNBH z7;nJUZRqs|r4UrfnV&ZG8W2L1Zgw1}{uOgh*3jO-dcCN9sFKtAa}Jm%A;tuAKql1e zIH|-9IVZjDm9?TMECfIP3)-3n@;p~RxNhZx;y4xn0JsK)`A14vMnWoQb=g@Rpdnz4 zk(kMZ!W!}53$7vO@HQuP#zOFQKY*oJ+W>yQDb0_fhyehEVOVM+vMe*~2b$IoXh?`L z$GYCHKtfzYCgJkDCF@%VjJx6&KcIWR-v#9d@H_EyCA5A(7kAISfFgey*y;cP002ov JPDHLkV1k;QrY`^h From 5ef8cf367c87e706c0842f8a71582b51ba79584d Mon Sep 17 00:00:00 2001 From: Xander Date: Sun, 6 Aug 2017 09:34:58 +0800 Subject: [PATCH 6/7] add a couple of comments [no-ci] --- .../common/inventory/container/ContainerUpgradeManagement.java | 2 ++ .../mekanism/common/tile/component/TileComponentUpgrade.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index 6ba75b82a..c9c1296bf 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -21,6 +21,8 @@ public class ContainerUpgradeManagement extends Container public ContainerUpgradeManagement(InventoryPlayer inventory, IUpgradeTile tile) { tileEntity = tile; + + //Bit of a hack I guess, but we need to give it access to the inventory list, not the Frequency IInventory upgradeInv; if (tileEntity instanceof TileEntityQuantumEntangloporter) { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index d61665133..c00d42f5d 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -55,6 +55,7 @@ public class TileComponentUpgrade implements ITileComponent upgradeTicks = upgrade.upgradeTicks; } + // This SHOULD continue to directly use te.inventory, as it is needed for Entangleporter upgrades, since it messes with IInventory. @Override public void tick() { From 7b9bf2194257ee42d74ec328619c0d96510c6bd5 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 6 Aug 2017 13:09:45 -0700 Subject: [PATCH 7/7] Added full-fledged JEI ingredient support for Mekanism gases. Thanks to @mezz for making this possible --- .../client/jei/BaseRecipeCategory.java | 33 ++++++++++- .../java/mekanism/client/jei/MekanismJEI.java | 4 +- .../AdvancedMachineRecipeCategory.java | 31 ++-------- .../machine/AdvancedMachineRecipeWrapper.java | 19 +------ .../machine/ChanceMachineRecipeCategory.java | 12 +--- .../jei/machine/MachineRecipeCategory.java | 10 +--- .../ChemicalCrystallizerRecipeCategory.java | 26 +++------ .../ChemicalCrystallizerRecipeWrapper.java | 14 ----- ...micalDissolutionChamberRecipeCategory.java | 29 +++------- ...emicalDissolutionChamberRecipeWrapper.java | 24 -------- .../ChemicalInfuserRecipeCategory.java | 36 ++++-------- .../ChemicalInfuserRecipeWrapper.java | 27 --------- .../ChemicalOxidizerRecipeCategory.java | 32 +++-------- .../ChemicalOxidizerRecipeWrapper.java | 20 ------- .../ChemicalWasherRecipeCategory.java | 43 ++++---------- .../chemical/ChemicalWasherRecipeWrapper.java | 18 ------ .../ElectrolyticSeparatorRecipeCategory.java | 56 ++++--------------- .../ElectrolyticSeparatorRecipeWrapper.java | 22 -------- .../MetallurgicInfuserRecipeCategory.java | 12 +--- .../jei/machine/other/PRCRecipeCategory.java | 49 ++++------------ .../jei/machine/other/PRCRecipeWrapper.java | 24 -------- .../RotaryCondensentratorRecipeCategory.java | 28 +++------- .../RotaryCondensentratorRecipeWrapper.java | 18 ------ .../other/SolarNeutronRecipeCategory.java | 32 +++-------- .../other/SolarNeutronRecipeWrapper.java | 24 -------- .../ThermalEvaporationRecipeCategory.java | 27 ++------- 26 files changed, 134 insertions(+), 536 deletions(-) diff --git a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java index dd8cf05e1..1bb033251 100644 --- a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java @@ -8,11 +8,18 @@ import java.util.Set; import mekanism.api.gas.GasStack; import mekanism.client.gui.IGuiWrapper; import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.jei.gas.GasStackRenderer; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiIngredientGroup; +import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -27,6 +34,8 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper { public static final GuiDummy gui = new GuiDummy(); + public IGuiHelper guiHelper; + public String recipeName; public String unlocalizedName; @@ -34,12 +43,17 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper public ResourceLocation guiLocation; public ProgressBar progressBar; + public ITickTimer timer; public int xOffset = 28; public int yOffset = 16; - public BaseRecipeCategory(String gui, String name, String unlocalized, ProgressBar progress) + public IDrawable fluidOverlayLarge; + public IDrawable fluidOverlaySmall; + + public BaseRecipeCategory(IGuiHelper helper, String gui, String name, String unlocalized, ProgressBar progress) { + guiHelper = helper; guiTexture = gui; guiLocation = new ResourceLocation(guiTexture); @@ -48,6 +62,11 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper recipeName = name; unlocalizedName = unlocalized; + timer = helper.createTickTimer(20, 20, false); + + fluidOverlayLarge = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); + fluidOverlaySmall = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 29); + addGuiElements(); } @@ -183,4 +202,16 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper { return Collections.emptyList(); } + + protected void initGas(IGuiIngredientGroup group, int slot, boolean input, int x, int y, int width, int height, GasStack stack, boolean overlay) + { + if(stack == null) return; + + IDrawable fluidOverlay = height > 50 ? fluidOverlayLarge : fluidOverlaySmall; + + GasStackRenderer renderer = new GasStackRenderer(stack.amount, false, width, height, overlay ? fluidOverlay : null); + group.init(slot, input, renderer, x, y, width, height, 0, 0); + group.set(slot, stack); + group.addTooltipCallback((index, isInput, ingredient, tooltip) -> tooltip.remove(1)); + } } diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 1001a6ac3..163d9ba74 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -102,6 +102,8 @@ import net.minecraftforge.fluids.Fluid; @JEIPlugin public class MekanismJEI extends BlankModPlugin { + public static GasStackRenderer GAS_RENDERER; + public static ISubtypeInterpreter NBT_INTERPRETER = new ISubtypeInterpreter() { @Override public String getSubtypeInfo(ItemStack itemStack) @@ -140,7 +142,7 @@ public class MekanismJEI extends BlankModPlugin public void registerIngredients(IModIngredientRegistration registry) { List list = GasRegistry.getRegisteredGasses().stream().filter(g -> g.isVisible()).map(g -> new GasStack(g, Fluid.BUCKET_VOLUME)).collect(Collectors.toList()); - registry.register(GasStack.class, list, new GasStackHelper(), new GasStackRenderer()); + registry.register(GasStack.class, list, new GasStackHelper(), GAS_RENDERER = new GasStackRenderer()); } @Override diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java index 26ebb52f4..dcd5b10d1 100644 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java @@ -1,7 +1,5 @@ package mekanism.client.jei.machine; -import java.util.List; - import mekanism.api.gas.GasStack; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; @@ -19,18 +17,15 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; public class AdvancedMachineRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public String recipeName; public String unlocalizedName; @@ -38,15 +33,10 @@ public class AdvancedMachineRecipeCategory extends BaseRecipeCategory public AdvancedMachineRecipe tempRecipe; - public ITickTimer timer; - public AdvancedMachineRecipeCategory(IGuiHelper helper, String name, String unlocalized, ProgressBar progress) { - super("mekanism:gui/GuiAdvancedMachine.png", name, unlocalized, progress); + super(helper, "mekanism:gui/GuiAdvancedMachine.png", name, unlocalized, progress); - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); background = guiHelper.createDrawable(new ResourceLocation(guiTexture), 28, 16, 144, 54); } @@ -74,19 +64,6 @@ public class AdvancedMachineRecipeCategory extends BaseRecipeCategory } }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); } - - @Override - public void drawExtras(Minecraft minecraft) - { - super.drawExtras(minecraft); - - AdvancedMachineInput input = (AdvancedMachineInput)tempRecipe.getInput(); - - if(input.gasType != null) - { - displayGauge(33, 21, 6, 12, new GasStack(input.gasType, 1)); - } - } @Override public IDrawable getBackground() @@ -113,5 +90,9 @@ public class AdvancedMachineRecipeCategory extends BaseRecipeCategory itemStacks.set(0, input.itemStack); itemStacks.set(1, ((ItemStackOutput)tempRecipe.recipeOutput).output); itemStacks.set(2, ((AdvancedMachineRecipeWrapper)recipeWrapper).getFuelStacks(input.gasType)); + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, true, 33, 21, 6, 12, new GasStack(input.gasType, 1), false); } } diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java index a26260d83..9e70198e2 100644 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java @@ -1,11 +1,9 @@ package mekanism.client.jei.machine; -import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; - import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; @@ -28,23 +26,10 @@ public abstract class AdvancedMachineRecipeWrapper extends BaseRecipeWrapper public void getIngredients(IIngredients ingredients) { ingredients.setInput(ItemStack.class, ((AdvancedMachineInput)recipe.getInput()).itemStack); + ingredients.setInput(GasStack.class, new GasStack(((AdvancedMachineInput)recipe.getInput()).gasType, 1)); ingredients.setOutput(ItemStack.class, ((ItemStackOutput)recipe.getOutput()).output); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 33 && mouseX <= 39 && mouseY >= 22 && mouseY <= 34) - { - currenttip.add(((AdvancedMachineInput)recipe.getInput()).gasType.getLocalizedName()); - } - - return currenttip; - } - @Override public AdvancedMachineRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java index cedce59b0..37a7adc23 100644 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java @@ -27,22 +27,14 @@ import net.minecraft.util.ResourceLocation; public class ChanceMachineRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; public ChanceMachineRecipe tempRecipe; - public ITickTimer timer; - public ChanceMachineRecipeCategory(IGuiHelper helper, String name, String unlocalized, ProgressBar progress) { - super("mekanism:gui/GuiBasicMachine.png", name, unlocalized, progress); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/GuiBasicMachine.png", name, unlocalized, progress); + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), 28, 16, 144, 54); } diff --git a/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java index cd76b8af4..d3e8262ea 100644 --- a/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java @@ -26,21 +26,13 @@ import net.minecraft.util.ResourceLocation; public class MachineRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; public BasicMachineRecipe tempRecipe; - public ITickTimer timer; - public MachineRecipeCategory(IGuiHelper helper, String name, String unlocalized, ProgressBar progress) { - super("mekanism:gui/GuiBasicMachine.png", name, unlocalized, progress); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); + super(helper, "mekanism:gui/GuiBasicMachine.png", name, unlocalized, progress); background = guiHelper.createDrawable(new ResourceLocation(guiTexture), 28, 16, 144, 54); } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java index 35e4de0ee..d3425fdb7 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java @@ -5,9 +5,9 @@ import mekanism.client.jei.BaseRecipeCategory; import mekanism.common.recipe.machines.CrystallizerRecipe; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -15,22 +15,14 @@ import net.minecraft.util.ResourceLocation; public class ChemicalCrystallizerRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; public CrystallizerRecipe tempRecipe; - public ITickTimer timer; - public ChemicalCrystallizerRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/nei/GuiChemicalCrystallizer.png", "chemical_crystallizer", "tile.MachineBlock2.ChemicalCrystallizer.name", null); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/nei/GuiChemicalCrystallizer.png", "chemical_crystallizer", "tile.MachineBlock2.ChemicalCrystallizer.name", null); + xOffset = 5; yOffset = 3; @@ -41,16 +33,9 @@ public class ChemicalCrystallizerRecipeCategory extends BaseRecipeCategory public void drawExtras(Minecraft minecraft) { super.drawExtras(minecraft); - - GasStack gas = tempRecipe.getInput().ingredient; float f = (float)timer.getValue() / 20F; drawTexturedRect(53-xOffset, 61-yOffset, 176, 63, (int)(48*f), 8); - - if(gas != null) - { - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, gas); - } } @Override @@ -70,7 +55,10 @@ public class ChemicalCrystallizerRecipeCategory extends BaseRecipeCategory IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); itemStacks.init(0, false, 130-xOffset, 56-yOffset); - itemStacks.set(0, tempRecipe.getOutput().output); + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, true, 6-xOffset, 5-yOffset, 16, 58, tempRecipe.getInput().ingredient, true); } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java index 2d118c3e7..6d3e731b3 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java @@ -31,20 +31,6 @@ public class ChemicalCrystallizerRecipeWrapper extends BaseRecipeWrapper ingredients.setOutput(ItemStack.class, recipe.recipeOutput.output); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 1 && mouseX <= 17 && mouseY >= 5-3 && mouseY <= 63-3) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); - } - - return currenttip; - } - @Override public ChemicalCrystallizerRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java index dd89dd078..fdbdc4ecc 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java @@ -6,9 +6,9 @@ import mekanism.common.MekanismFluids; import mekanism.common.recipe.machines.DissolutionRecipe; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -16,22 +16,14 @@ import net.minecraft.util.ResourceLocation; public class ChemicalDissolutionChamberRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; public DissolutionRecipe tempRecipe; - public ITickTimer timer; - public ChemicalDissolutionChamberRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/nei/GuiChemicalDissolutionChamber.png", "chemical_dissolution_chamber", "gui.chemicalDissolutionChamber.short", null); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/nei/GuiChemicalDissolutionChamber.png", "chemical_dissolution_chamber", "gui.chemicalDissolutionChamber.short", null); + xOffset = 3; yOffset = 3; @@ -42,18 +34,9 @@ public class ChemicalDissolutionChamberRecipeCategory extends BaseRecipeCategory public void drawExtras(Minecraft minecraft) { super.drawExtras(minecraft); - - GasStack gas = tempRecipe.getOutput().output; float f = (float)timer.getValue() / 20F; drawTexturedRect(64-xOffset, 40-yOffset, 176, 63, (int)(48*f), 8); - - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, new GasStack(MekanismFluids.SulfuricAcid, 1)); - - if(gas != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, gas); - } } @Override @@ -73,7 +56,11 @@ public class ChemicalDissolutionChamberRecipeCategory extends BaseRecipeCategory IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); itemStacks.init(0, true, 25-xOffset, 35-yOffset); - itemStacks.set(0, tempRecipe.getInput().ingredient); + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, true, 6-xOffset, 5-yOffset, 16, 58, new GasStack(MekanismFluids.SulfuricAcid, 1), true); + initGas(gasStacks, 1, false, 134-xOffset, 14-yOffset, 16, 58, tempRecipe.getOutput().output, true); } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java index 7ad89dba3..eea30cd81 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java @@ -1,15 +1,9 @@ package mekanism.client.jei.machine.chemical; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nullable; - import mekanism.api.gas.GasStack; import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.MekanismFluids; import mekanism.common.recipe.machines.DissolutionRecipe; -import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; import net.minecraft.item.ItemStack; @@ -33,24 +27,6 @@ public class ChemicalDissolutionChamberRecipeWrapper extends BaseRecipeWrapper ingredients.setOutput(GasStack.class, recipe.recipeOutput.output); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 6-3 && mouseX <= 22-3 && mouseY >= 5-3 && mouseY <= 63-3) - { - currenttip.add(MekanismFluids.SulfuricAcid.getLocalizedName()); - } - else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); - } - - return currenttip; - } - @Override public ChemicalDissolutionChamberRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java index 10efbef17..a0d7ae5d3 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java @@ -1,11 +1,12 @@ package mekanism.client.jei.machine.chemical; +import mekanism.api.gas.GasStack; import mekanism.client.jei.BaseRecipeCategory; import mekanism.common.recipe.machines.ChemicalInfuserRecipe; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -13,22 +14,14 @@ import net.minecraft.util.ResourceLocation; public class ChemicalInfuserRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; public ChemicalInfuserRecipe tempRecipe; - public ITickTimer timer; - public ChemicalInfuserRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/nei/GuiChemicalInfuser.png", "chemical_infuser", "tile.MachineBlock2.ChemicalInfuser.name", null); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/nei/GuiChemicalInfuser.png", "chemical_infuser", "tile.MachineBlock2.ChemicalInfuser.name", null); + xOffset = 3; yOffset = 3; @@ -42,21 +35,6 @@ public class ChemicalInfuserRecipeCategory extends BaseRecipeCategory drawTexturedRect(47-xOffset, 39-yOffset, 176, 71, 28, 8); drawTexturedRect(101-xOffset, 39-yOffset, 176, 63, 28, 8); - - if(tempRecipe.getInput().leftGas != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().leftGas); - } - - if(tempRecipe.getOutput().output != null) - { - displayGauge(58, 80-xOffset, 5-yOffset, 176, 4, 58, null, tempRecipe.getOutput().output); - } - - if(tempRecipe.getInput().rightGas != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().rightGas); - } } @Override @@ -72,5 +50,11 @@ public class ChemicalInfuserRecipeCategory extends BaseRecipeCategory { tempRecipe = ((ChemicalInfuserRecipeWrapper)recipeWrapper).recipe; } + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, true, 26-xOffset, 14-yOffset, 16, 58, tempRecipe.getInput().leftGas, true); + initGas(gasStacks, 1, true, 134-xOffset, 14-yOffset, 16, 58, tempRecipe.getInput().rightGas, true); + initGas(gasStacks, 2, false, 80-xOffset, 5-yOffset, 16, 58, tempRecipe.getOutput().output, true); } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java index 46942dd6d..337a94350 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java @@ -1,15 +1,10 @@ package mekanism.client.jei.machine.chemical; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nullable; import mekanism.api.gas.GasStack; import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.ChemicalInfuserRecipe; -import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; public class ChemicalInfuserRecipeWrapper extends BaseRecipeWrapper @@ -31,28 +26,6 @@ public class ChemicalInfuserRecipeWrapper extends BaseRecipeWrapper ingredients.setOutput(GasStack.class, recipe.recipeOutput.output); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-3 && mouseY <= 72-3) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getInput().leftGas)); - } - else if(mouseX >= 80-3 && mouseX <= 96-3 && mouseY >= 5-3 && mouseY <= 63-3) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); - } - else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getInput().rightGas)); - } - - return currenttip; - } - @Override public ChemicalInfuserRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java index 26200d23a..8ba32806e 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java @@ -1,5 +1,6 @@ package mekanism.client.jei.machine.chemical; +import mekanism.api.gas.GasStack; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; @@ -13,34 +14,25 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; public class ChemicalOxidizerRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; public OxidationRecipe tempRecipe; public GuiGasGauge gasOutput; - public ITickTimer timer; - public ChemicalOxidizerRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/GuiChemicalOxidizer.png", "chemical_oxidizer", "tile.MachineBlock2.ChemicalOxidizer.name", ProgressBar.LARGE_RIGHT); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/GuiChemicalOxidizer.png", "chemical_oxidizer", "tile.MachineBlock2.ChemicalOxidizer.name", ProgressBar.LARGE_RIGHT); + xOffset = 20; yOffset = 12; @@ -64,18 +56,6 @@ public class ChemicalOxidizerRecipeCategory extends BaseRecipeCategory }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 62, 39)); } - @Override - public void drawExtras(Minecraft minecraft) - { - super.drawExtras(minecraft); - - if(tempRecipe.getOutput().output != null) - { - gasOutput.setDummyType(tempRecipe.getOutput().output.getGas()); - gasOutput.renderScale(0, 0, -xOffset, -yOffset); - } - } - @Override public IDrawable getBackground() { @@ -94,5 +74,9 @@ public class ChemicalOxidizerRecipeCategory extends BaseRecipeCategory itemStacks.init(0, true, 25-xOffset, 35-yOffset); itemStacks.set(0, tempRecipe.getInput().ingredient); + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, false, 134-xOffset, 14-yOffset, 16, 58, tempRecipe.recipeOutput.output, true); } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java index 1017ab8c8..f3e68fb58 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java @@ -1,14 +1,8 @@ package mekanism.client.jei.machine.chemical; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nullable; - import mekanism.api.gas.GasStack; import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.OxidationRecipe; -import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; import net.minecraft.item.ItemStack; @@ -31,20 +25,6 @@ public class ChemicalOxidizerRecipeWrapper extends BaseRecipeWrapper ingredients.setOutput(GasStack.class, recipe.recipeOutput.output); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 134-20 && mouseX <= 150-20 && mouseY >= 14-12 && mouseY <= 72-12) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); - } - - return currenttip; - } - @Override public ChemicalOxidizerRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java index 1e75c67e5..2e2479caf 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -1,15 +1,14 @@ package mekanism.client.jei.machine.chemical; -import java.util.List; - +import mekanism.api.gas.GasStack; import mekanism.client.jei.BaseRecipeCategory; import mekanism.common.recipe.machines.WasherRecipe; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ITickTimer; -import mezz.jei.api.gui.ITooltipCallback; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -18,10 +17,7 @@ import net.minecraftforge.fluids.FluidStack; public class ChemicalWasherRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; - public IDrawable fluidOverlay; public WasherRecipe tempRecipe; @@ -29,17 +25,12 @@ public class ChemicalWasherRecipeCategory extends BaseRecipeCategory public ChemicalWasherRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/nei/GuiChemicalWasher.png", "chemical_washer", "tile.MachineBlock2.ChemicalWasher.name", null); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/nei/GuiChemicalWasher.png", "chemical_washer", "tile.MachineBlock2.ChemicalWasher.name", null); + xOffset = 3; yOffset = 3; background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 70); - fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 4, 16, 59); } @Override @@ -48,16 +39,6 @@ public class ChemicalWasherRecipeCategory extends BaseRecipeCategory super.drawExtras(minecraft); drawTexturedRect(61-xOffset, 39-yOffset, 176, 63, 55, 8); - - if(tempRecipe.getInput().ingredient != null) - { - displayGauge(58, 27-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().ingredient); - } - - if(tempRecipe.getOutput().output != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getOutput().output); - } } @Override @@ -76,15 +57,13 @@ public class ChemicalWasherRecipeCategory extends BaseRecipeCategory IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); - fluidStacks.init(0, true, 6-xOffset, 5-yOffset, 16, 58, 1000, false, fluidOverlay); + fluidStacks.init(0, true, 6-xOffset, 5-yOffset, 16, 58, 1000, false, fluidOverlayLarge); fluidStacks.set(0, ingredients.getInputs(FluidStack.class).get(0)); - fluidStacks.addTooltipCallback(new ITooltipCallback() { - - @Override - public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) - { - tooltip.remove(1); - } - }); + fluidStacks.addTooltipCallback((index, input, ingredient, tooltip) -> tooltip.remove(1)); + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, true, 27-xOffset, 14-yOffset, 16, 58, tempRecipe.getInput().ingredient, true); + initGas(gasStacks, 1, false, 134-xOffset, 14-yOffset, 16, 58, tempRecipe.getOutput().output, true); } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java index cfd557904..4308169e8 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java @@ -33,24 +33,6 @@ public class ChemicalWasherRecipeWrapper extends BaseRecipeWrapper ingredients.setOutput(GasStack.class, recipe.recipeOutput.output); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 27-3 && mouseX <= 43-3 && mouseY >= 14-3 && mouseY <= 72-3) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); - } - else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); - } - - return currenttip; - } - @Override public ChemicalWasherRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java index 333d1b5cb..eadb2c75a 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java @@ -1,8 +1,6 @@ package mekanism.client.jei.machine.other; -import java.util.ArrayList; -import java.util.List; - +import mekanism.api.gas.GasStack; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; @@ -21,42 +19,30 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ITickTimer; -import mezz.jei.api.gui.ITooltipCallback; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; public class ElectrolyticSeparatorRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; - public IDrawable fluidOverlay; public GuiGasGauge leftGas; public GuiGasGauge rightGas; public SeparatorRecipe tempRecipe; - public ITickTimer timer; - public ElectrolyticSeparatorRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/GuiElectrolyticSeparator.png", "electrolytic_separator", "tile.MachineBlock2.ElectrolyticSeparator.name", ProgressBar.BI); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); + super(helper, "mekanism:gui/GuiElectrolyticSeparator.png", "electrolytic_separator", "tile.MachineBlock2.ElectrolyticSeparator.name", ProgressBar.BI); xOffset = 4; yOffset = 9; background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 167, 62); - fluidOverlay = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); } @Override @@ -88,26 +74,6 @@ public class ElectrolyticSeparatorRecipeCategory extends BaseRecipeCategory }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 78, 29)); } - @Override - public void drawExtras(Minecraft minecraft) - { - super.drawExtras(minecraft); - - if(tempRecipe.getOutput().leftGas != null) - { - leftGas.setDummyType(tempRecipe.getOutput().leftGas.getGas()); - leftGas.renderScale(0, 0, -xOffset, -yOffset); - } - - if(tempRecipe.getOutput().rightGas != null) - { - rightGas.setDummyType(tempRecipe.getOutput().rightGas.getGas()); - rightGas.renderScale(0, 0, -xOffset, -yOffset); - } - - changeTexture(guiLocation); - } - @Override public IDrawable getBackground() { @@ -124,15 +90,13 @@ public class ElectrolyticSeparatorRecipeCategory extends BaseRecipeCategory IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); - fluidStacks.init(0, true, 2, 2, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); + fluidStacks.init(0, true, 2, 2, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlayLarge); fluidStacks.set(0, ingredients.getInputs(FluidStack.class).get(0)); - fluidStacks.addTooltipCallback(new ITooltipCallback() { - - @Override - public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) - { - tooltip.remove(1); - } - }); + fluidStacks.addTooltipCallback((index, input, ingredient, tooltip) -> tooltip.remove(1)); + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, false, 59-xOffset, 19-yOffset, 16, 28, tempRecipe.recipeOutput.leftGas, true); + initGas(gasStacks, 1, false, 101-xOffset, 19-yOffset, 16, 28, tempRecipe.recipeOutput.rightGas, true); } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java index ac707033d..8aa1304e1 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -1,10 +1,6 @@ package mekanism.client.jei.machine.other; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nullable; import mekanism.api.gas.GasStack; import mekanism.client.jei.machine.BaseRecipeWrapper; @@ -31,24 +27,6 @@ public class ElectrolyticSeparatorRecipeWrapper extends BaseRecipeWrapper ingredients.setOutputs(GasStack.class, Arrays.asList(recipe.recipeOutput.leftGas, recipe.recipeOutput.rightGas)); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 59-4 && mouseX <= 75-4 && mouseY >= 19-9 && mouseY <= 47-9) - { - currenttip.add(recipe.getOutput().leftGas.getGas().getLocalizedName()); - } - else if(mouseX >= 101-4 && mouseX <= 117-4 && mouseY >= 19-9 && mouseY <= 47-9) - { - currenttip.add(recipe.getOutput().rightGas.getGas().getLocalizedName()); - } - - return currenttip; - } - @Override public ElectrolyticSeparatorRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java index c72d378c4..2c8a61a42 100644 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java @@ -33,22 +33,14 @@ import net.minecraft.util.ResourceLocation; public class MetallurgicInfuserRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; public MetallurgicInfuserRecipe tempRecipe; - public ITickTimer timer; - public MetallurgicInfuserRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/GuiMetallurgicInfuser.png", "metallurgic_infuser", "tile.MachineBlock.MetallurgicInfuser.name", ProgressBar.MEDIUM); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/GuiMetallurgicInfuser.png", "metallurgic_infuser", "tile.MachineBlock.MetallurgicInfuser.name", ProgressBar.MEDIUM); + xOffset = 5; yOffset = 16; diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java index 744b414ca..f9a75075f 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java @@ -2,6 +2,7 @@ package mekanism.client.jei.machine.other; import java.util.List; +import mekanism.api.gas.GasStack; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; @@ -20,6 +21,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ITickTimer; @@ -32,31 +34,21 @@ import net.minecraftforge.fluids.FluidStack; public class PRCRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; - public IDrawable fluidOverlay; public GuiGasGauge gasInput; public GuiGasGauge gasOutput; public PressurizedRecipe tempRecipe; - public ITickTimer timer; - public PRCRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/nei/GuiPRC.png", "pressurized_reaction_chamber", "tile.MachineBlock2.PressurizedReactionChamber.short.name", ProgressBar.MEDIUM); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/nei/GuiPRC.png", "pressurized_reaction_chamber", "tile.MachineBlock2.PressurizedReactionChamber.short.name", ProgressBar.MEDIUM); + xOffset = 3; yOffset = 11; background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 68); - fluidOverlay = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); } @Override @@ -87,24 +79,6 @@ public class PRCRecipeCategory extends BaseRecipeCategory }, progressBar, this, guiLocation, 75, 37)); } - @Override - public void drawExtras(Minecraft minecraft) - { - super.drawExtras(minecraft); - - if(tempRecipe.getInput().getGas() != null) - { - gasInput.setDummyType(tempRecipe.getInput().getGas().getGas()); - gasInput.renderScale(0, 0, -xOffset, -yOffset); - } - - if(tempRecipe.getOutput().getGasOutput() != null) - { - gasOutput.setDummyType(tempRecipe.getOutput().getGasOutput().getGas()); - gasOutput.renderScale(0, 0, -xOffset, -yOffset); - } - } - @Override public IDrawable getBackground() { @@ -129,14 +103,13 @@ public class PRCRecipeCategory extends BaseRecipeCategory IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); - fluidStacks.init(0, true, 3, 0, 16, 58, tempRecipe.getInput().getFluid().amount, false, fluidOverlay); + fluidStacks.init(0, true, 3, 0, 16, 58, tempRecipe.getInput().getFluid().amount, false, fluidOverlayLarge); fluidStacks.set(0, tempRecipe.recipeInput.getFluid()); - fluidStacks.addTooltipCallback(new ITooltipCallback() { - @Override - public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) - { - tooltip.remove(1); - } - }); + fluidStacks.addTooltipCallback((index, input, ingredient, tooltip) -> tooltip.remove(1)); + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, true, 29-xOffset, 11-yOffset, 16, 58, tempRecipe.recipeInput.getGas(), true); + initGas(gasStacks, 1, false, 141-xOffset, 41-yOffset, 16, 28, tempRecipe.recipeOutput.getGasOutput(), true); } } diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java index bed55c013..05d090de7 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java @@ -1,14 +1,8 @@ package mekanism.client.jei.machine.other; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nullable; - import mekanism.api.gas.GasStack; import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.PressurizedRecipe; -import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -35,24 +29,6 @@ public class PRCRecipeWrapper extends BaseRecipeWrapper ingredients.setOutput(GasStack.class, recipe.recipeOutput.getGasOutput()); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 29-3 && mouseX <= 45-3 && mouseY >= 11-12 && mouseY <= 69-12) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getInput().getGas())); - } - else if(mouseX >= 141-3 && mouseX <= 157-3 && mouseY >= 41-12 && mouseY <= 69-12) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().getGasOutput())); - } - - return currenttip; - } - @Override public PRCRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java index 647553c90..900f76aa5 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java @@ -1,14 +1,12 @@ package mekanism.client.jei.machine.other; -import java.util.List; - import mekanism.api.gas.GasStack; import mekanism.client.jei.BaseRecipeCategory; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -17,28 +15,18 @@ import net.minecraftforge.fluids.FluidStack; public class RotaryCondensentratorRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; - public IDrawable fluidOverlay; public RotaryCondensentratorRecipeWrapper tempRecipe; - public ITickTimer timer; - public RotaryCondensentratorRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/nei/GuiRotaryCondensentrator.png", "rotary_condensentrator", "nei.rotaryCondensentrator", null); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/nei/GuiRotaryCondensentrator.png", "rotary_condensentrator", "nei.rotaryCondensentrator", null); + xOffset = 3; yOffset = 12; background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 71); - fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 40, 16, 59); } @Override @@ -53,11 +41,6 @@ public class RotaryCondensentratorRecipeCategory extends BaseRecipeCategory else { drawTexturedRect(64-xOffset, 39-yOffset, 176, 115, 48, 8); } - - if(tempRecipe.gasType != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 40, 58, null, new GasStack(tempRecipe.gasType, 1)); - } } @Override @@ -75,14 +58,17 @@ public class RotaryCondensentratorRecipeCategory extends BaseRecipeCategory } IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); - fluidStacks.init(0, !tempRecipe.condensentrating, 134-xOffset, 14-yOffset, 16, 58, 1000, false, fluidOverlay); + fluidStacks.init(0, !tempRecipe.condensentrating, 134-xOffset, 14-yOffset, 16, 58, 1000, false, fluidOverlayLarge); if(tempRecipe.condensentrating) { + initGas(gasStacks, 0, true, 26-xOffset, 14-yOffset, 16, 58, new GasStack(tempRecipe.gasType, 1), true); fluidStacks.set(0, ingredients.getOutputs(FluidStack.class).get(0)); } else { + initGas(gasStacks, 0, false, 26-xOffset, 14-yOffset, 16, 58, new GasStack(tempRecipe.gasType, 1), true); fluidStacks.set(0, ingredients.getInputs(FluidStack.class).get(0)); } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java index 3d3293735..05d3f87de 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -1,10 +1,6 @@ package mekanism.client.jei.machine.other; -import java.util.ArrayList; -import java.util.List; - import javax.annotation.Nonnull; -import javax.annotation.Nullable; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -55,20 +51,6 @@ public class RotaryCondensentratorRecipeWrapper extends BaseRecipeWrapper fontRendererObj.drawString(condensentrating ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-3, 74-12, 0x404040, false); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) - { - currenttip.add(gasType.getLocalizedName()); - } - - return currenttip; - } - @Override public RotaryCondensentratorRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java index 1187f95f5..5f9f6d964 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java @@ -1,13 +1,12 @@ package mekanism.client.jei.machine.other; -import java.util.List; - +import mekanism.api.gas.GasStack; import mekanism.client.jei.BaseRecipeCategory; import mekanism.common.recipe.machines.SolarNeutronRecipe; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiIngredientGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -15,22 +14,14 @@ import net.minecraft.util.ResourceLocation; public class SolarNeutronRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; public SolarNeutronRecipe tempRecipe; - public ITickTimer timer; - public SolarNeutronRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/nei/GuiSolarNeutronActivator.png", "solar_neutron_activator", "tile.MachineBlock3.SolarNeutronActivator.name", null); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/nei/GuiSolarNeutronActivator.png", "solar_neutron_activator", "tile.MachineBlock3.SolarNeutronActivator.name", null); + xOffset = 3; yOffset = 12; @@ -43,16 +34,6 @@ public class SolarNeutronRecipeCategory extends BaseRecipeCategory super.drawExtras(minecraft); drawTexturedRect(64-xOffset, 39-yOffset, 176, 58, 55, 8); - - if(tempRecipe.getInput().ingredient != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 0, 58, null, tempRecipe.getInput().ingredient); - } - - if(tempRecipe.getOutput().output != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 0, 58, null, tempRecipe.getOutput().output); - } } @Override @@ -68,5 +49,10 @@ public class SolarNeutronRecipeCategory extends BaseRecipeCategory { tempRecipe = ((SolarNeutronRecipeWrapper)recipeWrapper).recipe; } + + IGuiIngredientGroup gasStacks = recipeLayout.getIngredientsGroup(GasStack.class); + + initGas(gasStacks, 0, true, 26-xOffset, 14-yOffset, 16, 58, tempRecipe.recipeInput.ingredient, true); + initGas(gasStacks, 1, false, 134-xOffset, 14-yOffset, 16, 58, tempRecipe.recipeOutput.output, true); } } diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java index ed16c824e..6fc2105b5 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -1,14 +1,8 @@ package mekanism.client.jei.machine.other; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nullable; - import mekanism.api.gas.GasStack; import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.SolarNeutronRecipe; -import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; public class SolarNeutronRecipeWrapper extends BaseRecipeWrapper @@ -30,24 +24,6 @@ public class SolarNeutronRecipeWrapper extends BaseRecipeWrapper ingredients.setOutput(GasStack.class, recipe.getOutput().output); } - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - List currenttip = new ArrayList(); - - if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); - } - else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-12 && mouseY <= 72-12) - { - currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); - } - - return currenttip; - } - @Override public SolarNeutronRecipeCategory getCategory() { diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java index bf9cf0aaf..b42e097b2 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java @@ -18,28 +18,18 @@ import net.minecraftforge.fluids.FluidStack; public class ThermalEvaporationRecipeCategory extends BaseRecipeCategory { - public IGuiHelper guiHelper; - public IDrawable background; - public IDrawable fluidOverlay; public ThermalEvaporationRecipe tempRecipe; - public ITickTimer timer; - public ThermalEvaporationRecipeCategory(IGuiHelper helper) { - super("mekanism:gui/nei/GuiThermalEvaporationController.png", "thermal_evaporation_plant", "gui.thermalEvaporationController.short", null); - - guiHelper = helper; - - timer = helper.createTickTimer(20, 20, false); - + super(helper, "mekanism:gui/nei/GuiThermalEvaporationController.png", "thermal_evaporation_plant", "gui.thermalEvaporationController.short", null); + xOffset = 3; yOffset = 12; background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 62); - fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 0, 16, 59); } @Override @@ -66,18 +56,11 @@ public class ThermalEvaporationRecipeCategory extends BaseRecipeCategory IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); - fluidStacks.init(0, true, 7-xOffset, 14-yOffset, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); - fluidStacks.init(1, false, 153-xOffset, 14-yOffset, 16, 58, tempRecipe.getOutput().output.amount, false, fluidOverlay); + fluidStacks.init(0, true, 7-xOffset, 14-yOffset, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlayLarge); + fluidStacks.init(1, false, 153-xOffset, 14-yOffset, 16, 58, tempRecipe.getOutput().output.amount, false, fluidOverlayLarge); fluidStacks.set(0, tempRecipe.recipeInput.ingredient); fluidStacks.set(1, tempRecipe.recipeOutput.output); - - fluidStacks.addTooltipCallback(new ITooltipCallback() { - @Override - public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) - { - tooltip.remove(1); - } - }); + fluidStacks.addTooltipCallback((index, input, ingredient, tooltip) -> tooltip.remove(1)); } }