From 6e49033fc8feaefb89bed0a7c4ccdfe01259b2e6 Mon Sep 17 00:00:00 2001 From: shironakoushi <107804053+shironakoushi@users.noreply.github.com> Date: Sat, 21 Nov 2026 02:38:39 +0800 Subject: [PATCH] Add New Ender Fluid Conduits for Late Game (#272) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz Co-authored-by: Chitak 985 --- .../java/crazypants/enderio/ClientProxy.java | 8 +++ .../enderio/conduit/AbstractConduit.java | 12 ++++ .../liquid/AbstractEnderLiquidConduit.java | 12 +++- .../liquid/CosmicEnderLiquidConduit.java | 57 +++++++++++++++ .../liquid/FluxedEnderLiquidConduit.java | 57 +++++++++++++++ .../conduit/liquid/ItemLiquidConduit.java | 53 +++++++++++++- .../PrismaticNaquadahEnderLiquidConduit.java | 57 +++++++++++++++ .../TranscendentEnderLiquidConduit.java | 57 +++++++++++++++ .../crazypants/enderio/config/Config.java | 67 ++++++++++++++++++ .../resources/assets/enderio/lang/en_US.lang | 4 ++ .../blocks/liquidConduitCoreCosmicEnder.png | Bin 0 -> 1118 bytes .../blocks/liquidConduitCoreFluxedEnder.png | Bin 0 -> 1122 bytes ...iquidConduitCorePrismaticNaquadahEnder.png | Bin 0 -> 1107 bytes .../liquidConduitCoreTranscendentEnder.png | Bin 0 -> 1123 bytes .../blocks/liquidConduitCosmicEnder.png | Bin 0 -> 2574 bytes .../liquidConduitCosmicEnder.png.mcmeta | 45 ++++++++++++ .../blocks/liquidConduitFluxedEnder.png | Bin 0 -> 2797 bytes .../liquidConduitFluxedEnder.png.mcmeta | 45 ++++++++++++ .../liquidConduitPrismaticNaquadahEnder.png | Bin 0 -> 2761 bytes ...idConduitPrismaticNaquadahEnder.png.mcmeta | 45 ++++++++++++ .../blocks/liquidConduitTranscendentEnder.png | Bin 0 -> 2774 bytes .../liquidConduitTranscendentEnder.png.mcmeta | 45 ++++++++++++ .../items/itemLiquidConduitCosmicEnder.png | Bin 0 -> 1118 bytes .../items/itemLiquidConduitFluxedEnder.png | Bin 0 -> 1122 bytes ...temLiquidConduitPrismaticNaquadahEnder.png | Bin 0 -> 1107 bytes .../itemLiquidConduitTranscendentEnder.png | Bin 0 -> 1123 bytes 26 files changed, 560 insertions(+), 4 deletions(-) create mode 100644 src/main/java/crazypants/enderio/conduit/liquid/CosmicEnderLiquidConduit.java create mode 100644 src/main/java/crazypants/enderio/conduit/liquid/FluxedEnderLiquidConduit.java create mode 100644 src/main/java/crazypants/enderio/conduit/liquid/PrismaticNaquadahEnderLiquidConduit.java create mode 100644 src/main/java/crazypants/enderio/conduit/liquid/TranscendentEnderLiquidConduit.java create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreCosmicEnder.png create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreFluxedEnder.png create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitCorePrismaticNaquadahEnder.png create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreTranscendentEnder.png create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitCosmicEnder.png create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitCosmicEnder.png.mcmeta create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitFluxedEnder.png create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitFluxedEnder.png.mcmeta create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitPrismaticNaquadahEnder.png create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitPrismaticNaquadahEnder.png.mcmeta create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitTranscendentEnder.png create mode 100644 src/main/resources/assets/enderio/textures/blocks/liquidConduitTranscendentEnder.png.mcmeta create mode 100644 src/main/resources/assets/enderio/textures/items/itemLiquidConduitCosmicEnder.png create mode 100644 src/main/resources/assets/enderio/textures/items/itemLiquidConduitFluxedEnder.png create mode 100644 src/main/resources/assets/enderio/textures/items/itemLiquidConduitPrismaticNaquadahEnder.png create mode 100644 src/main/resources/assets/enderio/textures/items/itemLiquidConduitTranscendentEnder.png diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 38fde239..d39353d8 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -33,12 +33,16 @@ import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.item.ItemConduit; import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit; import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit; +import crazypants.enderio.conduit.liquid.CosmicEnderLiquidConduit; import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit; import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit; import crazypants.enderio.conduit.liquid.EnderLiquidConduit; +import crazypants.enderio.conduit.liquid.FluxedEnderLiquidConduit; import crazypants.enderio.conduit.liquid.LiquidConduit; import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit; +import crazypants.enderio.conduit.liquid.PrismaticNaquadahEnderLiquidConduit; import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit; +import crazypants.enderio.conduit.liquid.TranscendentEnderLiquidConduit; import crazypants.enderio.conduit.me.MEConduit; import crazypants.enderio.conduit.me.MEUtil; import crazypants.enderio.conduit.oc.OCConduit; @@ -203,6 +207,10 @@ public class ClientProxy extends CommonProxy { CrystallinePinkSlimeEnderLiquidConduit.initIcons(); MelodicEnderLiquidConduit.initIcons(); StellarEnderLiquidConduit.initIcons(); + PrismaticNaquadahEnderLiquidConduit.initIcons(); + FluxedEnderLiquidConduit.initIcons(); + TranscendentEnderLiquidConduit.initIcons(); + CosmicEnderLiquidConduit.initIcons(); ItemConduit.initIcons(); if (GasUtil.isGasConduitEnabled()) { GasConduit.initIcons(); diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 3a5726c3..a1b0a320 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -31,14 +31,18 @@ import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.ItemConduitNetwork; import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit; import crazypants.enderio.conduit.liquid.AdvancedLiquidConduitNetwork; +import crazypants.enderio.conduit.liquid.CosmicEnderLiquidConduit; import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit; import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit; import crazypants.enderio.conduit.liquid.EnderLiquidConduit; import crazypants.enderio.conduit.liquid.EnderLiquidConduitNetwork; +import crazypants.enderio.conduit.liquid.FluxedEnderLiquidConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.liquid.LiquidConduitNetwork; import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit; +import crazypants.enderio.conduit.liquid.PrismaticNaquadahEnderLiquidConduit; import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit; +import crazypants.enderio.conduit.liquid.TranscendentEnderLiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.me.MEConduitNetwork; import crazypants.enderio.conduit.oc.IOCConduit; @@ -672,6 +676,14 @@ public abstract class AbstractConduit implements IConduit { return new PowerConduitNetwork(); } else if (StellarEnderLiquidConduit.class.isAssignableFrom(type)) { return new EnderLiquidConduitNetwork(StellarEnderLiquidConduit.TYPE); + } else if (PrismaticNaquadahEnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(PrismaticNaquadahEnderLiquidConduit.TYPE); + } else if (FluxedEnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(FluxedEnderLiquidConduit.TYPE); + } else if (TranscendentEnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(TranscendentEnderLiquidConduit.TYPE); + } else if (CosmicEnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(CosmicEnderLiquidConduit.TYPE); } else if (MelodicEnderLiquidConduit.class.isAssignableFrom(type)) { return new EnderLiquidConduitNetwork(MelodicEnderLiquidConduit.TYPE); } else if (CrystallinePinkSlimeEnderLiquidConduit.class.isAssignableFrom(type)) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java index d832ffbc..ee84c257 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java @@ -87,7 +87,17 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { MELODIC(() -> Config.melodicEnderFluidConduitExtractRate, () -> Config.melodicEnderFluidConduitMaxIoRate), - STELLAR(() -> Config.stellarEnderFluidConduitExtractRate, () -> Config.stellarEnderFluidConduitMaxIoRate); + STELLAR(() -> Config.stellarEnderFluidConduitExtractRate, () -> Config.stellarEnderFluidConduitMaxIoRate), + + PRISMATIC_NAQUADAH(() -> Config.prismaticNaquadahEnderFluidConduitExtractRate, + () -> Config.prismaticNaquadahEnderFluidConduitMaxIoRate), + + FLUXED(() -> Config.fluxedEnderFluidConduitExtractRate, () -> Config.fluxedEnderFluidConduitMaxIoRate), + + TRANSCENDENT(() -> Config.transcendentEnderFluidConduitExtractRate, + () -> Config.transcendentEnderFluidConduitMaxIoRate), + + COSMIC(() -> Config.cosmicEnderFluidConduitExtractRate, () -> Config.cosmicEnderFluidConduitMaxIoRate); private final IntSupplier getMaxExtractPerTick; private final IntSupplier getMaxIoPerTick; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/CosmicEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/CosmicEnderLiquidConduit.java new file mode 100644 index 00000000..cb7c116a --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/liquid/CosmicEnderLiquidConduit.java @@ -0,0 +1,57 @@ +package crazypants.enderio.conduit.liquid; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +import com.enderio.core.client.render.IconUtil; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class CosmicEnderLiquidConduit extends AbstractEnderLiquidConduit { + + public static final Type TYPE = Type.COSMIC; + public static final int METADATA = 10; + public static final String ICON_KEY = "enderio:liquidConduitCosmicEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreCosmicEnder"; + + static IIcon iconKey; + static IIcon iconCoreKey; + + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + @Override + public Type getType() { + return TYPE; + } + + @Override + public int getMetadata() { + return METADATA; + } + + @Override + protected IIcon getIconKey() { + return iconKey; + } + + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/liquid/FluxedEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/FluxedEnderLiquidConduit.java new file mode 100644 index 00000000..526ca719 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/liquid/FluxedEnderLiquidConduit.java @@ -0,0 +1,57 @@ +package crazypants.enderio.conduit.liquid; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +import com.enderio.core.client.render.IconUtil; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class FluxedEnderLiquidConduit extends AbstractEnderLiquidConduit { + + public static final Type TYPE = Type.FLUXED; + public static final int METADATA = 8; + public static final String ICON_KEY = "enderio:liquidConduitFluxedEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreFluxedEnder"; + + static IIcon iconKey; + static IIcon iconCoreKey; + + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + @Override + public Type getType() { + return TYPE; + } + + @Override + public int getMetadata() { + return METADATA; + } + + @Override + protected IIcon getIconKey() { + return iconKey; + } + + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index aabd675a..71161018 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -16,6 +16,7 @@ import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.config.Config; +import crazypants.enderio.power.PowerDisplayUtil; public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedTooltipProvider { @@ -36,7 +37,19 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT "enderio:itemLiquidConduitMelodicEnder"), new ItemConduitSubtype( ModObject.itemLiquidConduit.name() + "StellarEnder", - "enderio:itemLiquidConduitStellarEnder") }; + "enderio:itemLiquidConduitStellarEnder"), + new ItemConduitSubtype( + ModObject.itemLiquidConduit.name() + "PrismaticNaquadahEnder", + "enderio:itemLiquidConduitPrismaticNaquadahEnder"), + new ItemConduitSubtype( + ModObject.itemLiquidConduit.name() + "FluxedEnder", + "enderio:itemLiquidConduitFluxedEnder"), + new ItemConduitSubtype( + ModObject.itemLiquidConduit.name() + "TranscendentEnder", + "enderio:itemLiquidConduitTranscendentEnder"), + new ItemConduitSubtype( + ModObject.itemLiquidConduit.name() + "CosmicEnder", + "enderio:itemLiquidConduitCosmicEnder") }; public static ItemLiquidConduit create() { ItemLiquidConduit result = new ItemLiquidConduit(); @@ -70,6 +83,14 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT return new MelodicEnderLiquidConduit(); case StellarEnderLiquidConduit.METADATA: return new StellarEnderLiquidConduit(); + case PrismaticNaquadahEnderLiquidConduit.METADATA: + return new PrismaticNaquadahEnderLiquidConduit(); + case FluxedEnderLiquidConduit.METADATA: + return new FluxedEnderLiquidConduit(); + case TranscendentEnderLiquidConduit.METADATA: + return new TranscendentEnderLiquidConduit(); + case CosmicEnderLiquidConduit.METADATA: + return new CosmicEnderLiquidConduit(); default: throw new IllegalArgumentException("Unrecognized ender fluid conduit type: " + stack.getItemDamage()); } @@ -125,14 +146,40 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT maxIo = StellarEnderLiquidConduit.TYPE.getMaxIoPerTick(); break; + case PrismaticNaquadahEnderLiquidConduit.METADATA: + extractRate = PrismaticNaquadahEnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = PrismaticNaquadahEnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + + case FluxedEnderLiquidConduit.METADATA: + extractRate = FluxedEnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = FluxedEnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + + case TranscendentEnderLiquidConduit.METADATA: + extractRate = TranscendentEnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = TranscendentEnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + + case CosmicEnderLiquidConduit.METADATA: + extractRate = CosmicEnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = CosmicEnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + default: throw new IllegalArgumentException( "Unrecognized ender fluid conduit type: " + itemstack.getItemDamage()); } String mbt = " " + EnderIO.lang.localize("fluid.millibucketsTick"); - list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " " + extractRate + mbt); - list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + maxIo + mbt); + list.add( + EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " " + + PowerDisplayUtil.formatPower(extractRate) + + mbt); + list.add( + EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + + PowerDisplayUtil.formatPower(maxIo) + + mbt); if (itemstack.getItemDamage() == 0) { SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduit"); diff --git a/src/main/java/crazypants/enderio/conduit/liquid/PrismaticNaquadahEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/PrismaticNaquadahEnderLiquidConduit.java new file mode 100644 index 00000000..4847f930 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/liquid/PrismaticNaquadahEnderLiquidConduit.java @@ -0,0 +1,57 @@ +package crazypants.enderio.conduit.liquid; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +import com.enderio.core.client.render.IconUtil; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class PrismaticNaquadahEnderLiquidConduit extends AbstractEnderLiquidConduit { + + public static final Type TYPE = Type.PRISMATIC_NAQUADAH; + public static final int METADATA = 7; + public static final String ICON_KEY = "enderio:liquidConduitPrismaticNaquadahEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCorePrismaticNaquadahEnder"; + + static IIcon iconKey; + static IIcon iconCoreKey; + + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + @Override + public Type getType() { + return TYPE; + } + + @Override + public int getMetadata() { + return METADATA; + } + + @Override + protected IIcon getIconKey() { + return iconKey; + } + + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/liquid/TranscendentEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/TranscendentEnderLiquidConduit.java new file mode 100644 index 00000000..9e0a8aff --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/liquid/TranscendentEnderLiquidConduit.java @@ -0,0 +1,57 @@ +package crazypants.enderio.conduit.liquid; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +import com.enderio.core.client.render.IconUtil; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class TranscendentEnderLiquidConduit extends AbstractEnderLiquidConduit { + + public static final Type TYPE = Type.TRANSCENDENT; + public static final int METADATA = 9; + public static final String ICON_KEY = "enderio:liquidConduitTranscendentEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreTranscendentEnder"; + + static IIcon iconKey; + static IIcon iconCoreKey; + + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + @Override + public Type getType() { + return TYPE; + } + + @Override + public int getMetadata() { + return METADATA; + } + + @Override + protected IIcon getIconKey() { + return iconKey; + } + + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 3f3d9213..74e88c92 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -122,6 +122,14 @@ public final class Config { public static int stellarEnderFluidConduitExtractRate = 20_000; public static int stellarEnderFluidConduitMaxIoRate = 80_000; + public static int prismaticNaquadahEnderFluidConduitExtractRate = 100_000; + public static int prismaticNaquadahEnderFluidConduitMaxIoRate = 400_000; + public static int fluxedEnderFluidConduitExtractRate = 1_000_000; + public static int fluxedEnderFluidConduitMaxIoRate = 4_000_000; + public static int transcendentEnderFluidConduitExtractRate = 20_000_000; + public static int transcendentEnderFluidConduitMaxIoRate = 80_000_000; + public static int cosmicEnderFluidConduitExtractRate = 200_000_000; + public static int cosmicEnderFluidConduitMaxIoRate = 800_000_000; public static int melodicEnderFluidConduitExtractRate = 10_000; public static int melodicEnderFluidConduitMaxIoRate = 40_000; public static int crystallinePinkSlimeEnderFluidConduitExtractRate = 2_000; @@ -1005,6 +1013,65 @@ public final class Config { "Number of liters per tick that can pass through a single connection to a stellar ender fluid conduit.") .getInt(stellarEnderFluidConduitMaxIoRate); + prismaticNaquadahEnderFluidConduitExtractRate = config.get( + sectionEfficiency.name, + "prismaticNaquadahEnderFluidConduitExtractRate", + prismaticNaquadahEnderFluidConduitExtractRate, + "Number of liters per tick extracted by prismatic naquadah ender fluid conduits auto extracting") + .getInt(prismaticNaquadahEnderFluidConduitExtractRate); + + prismaticNaquadahEnderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "prismaticNaquadahEnderFluidConduitMaxIoRate", + prismaticNaquadahEnderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a prismatic naquadah ender fluid conduit.") + .getInt(prismaticNaquadahEnderFluidConduitMaxIoRate); + + fluxedEnderFluidConduitExtractRate = config + .get( + sectionEfficiency.name, + "fluxedEnderFluidConduitExtractRate", + fluxedEnderFluidConduitExtractRate, + "Number of liters per tick extracted by fluxed ender fluid conduits auto extracting") + .getInt(fluxedEnderFluidConduitExtractRate); + + fluxedEnderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "fluxedEnderFluidConduitMaxIoRate", + fluxedEnderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a fluxed ender fluid conduit.") + .getInt(fluxedEnderFluidConduitMaxIoRate); + + transcendentEnderFluidConduitExtractRate = config + .get( + sectionEfficiency.name, + "transcendentEnderFluidConduitExtractRate", + transcendentEnderFluidConduitExtractRate, + "Number of liters per tick extracted by transcendent ender fluid conduits auto extracting") + .getInt(transcendentEnderFluidConduitExtractRate); + + transcendentEnderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "transcendentEnderFluidConduitMaxIoRate", + transcendentEnderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a transcendent ender fluid conduit.") + .getInt(transcendentEnderFluidConduitMaxIoRate); + + cosmicEnderFluidConduitExtractRate = config + .get( + sectionEfficiency.name, + "cosmicEnderFluidConduitExtractRate", + cosmicEnderFluidConduitExtractRate, + "Number of liters per tick extracted by cosmic ender fluid conduits auto extracting") + .getInt(cosmicEnderFluidConduitExtractRate); + + cosmicEnderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "cosmicEnderFluidConduitMaxIoRate", + cosmicEnderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a cosmic ender fluid conduit.") + .getInt(cosmicEnderFluidConduitMaxIoRate); + gasConduitExtractRate = config .get( sectionEfficiency.name, diff --git a/src/main/resources/assets/enderio/lang/en_US.lang b/src/main/resources/assets/enderio/lang/en_US.lang index 30242435..84b9335b 100644 --- a/src/main/resources/assets/enderio/lang/en_US.lang +++ b/src/main/resources/assets/enderio/lang/en_US.lang @@ -62,6 +62,10 @@ enderio.itemLiquidConduitCrystallineEnder.name=Crystalline Ender Fluid Conduit enderio.itemLiquidConduitCrystallinePinkSlimeEnder.name=Crystalline Pink Slime Ender Fluid Conduit enderio.itemLiquidConduitMelodicEnder.name=Melodic Ender Fluid Conduit enderio.itemLiquidConduitStellarEnder.name=Stellar Ender Fluid Conduit +enderio.itemLiquidConduitPrismaticNaquadahEnder.name=Prismatic Naquadah Ender Fluid Conduit +enderio.itemLiquidConduitFluxedEnder.name=Fluxed Ender Fluid Conduit +enderio.itemLiquidConduitTranscendentEnder.name=Transcendent Ender Fluid Conduit +enderio.itemLiquidConduitCosmicEnder.name=Cosmic Ender Fluid Conduit enderio.itemLiquidConduit.lockedType=Fluid type locked to enderio.itemLiquidConduit.unlockedType=Fluid type unlocked enderio.itemLiquidConduit.lockedWaila=Locked to diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreCosmicEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreCosmicEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..fb478172fcecd6522e6149fc391dd913a2590957 GIT binary patch literal 1118 zcmV-k1flzhP)4Tx0C=2zkv&MmP!xqvQ$^7h2RjsT$WWauii$W&6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRBVqVy2!*FJ|CbU-#5WbroP|2GN@QK88OgAjz4dR(i zOXs{#9AYI&AwDM_Gw6cEk6f2se&bwpSm2oAPEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdv%xp!>zPKSqF_U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTZ~UpV2qvfWcd!Z_S-s>l~*KK!#?ud;=UD z0;5IBUiWx+Z|B_p?P<;L2YjD$t8RNh&;S4elu1NER7l5dRy&RqF%Yft^n5faS0G?! z(v8su+<<`F5O5oWxB)^Why)_Ey9jXw^7-2ItM;p|c4Nu1%XZi2)vtBG-zpl+5h6?=;peAGWm6sCh~RR^08H5vd+ zP2yE+(nO0~XQ`1O!6zw14>^}$SvxF>W)KA193`YDVp2&5;K8_y)YZuOAMF5}U+owVGkc k+~7z56GY`;QT*fh2cxtdjfm!6fB*mh07*qoM6N<$f^c*TApigX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreFluxedEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreFluxedEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..fe71747592b9abb15555199c004abb72af9e7030 GIT binary patch literal 1122 zcmV-o1fBbdP)4Tx0C=2zkv&MmP!xqvQ$^7h2RjsT$WWauii$W&6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRBVqVy2!*FJ|CbU-#5WbroP|2GN@QK88OgAjz4dR(i zOXs{#9AYI&AwDM_Gw6cEk6f2se&bwpSm2oAPEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdv%xp!>zPKSqF_U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTZ~UpV2qvfWcd!Z_S-s>l~*KK!#?ud;=UD z0;5IBUiWx+Z|B_p?P<;L2YjD$t8RNh&;S4em`OxIR7l5dRXdIpK@7EPYCf7n5Hm9o z(rN=D0!~6oK*kL?0TMAMAwrt~!3L`hI0*ACQ_o#?yQ{aPR(;!ke*W=(zn8^gK^V8& zjn?b6u9?~AQi|_IMAtUkz#ijtI#EhV?;tN@^Z5O}UcUM8gRa-BKJEpWGP}cn_9g;Y zE|>K1?HyhJ9qH|-pLmyCfCb0&RHMea=YC+BFs=^ zv!TR3DvA~!t8fUm^Ss$?=yJK}2J8LZ-SbTfNS*QPGht?cbSo2-)&2ADKfCk!tY@Gr zM>E~AKsiVp5F0hpMC-fi2Ts@wdsQ+G0(?25jON-f;gB3}fgk(S6sj+q^CN|sf|(vQ zYC?-7S2EC&XjGIOdHX;3!mMx$pw+A>&NUGS%ywp|*_6!=2XRO1Sw!1(LX6 zX^z$xG1-VcM~wE=^RDPkctbqK%xIPGy9kSk2Ss_7FpYbS7yMKoSt<$-u4NuAVs5{VSF*ym=8bjl5^JKD6O(0K@!R*O)Ru&$0*3Q9na zvS3jfLoW0TEp~ktn_1xA(RzmW{9AI3()%XlK8Svh-gGN+G!09cW&1pnbKkW<54XZa z97=Lf&Rz8@QE^~IsX|XyO||KuqoF7Cp=;S0gQ0JuHmoP(L!Z%N_v`EH+TSwWe|*vh zv2DK8F8dNO$&AdQ-T(jq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitCorePrismaticNaquadahEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCorePrismaticNaquadahEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..0ac93ad9012d91a5f600aa3505cc782fd6f4fca5 GIT binary patch literal 1107 zcmV-Z1g!gsP)4Tx0C=2zkv&MmP!xqvQ$^7h2RjsT$WWauii$W&6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRBVqVy2!*FJ|CbU-#5WbroP|2GN@QK88OgAjz4dR(i zOXs{#9AYI&AwDM_Gw6cEk6f2se&bwpSm2oAPEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdv%xp!>zPKSqF_U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTZ~UpV2qvfWcd!Z_S-s>l~*KK!#?ud;=UD z0;5IBUiWx+Z|B_p?P<;L2YjD$t8RNh&;S4eiAh93R7l5dRmo}`K@62@dKLyl2;>WV z%FJASNe({v%L9g-lCvR@d_f2V0-3ese(I81t#(0EYfDd08}IjfSu7TWal74Uy4FF*d!^?KFES%4|CJN##FB7o&`NuTcD z^}?_8_2*x_D=xrl4?RM*kFhh~eh7$XzC|YY|zMSfCsv z4v38!X`=OA?*}f}40}~F4FY^!L>bMsVZtFf-U2`Nr72WjHs?nQI|^oc)Tjw9l3d9^ zOQBIwapdj);0v?DEr3?DqB_?^95CCNp=MJ;qk_mp^9?7h)s=Abg9;>Z!O|S9FJiJ0 zdyW|GCG)Q6O?X2*#>{Ay?^A@u#Dk)4mN1QbjTijXKeAL59$d>j*o3IzKwwFU*Q_ZM z6t#WQB7uTWN{AklEWxroG>T>vsbFcW53wI>5))5?wHReG_$6k$`(TpphGlX_!I3gM z%c${Lx$sJ7RC&1as6-+KE%v$DB1yS{bw`_46gm&V+G-JM64t%rm4X`3qbyjI#*hm= zLyKL`VlxZeJ6g~1%)ceqC_OhJ_d)c7WYew4(KIY&mhJOQ?sC@xJ=_WxaVW__Ij8DZ zqvF7bQiYzZn);@Lj)tC)L)Wr1219P6HmoP(L!Z%N_jrG&XrF)m(+9C_zSS;siJ0U` zzyAFGzs}FUS5&lb_Nl*2jVB5<^ieP+-s2l@NNBT%!$D$`SglqwE-g3As<#vwIP~Ob Z`78Fu|4^2KrYrye002ovPDHLkV1jn%2p<3d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreTranscendentEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreTranscendentEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..d4b7e5b68f4cc3c30dae1c5d13bb7eb3828a13ff GIT binary patch literal 1123 zcmV-p1f2VcP)4Tx0C=2zkv&MmP!xqvQ$^7h2RjsT$WWauii$W&6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRBVqVy2!*FJ|CbU-#5WbroP|2GN@QK88OgAjz4dR(i zOXs{#9AYI&AwDM_Gw6cEk6f2se&bwpSm2oAPEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdv%xp!>zPKSqF_U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTZ~UpV2qvfWcd!Z_S-s>l~*KK!#?ud;=UD z0;5IBUiWx+Z|B_p?P<;L2YjD$t8RNh&;S4enMp)JR7l5dRXdIpK@7EPYCf8nj1$aE zLa;|!xByomLr5zmQm#OTM9eiHAz2Zx#04OjZx{XC_1y02EvZ%Cwx6GWy5H~1VzCg6 z+wCUn_1e~|>T}n1zAvTNnllIX7^l-oQc89Qc^R9xuRh!5mtXJXdcE4?Rsfap4*&5@ z1h8B#<<0&<{+`bA{r5+_OD=%IF^D3f3l5@5PxZG~HjtDap zaVARaqoQcx@pv@BJkOiWMlP3&ZLr?o-96q)2U2JJ`Yf2$P}0f-W&Qr~$IspQe6};t zm7|&NSfCsv4v0xjsiN&&?*~oT40}^D4FY^QqKxKpP&g#VTj0k&RfXou>ikGymSCnw zjhRp*$(0PWBpDSYM_&IAzMvIu0kqPJ&bb!RfSG4RtyChTg2+VmjW$|4SEAJqCQynC zF4fWYA|{)t=Ll&}E$@b&!Ykr2W=5-g-$YnUJSfVugsI$Hyx^z)5mT|~;9AweCPa+} z0#lQC)tWRx(bcciNRZ%@6rzWcOR%gR7DY3POmL~J53wI>l8R1(HIcG1_$6k$`(Tpp z#4yD;Y6gm&VuGS*dB&>VK8wFiJ zkFvlhjUg9$h84Rui)j|PceI}2E&oieQF_~i+y~JQr8S*JPNrd5X4yW^hQ4aQGeCRV)?CxKFlDts)_VnH! z#J2fdyKGCuBv1PF>pu^&$SPl7e2|2AUFIa4+h)>uqEMobf~Da-zJYML4p!*la44}! ptX8WTm&^@X^_(JtLr;#D{|8*I0AhUu5m^8L002ovPDHLkV1n&a7PtTa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitCosmicEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCosmicEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..815e64b28f025b7b42076904cc7fbae4e0986b26 GIT binary patch literal 2574 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 C&KTMN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitPrismaticNaquadahEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitPrismaticNaquadahEnder.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/src/main/resources/assets/enderio/textures/blocks/liquidConduitPrismaticNaquadahEnder.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitTranscendentEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitTranscendentEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..4e40c1804ab1076981ab95e39e403c0e09cc17ba GIT binary patch literal 2774 zcmaJ@dt6e79zVp4@&P?Go1)-d57%f?W-n1_&GJ!7rppIDmTA5<9}`~)m|(cnP0gi- zSS_`(nNv$tG~dn)%}n!=k|wDsFy*2Fb`QH-pYHDU{&gOo^Z9+x_woClbBSnwTuWU~ z9RL6=8|$wf!6O;~)=<~21<#brai#zONeMW5lxTDGD4G}%<`)p`3jpMT#2+lIn~B;f z4yUbpx4_J`FLV&EVOXq#wmNCvMU^^k(b(8&)V=^~M-ozPfS!y`bB5`j_b?!-9TCG? zy1Q+9t!(Q|KCeubG)*KH#P9|6a-itcx3^!IK}zy`Z@${IC*NHs-m^CYov`(|%h_9O zYZJe5S1;K!n`qtFt}hdlz9DwzYl<(mM4mW+d8PI0>Pb6codfdhb{iwhorb1w=q(wf zTo1|wDavL1s?ldzc{|}7(^}zI%zw(!%pvC;yk4UBTEjJ0=ZSkkzwPC!`A)B`9YJ3N z-0RajhP1Oruiv;g(D=q0jZ;Hrjwf!u!A%KJ5el1#&dFWLKlnhLOEQu8C6t0)=K51! zRMwh39C>Rs{uq_*!Et>sC-NB%Wdkec$8Ce;ceK3!nY9?_o`!@#hZ|d?-LquWE(5gU zrX6F_n&S3V5l~myd*C(okvk`>`N_*Er9k;pYStbX&9kz>MyBP(+O-6B{* zVZ@!#ctQ^Vtk<;p`iK*GXzrR_hLhD+h7xx1qI6r^W9){@Bf>V#^{L02o2rg&x}Lf9 z+&ZpP52JsOptesd7qWDjjY6)rEU4K6Gr4(*!*H zLd^LHN_^0*Cm~^NPv^uq`G|(ON!M86Z3*mQWsO-)MZIZFU6nx+V^|QQ92u+`Qr>HK z=9=KzE&Vb~Ujq1fTp@{9JzS4Qo{JZ`DFUFuo}+W2%=X2HAvoO5>=mQK_9YjC7?;6|eUE-V zAWY8H2MPocTZK%eT;#c~Wxo6_1`yc6`M^Jia0QU(5b`tU9$edr& zMlCpYG2^LKU>#&-?A$(RaZpfJl~md}ZF=6PtgJBh!r1iBw8g@SyYJoCjKjpxC5Qr` z0QhmSBF&wDUaWX|x&6LnqNHDaJ6Y%Z5z6d^yW+e@6wXPiAr3+RM=FCzKRwoyYmRTV zeKg~Z@7YE`v0>8d3>Jgb^d+%(qNp~e9Ob{6gW$_n@^BBO+pe@nnoSltJ@jlt zRIck`3Xjy66k*s7&?wrbaIOk(+*v}RH3d}ordT=Si8vLh|A6`TCFXFQm+=mqE-&6+ z%h{K5WEs$ai*#9~!AILUQF`S|3VI;qome4YE(??^*(Lc68s6hk0r;MMjTOyue60lY z4O4gta2D!nYy6MtDo$x|(HUXoEu}{1C%Zn!ej2M1P6N3#FUPR+8EMP39T3kdxo7cp z{Wg3EvG}*OxA#&wZdBh|QF6;V9n12fw^YWC2^dT5BZWR~t>5&RXxF#}HzlRyl?pl*-)F>OcSg z0AS-A0$*$woX#3c5tep}K11{*3om5S^+)E5m+ib=jC0DjzEweZ7-EAn$G05p5Y#ZD zTuz{Pmfv;(b`I|gcOkVF9Cp)B#VBcxtC@aCnKTi;mY*oB8gsMPVVfo>L1o@uf$f88 z`*B611jaKeLomC!TIF@A+J;E-z3oQNt{U8I1w*%wpw6G0)X5O4UpGRka|rtzpHesh zz#l>WFITJuv4AFx>9y%eXgM!ze}CVcxZn@fc+>AK!iUUob9bNbzi6c-WC8Wf^2_v2 zL5=+nYaaydts6ZXvAnFd8+ucW>nIJ?e{{P2&ah)d9P3$lU{?3fNLHj%hKexPs0uQi7^y%@I%#182>bMvjUrR^8J9A zlD3enVwFe^9djEC5f#Vzhu7-pfcN@y=5jI7b_ZF3+wj#Yx;bahP@x%j!kFyNg|8cqe zH4l`F0OzYA4ef=3WlE_8DurTLLU^AATYh;DX65)`k_dPfUX>0=peNif9|Emobhm9v4i0MDqv$}|Mk7Eyy^b}u!KNr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitTranscendentEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitTranscendentEnder.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/src/main/resources/assets/enderio/textures/blocks/liquidConduitTranscendentEnder.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/enderio/textures/items/itemLiquidConduitCosmicEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitCosmicEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..fb478172fcecd6522e6149fc391dd913a2590957 GIT binary patch literal 1118 zcmV-k1flzhP)4Tx0C=2zkv&MmP!xqvQ$^7h2RjsT$WWauii$W&6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRBVqVy2!*FJ|CbU-#5WbroP|2GN@QK88OgAjz4dR(i zOXs{#9AYI&AwDM_Gw6cEk6f2se&bwpSm2oAPEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdv%xp!>zPKSqF_U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTZ~UpV2qvfWcd!Z_S-s>l~*KK!#?ud;=UD z0;5IBUiWx+Z|B_p?P<;L2YjD$t8RNh&;S4elu1NER7l5dRy&RqF%Yft^n5faS0G?! z(v8su+<<`F5O5oWxB)^Why)_Ey9jXw^7-2ItM;p|c4Nu1%XZi2)vtBG-zpl+5h6?=;peAGWm6sCh~RR^08H5vd+ zP2yE+(nO0~XQ`1O!6zw14>^}$SvxF>W)KA193`YDVp2&5;K8_y)YZuOAMF5}U+owVGkc k+~7z56GY`;QT*fh2cxtdjfm!6fB*mh07*qoM6N<$f^c*TApigX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/items/itemLiquidConduitFluxedEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitFluxedEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..fe71747592b9abb15555199c004abb72af9e7030 GIT binary patch literal 1122 zcmV-o1fBbdP)4Tx0C=2zkv&MmP!xqvQ$^7h2RjsT$WWauii$W&6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRBVqVy2!*FJ|CbU-#5WbroP|2GN@QK88OgAjz4dR(i zOXs{#9AYI&AwDM_Gw6cEk6f2se&bwpSm2oAPEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdv%xp!>zPKSqF_U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTZ~UpV2qvfWcd!Z_S-s>l~*KK!#?ud;=UD z0;5IBUiWx+Z|B_p?P<;L2YjD$t8RNh&;S4em`OxIR7l5dRXdIpK@7EPYCf7n5Hm9o z(rN=D0!~6oK*kL?0TMAMAwrt~!3L`hI0*ACQ_o#?yQ{aPR(;!ke*W=(zn8^gK^V8& zjn?b6u9?~AQi|_IMAtUkz#ijtI#EhV?;tN@^Z5O}UcUM8gRa-BKJEpWGP}cn_9g;Y zE|>K1?HyhJ9qH|-pLmyCfCb0&RHMea=YC+BFs=^ zv!TR3DvA~!t8fUm^Ss$?=yJK}2J8LZ-SbTfNS*QPGht?cbSo2-)&2ADKfCk!tY@Gr zM>E~AKsiVp5F0hpMC-fi2Ts@wdsQ+G0(?25jON-f;gB3}fgk(S6sj+q^CN|sf|(vQ zYC?-7S2EC&XjGIOdHX;3!mMx$pw+A>&NUGS%ywp|*_6!=2XRO1Sw!1(LX6 zX^z$xG1-VcM~wE=^RDPkctbqK%xIPGy9kSk2Ss_7FpYbS7yMKoSt<$-u4NuAVs5{VSF*ym=8bjl5^JKD6O(0K@!R*O)Ru&$0*3Q9na zvS3jfLoW0TEp~ktn_1xA(RzmW{9AI3()%XlK8Svh-gGN+G!09cW&1pnbKkW<54XZa z97=Lf&Rz8@QE^~IsX|XyO||KuqoF7Cp=;S0gQ0JuHmoP(L!Z%N_v`EH+TSwWe|*vh zv2DK8F8dNO$&AdQ-T(jq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/items/itemLiquidConduitPrismaticNaquadahEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitPrismaticNaquadahEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..0ac93ad9012d91a5f600aa3505cc782fd6f4fca5 GIT binary patch literal 1107 zcmV-Z1g!gsP)4Tx0C=2zkv&MmP!xqvQ$^7h2RjsT$WWauii$W&6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRBVqVy2!*FJ|CbU-#5WbroP|2GN@QK88OgAjz4dR(i zOXs{#9AYI&AwDM_Gw6cEk6f2se&bwpSm2oAPEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdv%xp!>zPKSqF_U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTZ~UpV2qvfWcd!Z_S-s>l~*KK!#?ud;=UD z0;5IBUiWx+Z|B_p?P<;L2YjD$t8RNh&;S4eiAh93R7l5dRmo}`K@62@dKLyl2;>WV z%FJASNe({v%L9g-lCvR@d_f2V0-3ese(I81t#(0EYfDd08}IjfSu7TWal74Uy4FF*d!^?KFES%4|CJN##FB7o&`NuTcD z^}?_8_2*x_D=xrl4?RM*kFhh~eh7$XzC|YY|zMSfCsv z4v38!X`=OA?*}f}40}~F4FY^!L>bMsVZtFf-U2`Nr72WjHs?nQI|^oc)Tjw9l3d9^ zOQBIwapdj);0v?DEr3?DqB_?^95CCNp=MJ;qk_mp^9?7h)s=Abg9;>Z!O|S9FJiJ0 zdyW|GCG)Q6O?X2*#>{Ay?^A@u#Dk)4mN1QbjTijXKeAL59$d>j*o3IzKwwFU*Q_ZM z6t#WQB7uTWN{AklEWxroG>T>vsbFcW53wI>5))5?wHReG_$6k$`(TpphGlX_!I3gM z%c${Lx$sJ7RC&1as6-+KE%v$DB1yS{bw`_46gm&V+G-JM64t%rm4X`3qbyjI#*hm= zLyKL`VlxZeJ6g~1%)ceqC_OhJ_d)c7WYew4(KIY&mhJOQ?sC@xJ=_WxaVW__Ij8DZ zqvF7bQiYzZn);@Lj)tC)L)Wr1219P6HmoP(L!Z%N_jrG&XrF)m(+9C_zSS;siJ0U` zzyAFGzs}FUS5&lb_Nl*2jVB5<^ieP+-s2l@NNBT%!$D$`SglqwE-g3As<#vwIP~Ob Z`78Fu|4^2KrYrye002ovPDHLkV1jn%2p<3d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/enderio/textures/items/itemLiquidConduitTranscendentEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitTranscendentEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..d4b7e5b68f4cc3c30dae1c5d13bb7eb3828a13ff GIT binary patch literal 1123 zcmV-p1f2VcP)4Tx0C=2zkv&MmP!xqvQ$^7h2RjsT$WWauii$W&6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRBVqVy2!*FJ|CbU-#5WbroP|2GN@QK88OgAjz4dR(i zOXs{#9AYI&AwDM_Gw6cEk6f2se&bwpSm2oAPEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdv%xp!>zPKSqF_U7%UF?eAmTZk_=CXW&X}`>PFL_LKB_ zTZ~UpV2qvfWcd!Z_S-s>l~*KK!#?ud;=UD z0;5IBUiWx+Z|B_p?P<;L2YjD$t8RNh&;S4enMp)JR7l5dRXdIpK@7EPYCf8nj1$aE zLa;|!xByomLr5zmQm#OTM9eiHAz2Zx#04OjZx{XC_1y02EvZ%Cwx6GWy5H~1VzCg6 z+wCUn_1e~|>T}n1zAvTNnllIX7^l-oQc89Qc^R9xuRh!5mtXJXdcE4?Rsfap4*&5@ z1h8B#<<0&<{+`bA{r5+_OD=%IF^D3f3l5@5PxZG~HjtDap zaVARaqoQcx@pv@BJkOiWMlP3&ZLr?o-96q)2U2JJ`Yf2$P}0f-W&Qr~$IspQe6};t zm7|&NSfCsv4v0xjsiN&&?*~oT40}^D4FY^QqKxKpP&g#VTj0k&RfXou>ikGymSCnw zjhRp*$(0PWBpDSYM_&IAzMvIu0kqPJ&bb!RfSG4RtyChTg2+VmjW$|4SEAJqCQynC zF4fWYA|{)t=Ll&}E$@b&!Ykr2W=5-g-$YnUJSfVugsI$Hyx^z)5mT|~;9AweCPa+} z0#lQC)tWRx(bcciNRZ%@6rzWcOR%gR7DY3POmL~J53wI>l8R1(HIcG1_$6k$`(Tpp z#4yD;Y6gm&VuGS*dB&>VK8wFiJ zkFvlhjUg9$h84Rui)j|PceI}2E&oieQF_~i+y~JQr8S*JPNrd5X4yW^hQ4aQGeCRV)?CxKFlDts)_VnH! z#J2fdyKGCuBv1PF>pu^&$SPl7e2|2AUFIa4+h)>uqEMobf~Da-zJYML4p!*la44}! ptX8WTm&^@X^_(JtLr;#D{|8*I0AhUu5m^8L002ovPDHLkV1n&a7PtTa literal 0 HcmV?d00001