Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57ba3ac516 | ||
|
|
8d379aff8c | ||
|
|
8255c261ee | ||
|
|
21717fa939 | ||
|
|
d96c045ba3 |
No files matched your search
@@ -3,9 +3,9 @@ name: Build and test
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ master, main, release/** ]
|
||||
branches: [ master, main ]
|
||||
push:
|
||||
branches: [ master, main, release/** ]
|
||||
branches: [ master, main ]
|
||||
|
||||
jobs:
|
||||
build-and-test:
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
dependencies {
|
||||
api('com.github.GTNewHorizons:EnderCore:0.5.15:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.37:dev')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.148-GTNH:dev')
|
||||
compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.130-GTNH:dev')
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.11.45:dev")
|
||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.63:dev')
|
||||
api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
@@ -145,7 +153,6 @@ public final class Config {
|
||||
public static int travelAnchorCooldown = 0;
|
||||
public static boolean travelAnchorSneak = true;
|
||||
public static boolean travelAnchorSkipWarning = true;
|
||||
public static double travelAnchorSnapAngle = 0.175;
|
||||
|
||||
public static int travelStaffMaxDistance = 128;
|
||||
public static float travelStaffPowerPerBlockRF = 250;
|
||||
@@ -1005,6 +1012,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,
|
||||
@@ -1168,14 +1234,6 @@ public final class Config {
|
||||
"Travel Anchors send a chat warning when skipping inaccessible anchors")
|
||||
.getBoolean(travelAnchorSkipWarning);
|
||||
|
||||
travelAnchorSnapAngle = Math.toRadians(
|
||||
config.get(
|
||||
sectionAnchor.name,
|
||||
"travelAnchorSnapAngle",
|
||||
Math.round(Math.toDegrees(travelAnchorSnapAngle)),
|
||||
"The maximum angle to snap to an anchor when selecting target")
|
||||
.getDouble(Math.toDegrees(travelAnchorSnapAngle)));
|
||||
|
||||
travelStaffMaxDistance = config
|
||||
.get(
|
||||
sectionStaff.name,
|
||||
|
||||
@@ -41,7 +41,7 @@ public class TileAlloySmelter extends AbstractPoweredTaskEntity {
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockAlloySmelter.name";
|
||||
return "Alloy Smelter";
|
||||
}
|
||||
|
||||
public Mode getMode() {
|
||||
|
||||
@@ -33,12 +33,6 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl
|
||||
super(new SlotDefinition(9, 0, 0));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
// getMachineName will return the key without the suffix ".name"
|
||||
return getMachineName() + ".name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return BlockItemBuffer.Type.get(this).getUnlocalizedName();
|
||||
|
||||
@@ -54,11 +54,6 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf
|
||||
setCapacitor(new BasicCapacitor(0, io * 4, refCap.getMaxEnergyStored(), io));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockCrafter.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockCrafter.unlocalisedName;
|
||||
|
||||
@@ -28,7 +28,7 @@ public class TileCrusher extends AbstractPoweredTaskEntity {
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockSagMill.name";
|
||||
return ModObject.blockSagMill.unlocalisedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,6 +16,7 @@ import com.gtnewhorizon.gtnhlib.geometry.CubeIterator;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import crazypants.enderio.Log;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.TileEntityEio;
|
||||
import crazypants.enderio.config.Config;
|
||||
import crazypants.enderio.machine.obelisk.xp.TileExperienceObelisk;
|
||||
@@ -299,7 +300,7 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory {
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockEnchanter.name";
|
||||
return ModObject.blockEnchanter.unlocalisedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -822,7 +822,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockFarmStation.name";
|
||||
return EnderIO.blockFarmStation.getLocalizedName();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -90,11 +90,6 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements
|
||||
return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockCombustionGenerator.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockCombustionGenerator.unlocalisedName;
|
||||
|
||||
@@ -42,7 +42,7 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockStirlingGenerator.name";
|
||||
return "Stirling Generator";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -93,11 +93,6 @@ public class TileZombieGenerator extends AbstractGeneratorEntity
|
||||
minimumTankLevel = (int) (fuelTank.getCapacity() * 0.7F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockZombieGenerator.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockZombieGenerator.unlocalisedName;
|
||||
|
||||
@@ -11,6 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.enderio.core.common.util.InventoryWrapper;
|
||||
|
||||
import crazypants.enderio.ModObject;
|
||||
|
||||
public class CompositeInventory implements ISidedInventory {
|
||||
|
||||
private final List<InvEntry> inventories = new ArrayList<>();
|
||||
@@ -155,7 +157,7 @@ public class CompositeInventory implements ISidedInventory {
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockHyperCube.name";
|
||||
return ModObject.blockHyperCube.unlocalisedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -26,6 +26,7 @@ import com.enderio.core.common.util.PlayerUtil;
|
||||
import com.enderio.core.common.vecmath.VecmathUtil;
|
||||
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.TileEntityEio;
|
||||
import crazypants.enderio.config.Config;
|
||||
import crazypants.enderio.machine.IRedstoneModeControlable;
|
||||
@@ -768,7 +769,7 @@ public class TileHyperCube extends TileEntityEio
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockHyperCube.name";
|
||||
return ModObject.blockHyperCube.unlocalisedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -369,11 +369,6 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH
|
||||
nbtRoot.setBoolean("active", active);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockInventoryPanel.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockInventoryPanel.unlocalisedName;
|
||||
|
||||
@@ -157,11 +157,6 @@ public class TileKillerJoe extends AbstractMachineEntity
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockKillerJoe.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockKillerJoe.unlocalisedName;
|
||||
|
||||
@@ -101,7 +101,7 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockPowerMonitor.name";
|
||||
return EnderIO.blockPowerMonitor.getUnlocalizedName();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -126,11 +126,6 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange
|
||||
setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockAttractor.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockAttractor.unlocalisedName;
|
||||
|
||||
@@ -106,11 +106,6 @@ public class TileAversionObelisk extends AbstractPowerConsumerEntity implements
|
||||
bounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockSpawnGuard.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockSpawnGuard.unlocalisedName;
|
||||
|
||||
@@ -19,11 +19,6 @@ public class TileInhibitorObelisk extends AbstractPowerConsumerEntity implements
|
||||
super(new SlotDefinition(0, 0, 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockInhibitorObelisk.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockInhibitorObelisk.unlocalisedName;
|
||||
|
||||
@@ -121,11 +121,6 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
|
||||
setCapacitor(Capacitors.ACTIVATED_CAPACITOR);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockWeatherObelisk.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockWeatherObelisk.unlocalisedName;
|
||||
|
||||
@@ -32,11 +32,6 @@ public class TileExperienceObelisk extends AbstractMachineEntity
|
||||
super(new SlotDefinition(0, 0, 0));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockExperienceObelisk.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockExperienceObelisk.unlocalisedName;
|
||||
|
||||
@@ -32,7 +32,7 @@ public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISid
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockPainter.name";
|
||||
return "Auto Painter";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -100,11 +100,6 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
|
||||
super(new SlotDefinition(8, 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockSliceAndSplice.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockSliceAndSplice.unlocalisedName;
|
||||
|
||||
@@ -113,11 +113,6 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx
|
||||
return xpCont;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockSoulBinder.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockSoulBinder.unlocalisedName;
|
||||
|
||||
@@ -197,11 +197,6 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity implements IRa
|
||||
forceClientUpdate = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockPoweredSpawner.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockPoweredSpawner.unlocalisedName;
|
||||
|
||||
@@ -225,11 +225,6 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT
|
||||
this.voidMode = mode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockTank.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return "tank";
|
||||
|
||||
@@ -157,11 +157,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockTransceiver.name";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockTransceiver.unlocalisedName;
|
||||
|
||||
@@ -24,6 +24,7 @@ import com.enderio.core.common.vecmath.Vector3d;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.TileEntityEio;
|
||||
import crazypants.enderio.conduit.item.FilterRegister;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
@@ -211,7 +212,7 @@ public class TileVacuumChest extends TileEntityEio
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockVacuumChest.name";
|
||||
return ModObject.blockVacuumChest.unlocalisedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -42,7 +42,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler,
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "tile.blockVat.name";
|
||||
return ModObject.blockVat.unlocalisedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -78,16 +78,6 @@ public class NEIEnderIOConfig implements IConfigureNEI {
|
||||
API.hideItem(new ItemStack(EnderIO.itemGasConduit));
|
||||
}
|
||||
API.hideItem(new ItemStack(EnderIO.blockHyperCube));
|
||||
|
||||
API.hideItem(new ItemStack(EnderIO.blockNutrientDistillation));
|
||||
API.hideItem(new ItemStack(EnderIO.blockHootch));
|
||||
API.hideItem(new ItemStack(EnderIO.blockRocketFuel));
|
||||
API.hideItem(new ItemStack(EnderIO.blockFireWater));
|
||||
API.hideItem(new ItemStack(EnderIO.blockLiquidSunshine));
|
||||
API.hideItem(new ItemStack(EnderIO.blockCloudSeed));
|
||||
API.hideItem(new ItemStack(EnderIO.blockCloudSeedConcentrated));
|
||||
API.hideItem(new ItemStack(EnderIO.blockEnderDistillation));
|
||||
API.hideItem(new ItemStack(EnderIO.blockVapourOfLevity));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package crazypants.enderio.nei;
|
||||
|
||||
import java.awt.Point;
|
||||
import java.awt.Rectangle;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
@@ -8,6 +9,7 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
@@ -15,13 +17,17 @@ import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.enderio.core.client.render.RenderUtil;
|
||||
import com.enderio.core.common.util.FluidUtil;
|
||||
|
||||
import codechicken.lib.gui.GuiDraw;
|
||||
import codechicken.nei.ItemStackMap;
|
||||
import codechicken.nei.PositionedStack;
|
||||
import codechicken.nei.recipe.StackInfo;
|
||||
import codechicken.nei.recipe.GuiCraftingRecipe;
|
||||
import codechicken.nei.recipe.GuiRecipe;
|
||||
import codechicken.nei.recipe.GuiUsageRecipe;
|
||||
import codechicken.nei.recipe.TemplateRecipeHandler;
|
||||
import crazypants.enderio.fluid.Fluids;
|
||||
import crazypants.enderio.gui.GuiContainerBaseEIO;
|
||||
import crazypants.enderio.machine.recipe.IRecipe;
|
||||
import crazypants.enderio.machine.recipe.RecipeInput;
|
||||
@@ -32,6 +38,9 @@ import crazypants.util.ColorUtils;
|
||||
|
||||
public class VatRecipeHandler extends TemplateRecipeHandler {
|
||||
|
||||
private final Rectangle inTankBounds = new Rectangle(25, 1, 15, 47);
|
||||
private final Rectangle outTankBounds = new Rectangle(127, 1, 15, 47);
|
||||
|
||||
public VatRecipeHandler() {}
|
||||
|
||||
@Override
|
||||
@@ -85,7 +94,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
|
||||
|
||||
@Override
|
||||
public void loadCraftingRecipes(ItemStack result) {
|
||||
FluidStack fluid = getFluidFromNeiItem(result);
|
||||
FluidStack fluid = FluidUtil.getFluidFromItem(result);
|
||||
if (fluid != null) {
|
||||
loadCraftingRecipes(fluid);
|
||||
}
|
||||
@@ -113,7 +122,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
|
||||
|
||||
@Override
|
||||
public void loadUsageRecipes(ItemStack ingredient) {
|
||||
FluidStack fluid = getFluidFromNeiItem(ingredient);
|
||||
FluidStack fluid = FluidUtil.getFluidFromItem(ingredient);
|
||||
if (fluid != null) {
|
||||
loadUsageRecipes(fluid);
|
||||
}
|
||||
@@ -150,37 +159,109 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
|
||||
@Override
|
||||
public void drawExtras(int recipeIndex) {
|
||||
InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex);
|
||||
if (rec.inFluid != null && rec.inFluid.getFluid() != null) {
|
||||
RenderUtil.renderGuiTank(
|
||||
rec.inFluid,
|
||||
FluidContainerRegistry.BUCKET_VOLUME * 8,
|
||||
rec.getInputFluidAmount(),
|
||||
inTankBounds.x,
|
||||
inTankBounds.y,
|
||||
0,
|
||||
inTankBounds.width,
|
||||
inTankBounds.height);
|
||||
}
|
||||
|
||||
if (rec.result != null && rec.result.getFluid() != null) {
|
||||
RenderUtil.renderGuiTank(
|
||||
rec.result,
|
||||
FluidContainerRegistry.BUCKET_VOLUME * 8,
|
||||
rec.getResultFluidAmount(),
|
||||
outTankBounds.x,
|
||||
outTankBounds.y,
|
||||
0,
|
||||
outTankBounds.width,
|
||||
outTankBounds.height);
|
||||
}
|
||||
|
||||
String energyString = PowerDisplayUtil.formatPower(rec.energy) + " " + PowerDisplayUtil.abrevation();
|
||||
GuiDraw.drawStringC(energyString, 86, 54, ColorUtils.neiEnergyString.getColor(), false);
|
||||
|
||||
Fluid outputFluid = rec.resultFluid.getFluid();
|
||||
Fluid outputFluid = rec.result.getFluid();
|
||||
List<PositionedStack> stacks = rec.getIngredients();
|
||||
for (PositionedStack ps : stacks) {
|
||||
if (ps instanceof PositionedStack.Tank) {
|
||||
continue;
|
||||
}
|
||||
float mult = VatRecipeManager.getInstance()
|
||||
.getMultiplierForInput(rec.inFluid.getFluid(), ps.item, outputFluid);
|
||||
GuiDraw.drawStringC(
|
||||
"x" + mult,
|
||||
ps.relx + 8,
|
||||
ps.rely + 19,
|
||||
ColorUtils.neiMultiplierString.getColor(),
|
||||
false);
|
||||
String str = "x" + mult;
|
||||
GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, ColorUtils.neiMultiplierString.getColor(), false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static FluidStack getFluidFromNeiItem(ItemStack stack) {
|
||||
FluidStack fluid = StackInfo.getFluid(stack);
|
||||
return fluid != null ? fluid : FluidUtil.getFluidFromItem(stack);
|
||||
@Override
|
||||
public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
private static FluidStack withAmount(FluidStack fluid, int amount) {
|
||||
FluidStack copy = fluid.copy();
|
||||
copy.amount = amount;
|
||||
return copy;
|
||||
@Override
|
||||
public List<String> handleTooltip(GuiRecipe<?> gui, List<String> currenttip, int recipeIndex) {
|
||||
final InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex);
|
||||
final Point pos = GuiDraw.getMousePosition();
|
||||
final Point offset = gui.getRecipePosition(recipeIndex);
|
||||
final Point relMouse = new Point(pos.x - gui.guiLeft - offset.x, pos.y - gui.guiTop - offset.y);
|
||||
|
||||
if (inTankBounds.contains(relMouse) && rec.inFluid != null && rec.inFluid.getFluid() != null) {
|
||||
currenttip.add(rec.inFluid.getFluid().getLocalizedName(rec.inFluid));
|
||||
currenttip.add(EnumChatFormatting.GRAY.toString() + rec.getInputFluidAmount() + " " + Fluids.MB());
|
||||
} else if (outTankBounds.contains(relMouse) && rec.result != null && rec.result.getFluid() != null) {
|
||||
currenttip.add(rec.result.getFluid().getLocalizedName(rec.result));
|
||||
currenttip.add(EnumChatFormatting.GRAY.toString() + rec.getResultFluidAmount() + " " + Fluids.MB());
|
||||
}
|
||||
|
||||
return super.handleTooltip(gui, currenttip, recipeIndex);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseClicked(GuiRecipe<?> gui, int button, int recipeIndex) {
|
||||
if (button == 0) {
|
||||
if (this.transferFluidTanks(gui, recipeIndex, false)) {
|
||||
return true;
|
||||
}
|
||||
} else if (button == 1) {
|
||||
if (this.transferFluidTanks(gui, recipeIndex, true)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return super.mouseClicked(gui, button, recipeIndex);
|
||||
}
|
||||
|
||||
private boolean transferFluidTanks(GuiRecipe<?> gui, int recipeIndex, boolean usage) {
|
||||
InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex);
|
||||
Point pos = GuiDraw.getMousePosition();
|
||||
Point offset = gui.getRecipePosition(recipeIndex);
|
||||
Point relMouse = new Point(pos.x - gui.guiLeft - offset.x, pos.y - gui.guiTop - offset.y);
|
||||
|
||||
if (inTankBounds.contains(relMouse)) {
|
||||
transferFluidTank(rec.inFluid, usage);
|
||||
} else if (outTankBounds.contains(relMouse)) {
|
||||
transferFluidTank(rec.result, usage);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean transferFluidTank(FluidStack tank, boolean usage) {
|
||||
if (tank != null && tank.amount > 0) {
|
||||
if (usage) {
|
||||
if (!GuiUsageRecipe.openRecipeGui("liquid", new Object[] { tank.copy() })) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
if (!GuiCraftingRecipe.openRecipeGui("liquid", new Object[] { tank.copy() })) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public List<ItemStack> getInputs(RecipeInput input) {
|
||||
@@ -198,32 +279,20 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
|
||||
public class InnerVatRecipe extends TemplateRecipeHandler.CachedRecipe {
|
||||
|
||||
private final List<PositionedStack> inputs = new ArrayList<>();
|
||||
private final ItemStackMap<Float> firstItemMultiplier = new ItemStackMap<Float>();
|
||||
private final ItemStackMap<Float> secondItemMultiplier = new ItemStackMap<Float>();
|
||||
private final ItemStackMap<Float> firstItemMultiplier = new ItemStackMap();
|
||||
private final ItemStackMap<Float> secondItemMultiplier = new ItemStackMap();
|
||||
private final Map<FluidStack, Float> fluidMultiplier = new HashMap<>();
|
||||
private final FluidStack resultFluid;
|
||||
private final int energy;
|
||||
private final FluidStack result;
|
||||
private FluidStack inFluid;
|
||||
|
||||
private int inTankIndex = -1;
|
||||
private int lastInputAmount;
|
||||
private PositionedStack resultTank;
|
||||
private int lastResultAmount;
|
||||
|
||||
public int getEnergy() {
|
||||
return energy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PositionedStack> getIngredients() {
|
||||
if (this.inTankIndex >= 0) {
|
||||
int amount = getInputFluidAmount();
|
||||
if (amount != this.lastInputAmount) {
|
||||
this.lastInputAmount = amount;
|
||||
this.inputs.set(this.inTankIndex, createTank(withAmount(this.inFluid, amount), 25, 1));
|
||||
}
|
||||
}
|
||||
return this.inputs;
|
||||
return getCycledIngredients(cycleticks / 30, this.inputs);
|
||||
}
|
||||
|
||||
public int getInputFluidAmount() {
|
||||
@@ -252,12 +321,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
|
||||
|
||||
@Override
|
||||
public PositionedStack getResult() {
|
||||
int amount = getResultFluidAmount();
|
||||
if (amount != this.lastResultAmount || this.resultTank == null) {
|
||||
this.lastResultAmount = amount;
|
||||
this.resultTank = createTank(withAmount(this.resultFluid, amount), 127, 1);
|
||||
}
|
||||
return this.resultTank;
|
||||
return null;
|
||||
}
|
||||
|
||||
public InnerVatRecipe(int energy, RecipeInput[] ingredients, FluidStack result) {
|
||||
@@ -291,28 +355,15 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
|
||||
|
||||
}
|
||||
|
||||
// Item stacks must stay at indices 0/1: getFirstItemMultiplier()/getSecondItemMultiplier() rely on it.
|
||||
if (!inputsOne.isEmpty()) {
|
||||
this.inputs.add(new PositionedStack(inputsOne, 51, 1));
|
||||
}
|
||||
if (!inputsTwo.isEmpty()) {
|
||||
this.inputs.add(new PositionedStack(inputsTwo, 100, 1));
|
||||
}
|
||||
|
||||
this.energy = energy;
|
||||
this.resultFluid = result;
|
||||
|
||||
if (this.inFluid != null) {
|
||||
this.inTankIndex = this.inputs.size();
|
||||
this.lastInputAmount = getInputFluidAmount();
|
||||
this.inputs.add(createTank(withAmount(this.inFluid, this.lastInputAmount), 25, 1));
|
||||
}
|
||||
|
||||
this.lastResultAmount = getResultFluidAmount();
|
||||
this.resultTank = createTank(withAmount(this.resultFluid, this.lastResultAmount), 127, 1);
|
||||
}
|
||||
|
||||
private static PositionedStack.Tank createTank(FluidStack fluid, int x, int y) {
|
||||
return new PositionedStack.Tank(fluid, x, y, 15, 47, FluidContainerRegistry.BUCKET_VOLUME * 8);
|
||||
this.result = result;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -741,10 +741,7 @@ public class TravelController {
|
||||
|
||||
for (Table.Cell<Double, Double, BlockCoord> cell : possibleDestinations.cellSet()) {
|
||||
if (cell.getColumnKey() <= maxDistance) {
|
||||
// If the client hasn't selected a target, the server shouldn't try to force one,
|
||||
// but checking if there is one just outside of range (below message) might still
|
||||
// be useful.
|
||||
return Optional.empty();
|
||||
return Optional.of(cell.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1069,12 +1066,9 @@ public class TravelController {
|
||||
return;
|
||||
}
|
||||
|
||||
// Find the nearest travel anchor within the configured angle (default ~10 degrees).
|
||||
Optional<BlockCoord> selectedBlock = findBlocksWithinAngle(
|
||||
player,
|
||||
candidates.keySet(),
|
||||
Config.travelAnchorSnapAngle,
|
||||
Double.MAX_VALUE).values().stream().findFirst();
|
||||
// Find the nearest travel anchor within roughly 10 degrees.
|
||||
Optional<BlockCoord> selectedBlock = findBlocksWithinAngle(player, candidates.keySet(), 0.175, Double.MAX_VALUE)
|
||||
.values().stream().findFirst();
|
||||
selectedCoord = selectedBlock.orElse(null);
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -651,8 +655,6 @@ tile.blockWeatherObelisk.tooltip.detailed.line4=Liquid Sunshine: Sun
|
||||
tile.blockWeatherObelisk.tooltip.detailed.line5=Cloud Seed: Rain
|
||||
tile.blockWeatherObelisk.tooltip.detailed.line6=Concentrated Cloud Seed: Thunder
|
||||
|
||||
tile.blockInhibitorObelisk.name=Inhibitor Obelisk
|
||||
|
||||
tile.blockBuffer.name=Buffer
|
||||
tile.blockBuffer.item.name=Item Buffer
|
||||
tile.blockBuffer.power.name=Power Buffer
|
||||
|
||||
@@ -608,8 +608,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=至相邻的储罐中
|
||||
tile.blockWeatherObelisk.name=气象方尖碑
|
||||
tile.blockWeatherObelisk.tooltip.detailed.line1=改变当前天气
|
||||
|
||||
tile.blockInhibitorObelisk.name=传送抑制方尖碑
|
||||
|
||||
tile.blockBuffer.item.name=物品缓存器
|
||||
tile.blockBuffer.power.name=能量缓存器
|
||||
tile.blockBuffer.omni.name=多功能缓存器
|
||||
|
||||
|
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 |