Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9443e23ab8 | ||
|
|
1967d7212a |
No files matched your search
@@ -33,16 +33,12 @@ 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;
|
||||
@@ -207,10 +203,6 @@ 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,18 +31,14 @@ 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;
|
||||
@@ -676,14 +672,6 @@ 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,17 +87,7 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
|
||||
|
||||
MELODIC(() -> Config.melodicEnderFluidConduitExtractRate, () -> Config.melodicEnderFluidConduitMaxIoRate),
|
||||
|
||||
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);
|
||||
STELLAR(() -> Config.stellarEnderFluidConduitExtractRate, () -> Config.stellarEnderFluidConduitMaxIoRate);
|
||||
|
||||
private final IntSupplier getMaxExtractPerTick;
|
||||
private final IntSupplier getMaxIoPerTick;
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
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,7 +16,6 @@ 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 {
|
||||
|
||||
@@ -37,19 +36,7 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
|
||||
"enderio:itemLiquidConduitMelodicEnder"),
|
||||
new ItemConduitSubtype(
|
||||
ModObject.itemLiquidConduit.name() + "StellarEnder",
|
||||
"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") };
|
||||
"enderio:itemLiquidConduitStellarEnder") };
|
||||
|
||||
public static ItemLiquidConduit create() {
|
||||
ItemLiquidConduit result = new ItemLiquidConduit();
|
||||
@@ -83,14 +70,6 @@ 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());
|
||||
}
|
||||
@@ -146,40 +125,14 @@ 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") + " "
|
||||
+ PowerDisplayUtil.formatPower(extractRate)
|
||||
+ mbt);
|
||||
list.add(
|
||||
EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " "
|
||||
+ PowerDisplayUtil.formatPower(maxIo)
|
||||
+ mbt);
|
||||
list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " " + extractRate + mbt);
|
||||
list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + maxIo + mbt);
|
||||
|
||||
if (itemstack.getItemDamage() == 0) {
|
||||
SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduit");
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package crazypants.enderio.config;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
@@ -122,14 +123,6 @@ 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;
|
||||
@@ -153,7 +146,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;
|
||||
@@ -288,6 +280,8 @@ public final class Config {
|
||||
public static double darkSteelGliderHorizontalSpeed = 0.03;
|
||||
public static double darkSteelGliderVerticalSpeed = -0.05;
|
||||
public static double darkSteelGliderVerticalSpeedSprinting = -0.15;
|
||||
public static int[] darkSteelGliderDimensionBlocklist = {};
|
||||
public static HashSet<Integer> darkSteelGliderDimensionBlocklistHash = new HashSet<>();
|
||||
|
||||
public static int darkSteelGogglesOfRevealingCost = 10;
|
||||
|
||||
@@ -1013,65 +1007,6 @@ 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,
|
||||
@@ -1235,14 +1170,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,
|
||||
@@ -1656,6 +1583,11 @@ public final class Config {
|
||||
darkSteelGliderVerticalSpeedSprinting,
|
||||
"Rate of altitude loss when sprinting and gliding.")
|
||||
.getDouble(darkSteelGliderVerticalSpeedSprinting);
|
||||
darkSteelGliderDimensionBlocklist = config.get(
|
||||
sectionDarkSteel.name,
|
||||
"darkSteelGliderDimensionBlocklist",
|
||||
darkSteelGliderDimensionBlocklist,
|
||||
"List of numeric IDs of dimensions in which the 'Glider' upgrade will not work.").getIntList();
|
||||
|
||||
darkSteelSoundLocatorCost = config.get(
|
||||
sectionDarkSteel.name,
|
||||
@@ -3094,6 +3026,11 @@ public final class Config {
|
||||
farmHoes.add(hoe);
|
||||
}
|
||||
}
|
||||
|
||||
darkSteelGliderDimensionBlocklistHash.clear();
|
||||
for (int dimId : darkSteelGliderDimensionBlocklist) {
|
||||
darkSteelGliderDimensionBlocklistHash.add(dimId);
|
||||
}
|
||||
}
|
||||
|
||||
public static ItemStack getStackForString(String s) {
|
||||
|
||||
@@ -329,10 +329,13 @@ public class KeyTracker {
|
||||
|
||||
private void handleGlide() {
|
||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||
if (glideKey.isPressed() && DarkSteelController.instance.isGliderUpgradeEquipped(player)
|
||||
&& (DarkSteelController.instance.isGlideActive(player)
|
||||
|| DarkSteelController.instance.canActivateGlide(player))) {
|
||||
toggleDarkSteelController(Type.GLIDE, "darksteel.upgrade.glider");
|
||||
if (glideKey.isPressed() && DarkSteelController.instance.isGliderUpgradeEquipped(player)) {
|
||||
if ((DarkSteelController.instance.isGlideActive(player)
|
||||
|| DarkSteelController.instance.canActivateGlide(player))) {
|
||||
toggleDarkSteelController(Type.GLIDE, "darksteel.upgrade.glider");
|
||||
} else if (!DarkSteelController.instance.isGlideAllowedInDimension(player)) {
|
||||
ChatUtil.sendNoSpamClientUnloc(EnderIO.lang, "darksteel.upgrade.glider.blocklisted");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.MovementInput;
|
||||
import net.minecraftforge.client.event.RenderPlayerEvent;
|
||||
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -158,8 +159,12 @@ public class DarkSteelController {
|
||||
return isActive(player, Type.GLIDE);
|
||||
}
|
||||
|
||||
public boolean isGlideAllowedInDimension(EntityPlayer player) {
|
||||
return !Config.darkSteelGliderDimensionBlocklistHash.contains(player.dimension);
|
||||
}
|
||||
|
||||
public boolean canActivateGlide(EntityPlayer player) {
|
||||
return !EtFuturumCompat.isElytraFlying(player);
|
||||
return !EtFuturumCompat.isElytraFlying(player) && isGlideAllowedInDimension(player);
|
||||
}
|
||||
|
||||
public boolean isSpeedActive(EntityPlayer player) {
|
||||
@@ -198,6 +203,15 @@ public class DarkSteelController {
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onJoinDimension(EntityJoinWorldEvent event) {
|
||||
if (event.entity instanceof EntityPlayer player) {
|
||||
if (!isGlideAllowedInDimension(player)) {
|
||||
setActive(player, Type.GLIDE, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateSolar(EntityPlayer player) {
|
||||
// no processing on client
|
||||
if (player.worldObj.isRemote) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -877,6 +877,7 @@ enderio.darksteel.upgrade.glider.name=Gleiter
|
||||
enderio.darksteel.upgrade.glider.tooltip.detailed.line1=Ermöglicht Gleiten
|
||||
enderio.darksteel.upgrade.glider.enabled=Gleiter Aktiv
|
||||
enderio.darksteel.upgrade.glider.disabled=Gleiter Inaktiv
|
||||
enderio.darksteel.upgrade.glider.blocklisted=Der Gleiter scheint nicht in dieser Dimension zu funktionieren...
|
||||
|
||||
enderio.darksteel.upgrade.sound.name=Schalldetektor
|
||||
enderio.darksteel.upgrade.sound.tooltip.detailed.line1=Zeigt die Position von
|
||||
|
||||
@@ -62,10 +62,6 @@ 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
|
||||
@@ -655,8 +651,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
|
||||
@@ -981,6 +975,7 @@ enderio.darksteel.upgrade.glider.name=Glider
|
||||
enderio.darksteel.upgrade.glider.tooltip.detailed.line1=Enables gliding
|
||||
enderio.darksteel.upgrade.glider.enabled=Glider Active
|
||||
enderio.darksteel.upgrade.glider.disabled=Glider Disabled
|
||||
enderio.darksteel.upgrade.glider.blocklisted=The Glider does not seem to work in this dimension...
|
||||
|
||||
enderio.darksteel.upgrade.sound.name=Sound Locator
|
||||
enderio.darksteel.upgrade.sound.tooltip.detailed.line1=Displays the location of
|
||||
|
||||
@@ -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=多功能缓存器
|
||||
|
||||
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
@@ -1,45 +0,0 @@
|
||||
{
|
||||
"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
|
||||
]
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 2.7 KiB |
@@ -1,45 +0,0 @@
|
||||
{
|
||||
"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
|
||||
]
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 2.7 KiB |
@@ -1,45 +0,0 @@
|
||||
{
|
||||
"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
|
||||
]
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 2.7 KiB |
@@ -1,45 +0,0 @@
|
||||
{
|
||||
"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
|
||||
]
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |