Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0f9bae85b7 | ||
|
|
0e29c1af62 | ||
|
|
c2eda5efbb | ||
|
|
e2d6b417b4 | ||
|
|
fc826d169a | ||
|
|
9242fdd23d | ||
|
|
0e60bba4ce | ||
|
|
9e1a7c7f3c |
No files matched your search
@@ -14,7 +14,6 @@ dependencies {
|
|||||||
compileOnly('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.48-GTNH:dev') {transitive = false}
|
compileOnly('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.48-GTNH:dev') {transitive = false}
|
||||||
runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false}
|
runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false}
|
||||||
compileOnly("com.github.GTNewHorizons:Backhand:1.8.14:dev") { transitive = false }
|
compileOnly("com.github.GTNewHorizons:Backhand:1.8.14:dev") { transitive = false }
|
||||||
compileOnly("com.github.GTNewHorizons:Dashboard:1.0.19:api")
|
|
||||||
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-999-GTNH:api') {transitive = false}
|
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-999-GTNH:api') {transitive = false}
|
||||||
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.22-GTNH:dev') {transitive = false}
|
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.22-GTNH:dev') {transitive = false}
|
||||||
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.129:dev') {transitive = false}
|
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.129:dev') {transitive = false}
|
||||||
|
|||||||
@@ -33,16 +33,12 @@ import crazypants.enderio.conduit.gas.GasUtil;
|
|||||||
import crazypants.enderio.conduit.item.ItemConduit;
|
import crazypants.enderio.conduit.item.ItemConduit;
|
||||||
import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
|
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.CosmicEnderLiquidConduit;
|
|
||||||
import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.FluxedEnderLiquidConduit;
|
|
||||||
import crazypants.enderio.conduit.liquid.LiquidConduit;
|
import crazypants.enderio.conduit.liquid.LiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.PrismaticNaquadahEnderLiquidConduit;
|
|
||||||
import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.TranscendentEnderLiquidConduit;
|
|
||||||
import crazypants.enderio.conduit.me.MEConduit;
|
import crazypants.enderio.conduit.me.MEConduit;
|
||||||
import crazypants.enderio.conduit.me.MEUtil;
|
import crazypants.enderio.conduit.me.MEUtil;
|
||||||
import crazypants.enderio.conduit.oc.OCConduit;
|
import crazypants.enderio.conduit.oc.OCConduit;
|
||||||
@@ -62,7 +58,6 @@ import crazypants.enderio.gui.TooltipHandlerBurnTime;
|
|||||||
import crazypants.enderio.gui.TooltipHandlerFluid;
|
import crazypants.enderio.gui.TooltipHandlerFluid;
|
||||||
import crazypants.enderio.gui.TooltipHandlerGrinding;
|
import crazypants.enderio.gui.TooltipHandlerGrinding;
|
||||||
import crazypants.enderio.item.ConduitProbeOverlayRenderer;
|
import crazypants.enderio.item.ConduitProbeOverlayRenderer;
|
||||||
import crazypants.enderio.item.DashboardHud;
|
|
||||||
import crazypants.enderio.item.KeyTracker;
|
import crazypants.enderio.item.KeyTracker;
|
||||||
import crazypants.enderio.item.ToolTickHandler;
|
import crazypants.enderio.item.ToolTickHandler;
|
||||||
import crazypants.enderio.item.YetaWrenchOverlayRenderer;
|
import crazypants.enderio.item.YetaWrenchOverlayRenderer;
|
||||||
@@ -208,10 +203,6 @@ public class ClientProxy extends CommonProxy {
|
|||||||
CrystallinePinkSlimeEnderLiquidConduit.initIcons();
|
CrystallinePinkSlimeEnderLiquidConduit.initIcons();
|
||||||
MelodicEnderLiquidConduit.initIcons();
|
MelodicEnderLiquidConduit.initIcons();
|
||||||
StellarEnderLiquidConduit.initIcons();
|
StellarEnderLiquidConduit.initIcons();
|
||||||
PrismaticNaquadahEnderLiquidConduit.initIcons();
|
|
||||||
FluxedEnderLiquidConduit.initIcons();
|
|
||||||
TranscendentEnderLiquidConduit.initIcons();
|
|
||||||
CosmicEnderLiquidConduit.initIcons();
|
|
||||||
ItemConduit.initIcons();
|
ItemConduit.initIcons();
|
||||||
if (GasUtil.isGasConduitEnabled()) {
|
if (GasUtil.isGasConduitEnabled()) {
|
||||||
GasConduit.initIcons();
|
GasConduit.initIcons();
|
||||||
@@ -410,9 +401,6 @@ public class ClientProxy extends CommonProxy {
|
|||||||
|
|
||||||
new YetaWrenchOverlayRenderer();
|
new YetaWrenchOverlayRenderer();
|
||||||
new ConduitProbeOverlayRenderer();
|
new ConduitProbeOverlayRenderer();
|
||||||
if (EnderIO.hasDashboard) {
|
|
||||||
DashboardHud.register();
|
|
||||||
}
|
|
||||||
if (Config.useSneakMouseWheelYetaWrench) {
|
if (Config.useSneakMouseWheelYetaWrench) {
|
||||||
ToolTickHandler th = new ToolTickHandler();
|
ToolTickHandler th = new ToolTickHandler();
|
||||||
MinecraftForge.EVENT_BUS.register(th);
|
MinecraftForge.EVENT_BUS.register(th);
|
||||||
|
|||||||
@@ -192,7 +192,6 @@ import crazypants.util.EE3Util;
|
|||||||
after:Thaumcraft;\
|
after:Thaumcraft;\
|
||||||
after:appliedenergistics2@[rv2-beta-8,);\
|
after:appliedenergistics2@[rv2-beta-8,);\
|
||||||
after:Railcraft@[9.16.7,);\
|
after:Railcraft@[9.16.7,);\
|
||||||
after:dashboard@[1.0.19,);\
|
|
||||||
after:betterbuilderswands@[0.13.12,)\
|
after:betterbuilderswands@[0.13.12,)\
|
||||||
""", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
|
""", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
|
||||||
public class EnderIO {
|
public class EnderIO {
|
||||||
@@ -220,7 +219,6 @@ public class EnderIO {
|
|||||||
public static final boolean hasEtFuturum = Loader.isModLoaded("etfuturum");
|
public static final boolean hasEtFuturum = Loader.isModLoaded("etfuturum");
|
||||||
public static final boolean hasWailaPlugins = Loader.isModLoaded("wailaplugins");
|
public static final boolean hasWailaPlugins = Loader.isModLoaded("wailaplugins");
|
||||||
public static final boolean hasAutomagy = Loader.isModLoaded("Automagy");
|
public static final boolean hasAutomagy = Loader.isModLoaded("Automagy");
|
||||||
public static final boolean hasDashboard = Loader.isModLoaded("dashboard");
|
|
||||||
|
|
||||||
// Materials
|
// Materials
|
||||||
public static ItemCapacitor itemBasicCapacitor;
|
public static ItemCapacitor itemBasicCapacitor;
|
||||||
|
|||||||
@@ -20,4 +20,8 @@ public interface IItemOfTravel extends IEnergyContainerItem {
|
|||||||
default int canExtractInternal(ItemStack equipped, int power) {
|
default int canExtractInternal(ItemStack equipped, int power) {
|
||||||
return Config.strictTPItemChecking ? 0 : -1;
|
return Config.strictTPItemChecking ? 0 : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
default boolean isTeleportStaff(EntityPlayer player, ItemStack stack) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -31,18 +31,14 @@ import crazypants.enderio.conduit.item.IItemConduit;
|
|||||||
import crazypants.enderio.conduit.item.ItemConduitNetwork;
|
import crazypants.enderio.conduit.item.ItemConduitNetwork;
|
||||||
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
|
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduitNetwork;
|
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduitNetwork;
|
||||||
import crazypants.enderio.conduit.liquid.CosmicEnderLiquidConduit;
|
|
||||||
import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.EnderLiquidConduitNetwork;
|
import crazypants.enderio.conduit.liquid.EnderLiquidConduitNetwork;
|
||||||
import crazypants.enderio.conduit.liquid.FluxedEnderLiquidConduit;
|
|
||||||
import crazypants.enderio.conduit.liquid.ILiquidConduit;
|
import crazypants.enderio.conduit.liquid.ILiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.LiquidConduitNetwork;
|
import crazypants.enderio.conduit.liquid.LiquidConduitNetwork;
|
||||||
import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.PrismaticNaquadahEnderLiquidConduit;
|
|
||||||
import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
|
import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
|
||||||
import crazypants.enderio.conduit.liquid.TranscendentEnderLiquidConduit;
|
|
||||||
import crazypants.enderio.conduit.me.IMEConduit;
|
import crazypants.enderio.conduit.me.IMEConduit;
|
||||||
import crazypants.enderio.conduit.me.MEConduitNetwork;
|
import crazypants.enderio.conduit.me.MEConduitNetwork;
|
||||||
import crazypants.enderio.conduit.oc.IOCConduit;
|
import crazypants.enderio.conduit.oc.IOCConduit;
|
||||||
@@ -676,14 +672,6 @@ public abstract class AbstractConduit implements IConduit {
|
|||||||
return new PowerConduitNetwork();
|
return new PowerConduitNetwork();
|
||||||
} else if (StellarEnderLiquidConduit.class.isAssignableFrom(type)) {
|
} else if (StellarEnderLiquidConduit.class.isAssignableFrom(type)) {
|
||||||
return new EnderLiquidConduitNetwork(StellarEnderLiquidConduit.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)) {
|
} else if (MelodicEnderLiquidConduit.class.isAssignableFrom(type)) {
|
||||||
return new EnderLiquidConduitNetwork(MelodicEnderLiquidConduit.TYPE);
|
return new EnderLiquidConduitNetwork(MelodicEnderLiquidConduit.TYPE);
|
||||||
} else if (CrystallinePinkSlimeEnderLiquidConduit.class.isAssignableFrom(type)) {
|
} else if (CrystallinePinkSlimeEnderLiquidConduit.class.isAssignableFrom(type)) {
|
||||||
|
|||||||
@@ -87,17 +87,7 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
|
|||||||
|
|
||||||
MELODIC(() -> Config.melodicEnderFluidConduitExtractRate, () -> Config.melodicEnderFluidConduitMaxIoRate),
|
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 getMaxExtractPerTick;
|
||||||
private final IntSupplier getMaxIoPerTick;
|
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.IConduit;
|
||||||
import crazypants.enderio.conduit.ItemConduitSubtype;
|
import crazypants.enderio.conduit.ItemConduitSubtype;
|
||||||
import crazypants.enderio.config.Config;
|
import crazypants.enderio.config.Config;
|
||||||
import crazypants.enderio.power.PowerDisplayUtil;
|
|
||||||
|
|
||||||
public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedTooltipProvider {
|
public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedTooltipProvider {
|
||||||
|
|
||||||
@@ -37,19 +36,7 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
|
|||||||
"enderio:itemLiquidConduitMelodicEnder"),
|
"enderio:itemLiquidConduitMelodicEnder"),
|
||||||
new ItemConduitSubtype(
|
new ItemConduitSubtype(
|
||||||
ModObject.itemLiquidConduit.name() + "StellarEnder",
|
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() {
|
public static ItemLiquidConduit create() {
|
||||||
ItemLiquidConduit result = new ItemLiquidConduit();
|
ItemLiquidConduit result = new ItemLiquidConduit();
|
||||||
@@ -83,14 +70,6 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
|
|||||||
return new MelodicEnderLiquidConduit();
|
return new MelodicEnderLiquidConduit();
|
||||||
case StellarEnderLiquidConduit.METADATA:
|
case StellarEnderLiquidConduit.METADATA:
|
||||||
return new StellarEnderLiquidConduit();
|
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:
|
default:
|
||||||
throw new IllegalArgumentException("Unrecognized ender fluid conduit type: " + stack.getItemDamage());
|
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();
|
maxIo = StellarEnderLiquidConduit.TYPE.getMaxIoPerTick();
|
||||||
break;
|
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:
|
default:
|
||||||
throw new IllegalArgumentException(
|
throw new IllegalArgumentException(
|
||||||
"Unrecognized ender fluid conduit type: " + itemstack.getItemDamage());
|
"Unrecognized ender fluid conduit type: " + itemstack.getItemDamage());
|
||||||
}
|
}
|
||||||
|
|
||||||
String mbt = " " + EnderIO.lang.localize("fluid.millibucketsTick");
|
String mbt = " " + EnderIO.lang.localize("fluid.millibucketsTick");
|
||||||
list.add(
|
list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " " + extractRate + mbt);
|
||||||
EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " "
|
list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + maxIo + mbt);
|
||||||
+ PowerDisplayUtil.formatPower(extractRate)
|
|
||||||
+ mbt);
|
|
||||||
list.add(
|
|
||||||
EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " "
|
|
||||||
+ PowerDisplayUtil.formatPower(maxIo)
|
|
||||||
+ mbt);
|
|
||||||
|
|
||||||
if (itemstack.getItemDamage() == 0) {
|
if (itemstack.getItemDamage() == 0) {
|
||||||
SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduit");
|
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -122,14 +122,6 @@ public final class Config {
|
|||||||
|
|
||||||
public static int stellarEnderFluidConduitExtractRate = 20_000;
|
public static int stellarEnderFluidConduitExtractRate = 20_000;
|
||||||
public static int stellarEnderFluidConduitMaxIoRate = 80_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 melodicEnderFluidConduitExtractRate = 10_000;
|
||||||
public static int melodicEnderFluidConduitMaxIoRate = 40_000;
|
public static int melodicEnderFluidConduitMaxIoRate = 40_000;
|
||||||
public static int crystallinePinkSlimeEnderFluidConduitExtractRate = 2_000;
|
public static int crystallinePinkSlimeEnderFluidConduitExtractRate = 2_000;
|
||||||
@@ -153,7 +145,6 @@ public final class Config {
|
|||||||
public static int travelAnchorCooldown = 0;
|
public static int travelAnchorCooldown = 0;
|
||||||
public static boolean travelAnchorSneak = true;
|
public static boolean travelAnchorSneak = true;
|
||||||
public static boolean travelAnchorSkipWarning = true;
|
public static boolean travelAnchorSkipWarning = true;
|
||||||
public static double travelAnchorSnapAngle = 0.175;
|
|
||||||
|
|
||||||
public static int travelStaffMaxDistance = 128;
|
public static int travelStaffMaxDistance = 128;
|
||||||
public static float travelStaffPowerPerBlockRF = 250;
|
public static float travelStaffPowerPerBlockRF = 250;
|
||||||
@@ -1013,65 +1004,6 @@ public final class Config {
|
|||||||
"Number of liters per tick that can pass through a single connection to a stellar ender fluid conduit.")
|
"Number of liters per tick that can pass through a single connection to a stellar ender fluid conduit.")
|
||||||
.getInt(stellarEnderFluidConduitMaxIoRate);
|
.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
|
gasConduitExtractRate = config
|
||||||
.get(
|
.get(
|
||||||
sectionEfficiency.name,
|
sectionEfficiency.name,
|
||||||
@@ -1235,14 +1167,6 @@ public final class Config {
|
|||||||
"Travel Anchors send a chat warning when skipping inaccessible anchors")
|
"Travel Anchors send a chat warning when skipping inaccessible anchors")
|
||||||
.getBoolean(travelAnchorSkipWarning);
|
.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
|
travelStaffMaxDistance = config
|
||||||
.get(
|
.get(
|
||||||
sectionStaff.name,
|
sectionStaff.name,
|
||||||
|
|||||||
@@ -38,24 +38,15 @@ public class ConduitProbeOverlayRenderer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedProbe) {
|
private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedProbe) {
|
||||||
if (EnderIO.hasDashboard && !DashboardHud.beginProbe(event.resolution)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
draw(equippedProbe.getItemDamage() == 0, event.resolution);
|
|
||||||
if (EnderIO.hasDashboard) {
|
|
||||||
DashboardHud.endRender();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void draw(boolean probeMode, ScaledResolution res) {
|
|
||||||
IconEIO icon1, icon2;
|
IconEIO icon1, icon2;
|
||||||
if (probeMode) {
|
if (equippedProbe.getItemDamage() == 0) {
|
||||||
icon1 = IconEIO.PROBE_OVERLAY_PROBE;
|
icon1 = IconEIO.PROBE_OVERLAY_PROBE;
|
||||||
icon2 = IconEIO.PROBE_OVERLAY_COPY_OFF;
|
icon2 = IconEIO.PROBE_OVERLAY_COPY_OFF;
|
||||||
} else {
|
} else {
|
||||||
icon1 = IconEIO.PROBE_OVERLAY_PROBE_OFF;
|
icon1 = IconEIO.PROBE_OVERLAY_PROBE_OFF;
|
||||||
icon2 = IconEIO.PROBE_OVERLAY_COPY;
|
icon2 = IconEIO.PROBE_OVERLAY_COPY;
|
||||||
}
|
}
|
||||||
|
ScaledResolution res = event.resolution;
|
||||||
|
|
||||||
double offsetX = res.getScaledWidth() - 48;
|
double offsetX = res.getScaledWidth() - 48;
|
||||||
double offsetY = res.getScaledHeight() - 16;
|
double offsetY = res.getScaledHeight() - 16;
|
||||||
|
|||||||
@@ -1,83 +0,0 @@
|
|||||||
package crazypants.enderio.item;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.ScaledResolution;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import com.gtnewhorizons.dashboard.api.HudBounds;
|
|
||||||
import com.gtnewhorizons.dashboard.api.HudElement;
|
|
||||||
import com.gtnewhorizons.dashboard.api.HudRegistry;
|
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import crazypants.enderio.conduit.ConduitDisplayMode;
|
|
||||||
import crazypants.enderio.config.Config;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lets players move, resize and hide the Conduit Probe and Yeta Wrench HUD in Dashboard's HUD editor. The only class
|
|
||||||
* using Dashboard, so only call it while Dashboard is loaded.
|
|
||||||
*/
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public final class DashboardHud {
|
|
||||||
|
|
||||||
private static final HudElement PROBE = new HudElement(
|
|
||||||
"enderio:conduit_probe",
|
|
||||||
(screenWidth, screenHeight) -> new HudBounds(screenWidth - 80, screenHeight - 48, 64, 32));
|
|
||||||
|
|
||||||
/** Only with the default overlay, which shows it for a moment after switching. */
|
|
||||||
private static final HudElement WRENCH_SELECTOR = new HudElement(
|
|
||||||
"enderio:yeta_wrench_selector",
|
|
||||||
(screenWidth, screenHeight) -> new HudBounds(screenWidth / 2 - 22, screenHeight / 2 - 24, 44, 16))
|
|
||||||
.setActiveCheck(() -> Config.yetaWrenchOverlayMode == 0);
|
|
||||||
|
|
||||||
/** The corner icon, the column or the group of icons, depending on the overlay setting. */
|
|
||||||
private static final HudElement WRENCH_MODE = new HudElement(
|
|
||||||
"enderio:yeta_wrench_mode",
|
|
||||||
DashboardHud::getWrenchModeBounds);
|
|
||||||
|
|
||||||
private DashboardHud() {}
|
|
||||||
|
|
||||||
public static void register() {
|
|
||||||
PROBE.setPreview((screenWidth, screenHeight) -> HudRegistry.render(PROBE, () -> {
|
|
||||||
ConduitProbeOverlayRenderer.draw(true, HudRegistry.getResolution());
|
|
||||||
GL11.glColor4f(1, 1, 1, 1);
|
|
||||||
}));
|
|
||||||
WRENCH_SELECTOR.setPreview(
|
|
||||||
(screenWidth, screenHeight) -> HudRegistry.render(
|
|
||||||
WRENCH_SELECTOR,
|
|
||||||
() -> YetaWrenchOverlayRenderer
|
|
||||||
.draw(ConduitDisplayMode.ALL, HudRegistry.getResolution(), true)));
|
|
||||||
WRENCH_MODE.setPreview(
|
|
||||||
(screenWidth, screenHeight) -> HudRegistry.render(
|
|
||||||
WRENCH_MODE,
|
|
||||||
() -> YetaWrenchOverlayRenderer
|
|
||||||
.draw(ConduitDisplayMode.ALL, HudRegistry.getResolution(), false)));
|
|
||||||
HudRegistry.register(PROBE);
|
|
||||||
HudRegistry.register(WRENCH_SELECTOR);
|
|
||||||
HudRegistry.register(WRENCH_MODE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** False means the player hid it, so skip drawing it and do not call {@link #endRender()}. */
|
|
||||||
static boolean beginProbe(ScaledResolution resolution) {
|
|
||||||
return HudRegistry.beginRender(PROBE, resolution);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The selector while it shows, otherwise the corner icon, the column or the group of icons. */
|
|
||||||
static boolean beginWrench(ScaledResolution resolution, boolean showSelector) {
|
|
||||||
return HudRegistry.beginRender(showSelector ? WRENCH_SELECTOR : WRENCH_MODE, resolution);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void endRender() {
|
|
||||||
HudRegistry.endRender();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Measured like YetaWrenchOverlayRenderer draws each overlay. */
|
|
||||||
private static HudBounds getWrenchModeBounds(int screenWidth, int screenHeight) {
|
|
||||||
int modeCount = ConduitDisplayMode.registrySize();
|
|
||||||
return switch (Config.yetaWrenchOverlayMode) {
|
|
||||||
case 1 -> new HudBounds(screenWidth - 17, screenHeight - modeCount * 18 - 6, 24, modeCount * 18 + 6);
|
|
||||||
case 2 -> new HudBounds(screenWidth - modeCount * 8 - 16, screenHeight - 40, (modeCount + 1) / 2 * 16, 32);
|
|
||||||
default -> new HudBounds(screenWidth - 20, screenHeight - 20, 16, 16);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,6 @@ import com.enderio.core.client.render.RenderUtil;
|
|||||||
import com.enderio.core.common.vecmath.Vector4f;
|
import com.enderio.core.common.vecmath.Vector4f;
|
||||||
|
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import crazypants.enderio.EnderIO;
|
|
||||||
import crazypants.enderio.api.tool.IConduitControl;
|
import crazypants.enderio.api.tool.IConduitControl;
|
||||||
import crazypants.enderio.conduit.ConduitDisplayMode;
|
import crazypants.enderio.conduit.ConduitDisplayMode;
|
||||||
import crazypants.enderio.config.Config;
|
import crazypants.enderio.config.Config;
|
||||||
@@ -58,28 +57,20 @@ public class YetaWrenchOverlayRenderer {
|
|||||||
lastTick = ClientHandler.getTicksElapsed();
|
lastTick = ClientHandler.getTicksElapsed();
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean showSelector = displayTickCount > 0 && Config.yetaWrenchOverlayMode == 0;
|
ScaledResolution res = event.resolution;
|
||||||
if (showSelector && lastTick < ClientHandler.getTicksElapsed()) {
|
|
||||||
lastTick++;
|
|
||||||
displayTickCount--;
|
|
||||||
}
|
|
||||||
if (EnderIO.hasDashboard && !DashboardHud.beginWrench(event.resolution, showSelector)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
draw(mode, event.resolution, showSelector);
|
|
||||||
if (EnderIO.hasDashboard) {
|
|
||||||
DashboardHud.endRender();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void draw(ConduitDisplayMode mode, ScaledResolution res, boolean showSelector) {
|
|
||||||
Tessellator tess = Tessellator.instance;
|
Tessellator tess = Tessellator.instance;
|
||||||
int modeCount = ConduitDisplayMode.registrySize();
|
int modeCount = ConduitDisplayMode.registrySize();
|
||||||
Iterable<ConduitDisplayMode> renderable = ConduitDisplayMode.getRenderableModes();
|
Iterable<ConduitDisplayMode> renderable = ConduitDisplayMode.getRenderableModes();
|
||||||
|
|
||||||
switch (Config.yetaWrenchOverlayMode) {
|
switch (Config.yetaWrenchOverlayMode) {
|
||||||
case 0:
|
case 0:
|
||||||
if (showSelector) {
|
if (displayTickCount > 0) {
|
||||||
|
|
||||||
|
if (lastTick < ClientHandler.getTicksElapsed()) {
|
||||||
|
lastTick++;
|
||||||
|
displayTickCount--;
|
||||||
|
}
|
||||||
|
|
||||||
int x = res.getScaledWidth() / 2 - 8;
|
int x = res.getScaledWidth() / 2 - 8;
|
||||||
int y = res.getScaledHeight() / 2 - 24;
|
int y = res.getScaledHeight() / 2 - 24;
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public class TileAlloySmelter extends AbstractPoweredTaskEntity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockAlloySmelter.name";
|
return "Alloy Smelter";
|
||||||
}
|
}
|
||||||
|
|
||||||
public Mode getMode() {
|
public Mode getMode() {
|
||||||
|
|||||||
@@ -33,12 +33,6 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl
|
|||||||
super(new SlotDefinition(9, 0, 0));
|
super(new SlotDefinition(9, 0, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
// getMachineName will return the key without the suffix ".name"
|
|
||||||
return getMachineName() + ".name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return BlockItemBuffer.Type.get(this).getUnlocalizedName();
|
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));
|
setCapacitor(new BasicCapacitor(0, io * 4, refCap.getMaxEnergyStored(), io));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockCrafter.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockCrafter.unlocalisedName;
|
return ModObject.blockCrafter.unlocalisedName;
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class TileCrusher extends AbstractPoweredTaskEntity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockSagMill.name";
|
return ModObject.blockSagMill.unlocalisedName;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import com.gtnewhorizon.gtnhlib.geometry.CubeIterator;
|
|||||||
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
import crazypants.enderio.Log;
|
import crazypants.enderio.Log;
|
||||||
|
import crazypants.enderio.ModObject;
|
||||||
import crazypants.enderio.TileEntityEio;
|
import crazypants.enderio.TileEntityEio;
|
||||||
import crazypants.enderio.config.Config;
|
import crazypants.enderio.config.Config;
|
||||||
import crazypants.enderio.machine.obelisk.xp.TileExperienceObelisk;
|
import crazypants.enderio.machine.obelisk.xp.TileExperienceObelisk;
|
||||||
@@ -299,7 +300,7 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockEnchanter.name";
|
return ModObject.blockEnchanter.unlocalisedName;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -822,7 +822,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IRange
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockFarmStation.name";
|
return EnderIO.blockFarmStation.getLocalizedName();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -90,11 +90,6 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements
|
|||||||
return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL;
|
return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockCombustionGenerator.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockCombustionGenerator.unlocalisedName;
|
return ModObject.blockCombustionGenerator.unlocalisedName;
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockStirlingGenerator.name";
|
return "Stirling Generator";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -93,11 +93,6 @@ public class TileZombieGenerator extends AbstractGeneratorEntity
|
|||||||
minimumTankLevel = (int) (fuelTank.getCapacity() * 0.7F);
|
minimumTankLevel = (int) (fuelTank.getCapacity() * 0.7F);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockZombieGenerator.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockZombieGenerator.unlocalisedName;
|
return ModObject.blockZombieGenerator.unlocalisedName;
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection;
|
|||||||
|
|
||||||
import com.enderio.core.common.util.InventoryWrapper;
|
import com.enderio.core.common.util.InventoryWrapper;
|
||||||
|
|
||||||
|
import crazypants.enderio.ModObject;
|
||||||
|
|
||||||
public class CompositeInventory implements ISidedInventory {
|
public class CompositeInventory implements ISidedInventory {
|
||||||
|
|
||||||
private final List<InvEntry> inventories = new ArrayList<>();
|
private final List<InvEntry> inventories = new ArrayList<>();
|
||||||
@@ -155,7 +157,7 @@ public class CompositeInventory implements ISidedInventory {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockHyperCube.name";
|
return ModObject.blockHyperCube.unlocalisedName;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import com.enderio.core.common.util.PlayerUtil;
|
|||||||
import com.enderio.core.common.vecmath.VecmathUtil;
|
import com.enderio.core.common.vecmath.VecmathUtil;
|
||||||
|
|
||||||
import crazypants.enderio.EnderIO;
|
import crazypants.enderio.EnderIO;
|
||||||
|
import crazypants.enderio.ModObject;
|
||||||
import crazypants.enderio.TileEntityEio;
|
import crazypants.enderio.TileEntityEio;
|
||||||
import crazypants.enderio.config.Config;
|
import crazypants.enderio.config.Config;
|
||||||
import crazypants.enderio.machine.IRedstoneModeControlable;
|
import crazypants.enderio.machine.IRedstoneModeControlable;
|
||||||
@@ -768,7 +769,7 @@ public class TileHyperCube extends TileEntityEio
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockHyperCube.name";
|
return ModObject.blockHyperCube.unlocalisedName;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -369,11 +369,6 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH
|
|||||||
nbtRoot.setBoolean("active", active);
|
nbtRoot.setBoolean("active", active);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockInventoryPanel.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockInventoryPanel.unlocalisedName;
|
return ModObject.blockInventoryPanel.unlocalisedName;
|
||||||
|
|||||||
@@ -157,11 +157,6 @@ public class TileKillerJoe extends AbstractMachineEntity
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockKillerJoe.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockKillerJoe.unlocalisedName;
|
return ModObject.blockKillerJoe.unlocalisedName;
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockPowerMonitor.name";
|
return EnderIO.blockPowerMonitor.getUnlocalizedName();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -126,11 +126,6 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange
|
|||||||
setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick));
|
setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockAttractor.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockAttractor.unlocalisedName;
|
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);
|
bounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockSpawnGuard.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockSpawnGuard.unlocalisedName;
|
return ModObject.blockSpawnGuard.unlocalisedName;
|
||||||
|
|||||||
@@ -19,11 +19,6 @@ public class TileInhibitorObelisk extends AbstractPowerConsumerEntity implements
|
|||||||
super(new SlotDefinition(0, 0, 1));
|
super(new SlotDefinition(0, 0, 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockInhibitorObelisk.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockInhibitorObelisk.unlocalisedName;
|
return ModObject.blockInhibitorObelisk.unlocalisedName;
|
||||||
|
|||||||
@@ -121,11 +121,6 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity
|
|||||||
setCapacitor(Capacitors.ACTIVATED_CAPACITOR);
|
setCapacitor(Capacitors.ACTIVATED_CAPACITOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockWeatherObelisk.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockWeatherObelisk.unlocalisedName;
|
return ModObject.blockWeatherObelisk.unlocalisedName;
|
||||||
|
|||||||
@@ -32,11 +32,6 @@ public class TileExperienceObelisk extends AbstractMachineEntity
|
|||||||
super(new SlotDefinition(0, 0, 0));
|
super(new SlotDefinition(0, 0, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockExperienceObelisk.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockExperienceObelisk.unlocalisedName;
|
return ModObject.blockExperienceObelisk.unlocalisedName;
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISid
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockPainter.name";
|
return "Auto Painter";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -100,11 +100,6 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
|
|||||||
super(new SlotDefinition(8, 1));
|
super(new SlotDefinition(8, 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockSliceAndSplice.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockSliceAndSplice.unlocalisedName;
|
return ModObject.blockSliceAndSplice.unlocalisedName;
|
||||||
|
|||||||
@@ -113,11 +113,6 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx
|
|||||||
return xpCont;
|
return xpCont;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockSoulBinder.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockSoulBinder.unlocalisedName;
|
return ModObject.blockSoulBinder.unlocalisedName;
|
||||||
|
|||||||
@@ -197,11 +197,6 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity implements IRa
|
|||||||
forceClientUpdate = true;
|
forceClientUpdate = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockPoweredSpawner.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockPoweredSpawner.unlocalisedName;
|
return ModObject.blockPoweredSpawner.unlocalisedName;
|
||||||
|
|||||||
@@ -225,11 +225,6 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler, IT
|
|||||||
this.voidMode = mode;
|
this.voidMode = mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockTank.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return "tank";
|
return "tank";
|
||||||
|
|||||||
@@ -157,11 +157,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
return "tile.blockTransceiver.name";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getMachineName() {
|
public String getMachineName() {
|
||||||
return ModObject.blockTransceiver.unlocalisedName;
|
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.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import crazypants.enderio.EnderIO;
|
import crazypants.enderio.EnderIO;
|
||||||
|
import crazypants.enderio.ModObject;
|
||||||
import crazypants.enderio.TileEntityEio;
|
import crazypants.enderio.TileEntityEio;
|
||||||
import crazypants.enderio.conduit.item.FilterRegister;
|
import crazypants.enderio.conduit.item.FilterRegister;
|
||||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||||
@@ -211,7 +212,7 @@ public class TileVacuumChest extends TileEntityEio
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockVacuumChest.name";
|
return ModObject.blockVacuumChest.unlocalisedName;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler,
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getInventoryName() {
|
public String getInventoryName() {
|
||||||
return "tile.blockVat.name";
|
return ModObject.blockVat.unlocalisedName;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -106,6 +106,11 @@ public class ItemTeleportStaff extends ItemTravelStaff {
|
|||||||
return power;
|
return power;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isTeleportStaff(EntityPlayer player, ItemStack stack) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getEnergyStored(ItemStack item) {
|
public int getEnergyStored(ItemStack item) {
|
||||||
// Has infinite energy, always report as being full of energy for any validation-code purposes.
|
// Has infinite energy, always report as being full of energy for any validation-code purposes.
|
||||||
|
|||||||
@@ -135,6 +135,18 @@ public class TravelController {
|
|||||||
// allow 4 blocks of c/s player pos desync
|
// allow 4 blocks of c/s player pos desync
|
||||||
if (getPower(toTp, source, target, -4F) > powerUse) return "power use too little";
|
if (getPower(toTp, source, target, -4F) > powerUse) return "power use too little";
|
||||||
ItemStack equippedItem = toTp.getCurrentEquippedItem();
|
ItemStack equippedItem = toTp.getCurrentEquippedItem();
|
||||||
|
|
||||||
|
if (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)
|
||||||
|
|| !((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) {
|
||||||
|
for (ItemStack armor : toTp.inventory.armorInventory) {
|
||||||
|
if (armor != null && armor.getItem() instanceof IItemOfTravel
|
||||||
|
&& ((IItemOfTravel) armor.getItem()).isActive(toTp, armor)) {
|
||||||
|
equippedItem = armor;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (source) {
|
switch (source) {
|
||||||
case TELEPAD:
|
case TELEPAD:
|
||||||
// this source is invalid for this type of packet
|
// this source is invalid for this type of packet
|
||||||
@@ -172,10 +184,9 @@ public class TravelController {
|
|||||||
return null;
|
return null;
|
||||||
case TELEPORT_STAFF_BLINK:
|
case TELEPORT_STAFF_BLINK:
|
||||||
case TELEPORT_STAFF:
|
case TELEPORT_STAFF:
|
||||||
// tp staff is creative version of traveling staff
|
if (equippedItem != null && equippedItem.getItem() instanceof IItemOfTravel travelItem
|
||||||
// no energy check or anything else needed
|
&& travelItem.isActive(toTp, equippedItem)
|
||||||
// but the player must actually be equipped with one of these
|
&& travelItem.isTeleportStaff(toTp, equippedItem)) {
|
||||||
if (equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff) {
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return "not staff";
|
return "not staff";
|
||||||
@@ -557,6 +568,19 @@ public class TravelController {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ItemStack equipped = ep.getCurrentEquippedItem();
|
||||||
|
|
||||||
|
if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)
|
||||||
|
|| !((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
|
||||||
|
for (ItemStack armor : ep.inventory.armorInventory) {
|
||||||
|
if (armor != null && armor.getItem() instanceof IItemOfTravel
|
||||||
|
&& ((IItemOfTravel) armor.getItem()).isActive(ep, armor)) {
|
||||||
|
equipped = armor;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (BackhandUtil.backhandLoaded) {
|
if (BackhandUtil.backhandLoaded) {
|
||||||
final ItemStack offhand = BackhandUtils.getOffhandItem(ep);
|
final ItemStack offhand = BackhandUtils.getOffhandItem(ep);
|
||||||
if (offhand != null && offhand.getItem() != null) {
|
if (offhand != null && offhand.getItem() != null) {
|
||||||
@@ -567,7 +591,6 @@ public class TravelController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemStack equipped = ep.getCurrentEquippedItem();
|
|
||||||
if (checkInventoryAndBaubles) {
|
if (checkInventoryAndBaubles) {
|
||||||
if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)
|
if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)
|
||||||
|| !((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
|
|| !((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
|
||||||
@@ -589,6 +612,13 @@ public class TravelController {
|
|||||||
*/
|
*/
|
||||||
@Nullable
|
@Nullable
|
||||||
public ItemStack findTravelItemInInventoryOrBaubles(EntityPlayer ep) {
|
public ItemStack findTravelItemInInventoryOrBaubles(EntityPlayer ep) {
|
||||||
|
for (ItemStack armor : ep.inventory.armorInventory) {
|
||||||
|
if (armor != null && armor.getItem() instanceof IItemOfTravel
|
||||||
|
&& ((IItemOfTravel) armor.getItem()).isActive(ep, armor)) {
|
||||||
|
return armor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ItemStack travelItem = null;
|
ItemStack travelItem = null;
|
||||||
for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
|
for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
|
||||||
ItemStack stack = ep.inventory.getStackInSlot(i);
|
ItemStack stack = ep.inventory.getStackInSlot(i);
|
||||||
@@ -626,6 +656,14 @@ public class TravelController {
|
|||||||
* @return -1 if no travel item found. 0 or more if item found in inventory. -2 or less if item found in Baubles.
|
* @return -1 if no travel item found. 0 or more if item found in inventory. -2 or less if item found in Baubles.
|
||||||
*/
|
*/
|
||||||
public int findTravelItemSlotInInventoryOrBaubles(EntityPlayer ep) {
|
public int findTravelItemSlotInInventoryOrBaubles(EntityPlayer ep) {
|
||||||
|
for (int i = 0; i < ep.inventory.armorInventory.length; i++) {
|
||||||
|
ItemStack armor = ep.inventory.armorInventory[i];
|
||||||
|
if (armor != null && armor.getItem() instanceof IItemOfTravel
|
||||||
|
&& ((IItemOfTravel) armor.getItem()).isActive(ep, armor)) {
|
||||||
|
return ep.inventory.mainInventory.length + i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int travelItemSlot = -1;
|
int travelItemSlot = -1;
|
||||||
for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
|
for (int i = 0; i < ep.inventory.getSizeInventory(); i++) {
|
||||||
ItemStack stack = ep.inventory.getStackInSlot(i);
|
ItemStack stack = ep.inventory.getStackInSlot(i);
|
||||||
@@ -741,10 +779,7 @@ public class TravelController {
|
|||||||
|
|
||||||
for (Table.Cell<Double, Double, BlockCoord> cell : possibleDestinations.cellSet()) {
|
for (Table.Cell<Double, Double, BlockCoord> cell : possibleDestinations.cellSet()) {
|
||||||
if (cell.getColumnKey() <= maxDistance) {
|
if (cell.getColumnKey() <= maxDistance) {
|
||||||
// If the client hasn't selected a target, the server shouldn't try to force one,
|
return Optional.of(cell.getValue());
|
||||||
// but checking if there is one just outside of range (below message) might still
|
|
||||||
// be useful.
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1069,12 +1104,9 @@ public class TravelController {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find the nearest travel anchor within the configured angle (default ~10 degrees).
|
// Find the nearest travel anchor within roughly 10 degrees.
|
||||||
Optional<BlockCoord> selectedBlock = findBlocksWithinAngle(
|
Optional<BlockCoord> selectedBlock = findBlocksWithinAngle(player, candidates.keySet(), 0.175, Double.MAX_VALUE)
|
||||||
player,
|
.values().stream().findFirst();
|
||||||
candidates.keySet(),
|
|
||||||
Config.travelAnchorSnapAngle,
|
|
||||||
Double.MAX_VALUE).values().stream().findFirst();
|
|
||||||
selectedCoord = selectedBlock.orElse(null);
|
selectedCoord = selectedBlock.orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1225,4 +1257,9 @@ public class TravelController {
|
|||||||
true);
|
true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public void forceUpdateTarget(EntityPlayer player) {
|
||||||
|
updateSelectedTarget(player);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -62,10 +62,6 @@ enderio.itemLiquidConduitCrystallineEnder.name=Crystalline Ender Fluid Conduit
|
|||||||
enderio.itemLiquidConduitCrystallinePinkSlimeEnder.name=Crystalline Pink Slime Ender Fluid Conduit
|
enderio.itemLiquidConduitCrystallinePinkSlimeEnder.name=Crystalline Pink Slime Ender Fluid Conduit
|
||||||
enderio.itemLiquidConduitMelodicEnder.name=Melodic Ender Fluid Conduit
|
enderio.itemLiquidConduitMelodicEnder.name=Melodic Ender Fluid Conduit
|
||||||
enderio.itemLiquidConduitStellarEnder.name=Stellar 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.lockedType=Fluid type locked to
|
||||||
enderio.itemLiquidConduit.unlockedType=Fluid type unlocked
|
enderio.itemLiquidConduit.unlockedType=Fluid type unlocked
|
||||||
enderio.itemLiquidConduit.lockedWaila=Locked to
|
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.line5=Cloud Seed: Rain
|
||||||
tile.blockWeatherObelisk.tooltip.detailed.line6=Concentrated Cloud Seed: Thunder
|
tile.blockWeatherObelisk.tooltip.detailed.line6=Concentrated Cloud Seed: Thunder
|
||||||
|
|
||||||
tile.blockInhibitorObelisk.name=Inhibitor Obelisk
|
|
||||||
|
|
||||||
tile.blockBuffer.name=Buffer
|
tile.blockBuffer.name=Buffer
|
||||||
tile.blockBuffer.item.name=Item Buffer
|
tile.blockBuffer.item.name=Item Buffer
|
||||||
tile.blockBuffer.power.name=Power Buffer
|
tile.blockBuffer.power.name=Power Buffer
|
||||||
|
|||||||
@@ -608,8 +608,6 @@ tile.blockExperienceObelisk.tooltip.detailed.line3=至相邻的储罐中
|
|||||||
tile.blockWeatherObelisk.name=气象方尖碑
|
tile.blockWeatherObelisk.name=气象方尖碑
|
||||||
tile.blockWeatherObelisk.tooltip.detailed.line1=改变当前天气
|
tile.blockWeatherObelisk.tooltip.detailed.line1=改变当前天气
|
||||||
|
|
||||||
tile.blockInhibitorObelisk.name=传送抑制方尖碑
|
|
||||||
|
|
||||||
tile.blockBuffer.item.name=物品缓存器
|
tile.blockBuffer.item.name=物品缓存器
|
||||||
tile.blockBuffer.power.name=能量缓存器
|
tile.blockBuffer.power.name=能量缓存器
|
||||||
tile.blockBuffer.omni.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 |