Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b64da3023 | ||
|
|
6e49033fc8 | ||
|
|
749ea96c62 | ||
|
|
f4dfa9e6cf | ||
|
|
30958c201a |
No files matched your search
@@ -14,6 +14,7 @@ dependencies {
|
||||
compileOnly('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.48-GTNH:dev') {transitive = false}
|
||||
runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:Backhand:1.8.14:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:Dashboard:1.0.19:api")
|
||||
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-999-GTNH:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.22-GTNH:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.129:dev') {transitive = false}
|
||||
|
||||
@@ -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;
|
||||
@@ -58,6 +62,7 @@ import crazypants.enderio.gui.TooltipHandlerBurnTime;
|
||||
import crazypants.enderio.gui.TooltipHandlerFluid;
|
||||
import crazypants.enderio.gui.TooltipHandlerGrinding;
|
||||
import crazypants.enderio.item.ConduitProbeOverlayRenderer;
|
||||
import crazypants.enderio.item.DashboardHud;
|
||||
import crazypants.enderio.item.KeyTracker;
|
||||
import crazypants.enderio.item.ToolTickHandler;
|
||||
import crazypants.enderio.item.YetaWrenchOverlayRenderer;
|
||||
@@ -203,6 +208,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();
|
||||
@@ -401,6 +410,9 @@ public class ClientProxy extends CommonProxy {
|
||||
|
||||
new YetaWrenchOverlayRenderer();
|
||||
new ConduitProbeOverlayRenderer();
|
||||
if (EnderIO.hasDashboard) {
|
||||
DashboardHud.register();
|
||||
}
|
||||
if (Config.useSneakMouseWheelYetaWrench) {
|
||||
ToolTickHandler th = new ToolTickHandler();
|
||||
MinecraftForge.EVENT_BUS.register(th);
|
||||
|
||||
@@ -192,6 +192,7 @@ import crazypants.util.EE3Util;
|
||||
after:Thaumcraft;\
|
||||
after:appliedenergistics2@[rv2-beta-8,);\
|
||||
after:Railcraft@[9.16.7,);\
|
||||
after:dashboard@[1.0.19,);\
|
||||
after:betterbuilderswands@[0.13.12,)\
|
||||
""", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
|
||||
public class EnderIO {
|
||||
@@ -219,6 +220,7 @@ public class EnderIO {
|
||||
public static final boolean hasEtFuturum = Loader.isModLoaded("etfuturum");
|
||||
public static final boolean hasWailaPlugins = Loader.isModLoaded("wailaplugins");
|
||||
public static final boolean hasAutomagy = Loader.isModLoaded("Automagy");
|
||||
public static final boolean hasDashboard = Loader.isModLoaded("dashboard");
|
||||
|
||||
// Materials
|
||||
public static ItemCapacitor itemBasicCapacitor;
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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");
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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,
|
||||
|
||||
@@ -38,15 +38,24 @@ public class ConduitProbeOverlayRenderer {
|
||||
}
|
||||
|
||||
private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedProbe) {
|
||||
if (EnderIO.hasDashboard && !DashboardHud.beginProbe(event.resolution)) {
|
||||
return;
|
||||
}
|
||||
draw(equippedProbe.getItemDamage() == 0, event.resolution);
|
||||
if (EnderIO.hasDashboard) {
|
||||
DashboardHud.endRender();
|
||||
}
|
||||
}
|
||||
|
||||
static void draw(boolean probeMode, ScaledResolution res) {
|
||||
IconEIO icon1, icon2;
|
||||
if (equippedProbe.getItemDamage() == 0) {
|
||||
if (probeMode) {
|
||||
icon1 = IconEIO.PROBE_OVERLAY_PROBE;
|
||||
icon2 = IconEIO.PROBE_OVERLAY_COPY_OFF;
|
||||
} else {
|
||||
icon1 = IconEIO.PROBE_OVERLAY_PROBE_OFF;
|
||||
icon2 = IconEIO.PROBE_OVERLAY_COPY;
|
||||
}
|
||||
ScaledResolution res = event.resolution;
|
||||
|
||||
double offsetX = res.getScaledWidth() - 48;
|
||||
double offsetY = res.getScaledHeight() - 16;
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
package crazypants.enderio.item;
|
||||
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.gtnewhorizons.dashboard.api.HudBounds;
|
||||
import com.gtnewhorizons.dashboard.api.HudElement;
|
||||
import com.gtnewhorizons.dashboard.api.HudRegistry;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.conduit.ConduitDisplayMode;
|
||||
import crazypants.enderio.config.Config;
|
||||
|
||||
/**
|
||||
* Lets players move, resize and hide the Conduit Probe and Yeta Wrench HUD in Dashboard's HUD editor. The only class
|
||||
* using Dashboard, so only call it while Dashboard is loaded.
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public final class DashboardHud {
|
||||
|
||||
private static final HudElement PROBE = new HudElement(
|
||||
"enderio:conduit_probe",
|
||||
(screenWidth, screenHeight) -> new HudBounds(screenWidth - 80, screenHeight - 48, 64, 32));
|
||||
|
||||
/** Only with the default overlay, which shows it for a moment after switching. */
|
||||
private static final HudElement WRENCH_SELECTOR = new HudElement(
|
||||
"enderio:yeta_wrench_selector",
|
||||
(screenWidth, screenHeight) -> new HudBounds(screenWidth / 2 - 22, screenHeight / 2 - 24, 44, 16))
|
||||
.setActiveCheck(() -> Config.yetaWrenchOverlayMode == 0);
|
||||
|
||||
/** The corner icon, the column or the group of icons, depending on the overlay setting. */
|
||||
private static final HudElement WRENCH_MODE = new HudElement(
|
||||
"enderio:yeta_wrench_mode",
|
||||
DashboardHud::getWrenchModeBounds);
|
||||
|
||||
private DashboardHud() {}
|
||||
|
||||
public static void register() {
|
||||
PROBE.setPreview((screenWidth, screenHeight) -> HudRegistry.render(PROBE, () -> {
|
||||
ConduitProbeOverlayRenderer.draw(true, HudRegistry.getResolution());
|
||||
GL11.glColor4f(1, 1, 1, 1);
|
||||
}));
|
||||
WRENCH_SELECTOR.setPreview(
|
||||
(screenWidth, screenHeight) -> HudRegistry.render(
|
||||
WRENCH_SELECTOR,
|
||||
() -> YetaWrenchOverlayRenderer
|
||||
.draw(ConduitDisplayMode.ALL, HudRegistry.getResolution(), true)));
|
||||
WRENCH_MODE.setPreview(
|
||||
(screenWidth, screenHeight) -> HudRegistry.render(
|
||||
WRENCH_MODE,
|
||||
() -> YetaWrenchOverlayRenderer
|
||||
.draw(ConduitDisplayMode.ALL, HudRegistry.getResolution(), false)));
|
||||
HudRegistry.register(PROBE);
|
||||
HudRegistry.register(WRENCH_SELECTOR);
|
||||
HudRegistry.register(WRENCH_MODE);
|
||||
}
|
||||
|
||||
/** False means the player hid it, so skip drawing it and do not call {@link #endRender()}. */
|
||||
static boolean beginProbe(ScaledResolution resolution) {
|
||||
return HudRegistry.beginRender(PROBE, resolution);
|
||||
}
|
||||
|
||||
/** The selector while it shows, otherwise the corner icon, the column or the group of icons. */
|
||||
static boolean beginWrench(ScaledResolution resolution, boolean showSelector) {
|
||||
return HudRegistry.beginRender(showSelector ? WRENCH_SELECTOR : WRENCH_MODE, resolution);
|
||||
}
|
||||
|
||||
static void endRender() {
|
||||
HudRegistry.endRender();
|
||||
}
|
||||
|
||||
/** Measured like YetaWrenchOverlayRenderer draws each overlay. */
|
||||
private static HudBounds getWrenchModeBounds(int screenWidth, int screenHeight) {
|
||||
int modeCount = ConduitDisplayMode.registrySize();
|
||||
return switch (Config.yetaWrenchOverlayMode) {
|
||||
case 1 -> new HudBounds(screenWidth - 17, screenHeight - modeCount * 18 - 6, 24, modeCount * 18 + 6);
|
||||
case 2 -> new HudBounds(screenWidth - modeCount * 8 - 16, screenHeight - 40, (modeCount + 1) / 2 * 16, 32);
|
||||
default -> new HudBounds(screenWidth - 20, screenHeight - 20, 16, 16);
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import com.enderio.core.client.render.RenderUtil;
|
||||
import com.enderio.core.common.vecmath.Vector4f;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.api.tool.IConduitControl;
|
||||
import crazypants.enderio.conduit.ConduitDisplayMode;
|
||||
import crazypants.enderio.config.Config;
|
||||
@@ -57,20 +58,28 @@ public class YetaWrenchOverlayRenderer {
|
||||
lastTick = ClientHandler.getTicksElapsed();
|
||||
}
|
||||
|
||||
ScaledResolution res = event.resolution;
|
||||
boolean showSelector = displayTickCount > 0 && Config.yetaWrenchOverlayMode == 0;
|
||||
if (showSelector && lastTick < ClientHandler.getTicksElapsed()) {
|
||||
lastTick++;
|
||||
displayTickCount--;
|
||||
}
|
||||
if (EnderIO.hasDashboard && !DashboardHud.beginWrench(event.resolution, showSelector)) {
|
||||
return;
|
||||
}
|
||||
draw(mode, event.resolution, showSelector);
|
||||
if (EnderIO.hasDashboard) {
|
||||
DashboardHud.endRender();
|
||||
}
|
||||
}
|
||||
|
||||
static void draw(ConduitDisplayMode mode, ScaledResolution res, boolean showSelector) {
|
||||
Tessellator tess = Tessellator.instance;
|
||||
int modeCount = ConduitDisplayMode.registrySize();
|
||||
Iterable<ConduitDisplayMode> renderable = ConduitDisplayMode.getRenderableModes();
|
||||
|
||||
switch (Config.yetaWrenchOverlayMode) {
|
||||
case 0:
|
||||
if (displayTickCount > 0) {
|
||||
|
||||
if (lastTick < ClientHandler.getTicksElapsed()) {
|
||||
lastTick++;
|
||||
displayTickCount--;
|
||||
}
|
||||
|
||||
if (showSelector) {
|
||||
int x = res.getScaledWidth() / 2 - 8;
|
||||
int y = res.getScaledHeight() / 2 - 24;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
@@ -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
|
||||
]
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 2.7 KiB |
@@ -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
|
||||
]
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 2.7 KiB |
@@ -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
|
||||
]
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 2.7 KiB |
@@ -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
|
||||
]
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |