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 00000000..fb478172 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreCosmicEnder.png differ 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 00000000..fe717475 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreFluxedEnder.png differ 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 00000000..0ac93ad9 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCorePrismaticNaquadahEnder.png differ 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 00000000..d4b7e5b6 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreTranscendentEnder.png differ 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 00000000..815e64b2 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCosmicEnder.png differ diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitCosmicEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCosmicEnder.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCosmicEnder.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/liquidConduitFluxedEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitFluxedEnder.png new file mode 100644 index 00000000..7b28260d Binary files /dev/null and b/src/main/resources/assets/enderio/textures/blocks/liquidConduitFluxedEnder.png differ diff --git a/src/main/resources/assets/enderio/textures/blocks/liquidConduitFluxedEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitFluxedEnder.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/src/main/resources/assets/enderio/textures/blocks/liquidConduitFluxedEnder.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/liquidConduitPrismaticNaquadahEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitPrismaticNaquadahEnder.png new file mode 100644 index 00000000..727847dd Binary files /dev/null and b/src/main/resources/assets/enderio/textures/blocks/liquidConduitPrismaticNaquadahEnder.png differ 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 00000000..4e40c180 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/blocks/liquidConduitTranscendentEnder.png differ 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 00000000..fb478172 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitCosmicEnder.png differ 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 00000000..fe717475 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitFluxedEnder.png differ 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 00000000..0ac93ad9 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitPrismaticNaquadahEnder.png differ 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 00000000..d4b7e5b6 Binary files /dev/null and b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitTranscendentEnder.png differ