Compare commits

..
Author SHA1 Message Date
shironakoushi 57ba3ac516 Format fluid conduit flow rates with the client locale
Use PowerDisplayUtil.formatPower instead of a Locale.ROOT NumberFormat, so
the Max Extract / Max IO tooltip lines follow the default locale like the
rest of EnderIO's number formatting (including its non-breaking space fix).
2026-11-04 20:54:22 +08:00
Martin Robertz 8d379aff8c Merge branch 'master' into feat/ender-fluid-conduits 2026-11-04 13:41:11 +01:00
Eldrinn ElanteyandNikolay S. 8ead31ff76 Translate chat messages on the client instead of the server (#275)
Co-authored-by: Nikolay S. <[email protected]>
2026-11-01 19:28:01 +00:00
Eldrinn Elantey 7bebb05573 Respect recipe slot numbers when validating machine inputs (#260) 2026-10-31 22:29:14 +01:00
MissBismuthandMartin Robertz 87e5a32b89 Fix painted blocks missing paint when placed with wand (#280)
Co-authored-by: Martin Robertz <[email protected]>
2026-10-27 20:48:42 +01:00
Ressed c232ea8534 Fix the iteration of getting slot from inventory for existing item filter. (#269) 2026-10-25 19:25:58 +01:00
Fib4ikandM R S E d27f30951a Add redstone signal support for item conduit. (#265)
Co-authored-by: M R S E <[email protected]>
2026-10-06 19:19:44 +02:00
Mykhailo Balaker 8dcda4e822 Prevent fall-through when clicking on the "Show Range" button in Vacuum Chest GUI (#274) 2026-09-27 18:08:03 +00:00
github-actions[bot]andGitHub GTNH Actions 8255c261ee Optimising images contained in feat/ender-fluid-conduits for #272 (#273)
Co-authored-by: GitHub GTNH Actions <[email protected]>
2026-09-26 22:53:58 +08:00
shironakoushi 21717fa939 Group fluid conduit flow rates with thousands separators
The Max Extract and Max IO lines of the fluid conduit tooltips now print grouped numbers (100,000 instead of 100000). Locale.ROOT is used so the separator stays a comma no matter which language the client runs in.
2026-09-26 21:05:01 +08:00
shironakoushi d96c045ba3 Add four more ender fluid conduit tiers
Adds Prismatic Naquadah, Fluxed, Transcendent and Cosmic ender fluid conduits as metadata 7-10, following the existing ender conduit pattern: new AbstractEnderLiquidConduit Type entries with config-backed rates, conduit classes, item subtypes, tooltips, client icon registration, lang keys and textures. Extraction rates are 100,000 / 1,000,000 / 20,000,000 / 200,000,000 mB/t, each with the usual 4x max IO.
2026-09-26 21:04:50 +08:00
58 changed files with 967 additions and 309 deletions

No files matched your search

+1 -1
View File
@@ -28,7 +28,7 @@ dependencies {
compileOnly(rfg.deobf('curse.maven:computercraft-67504:2269339')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
compileOnly('com.github.GTNewHorizons:BetterBuildersWands:0.13.12-GTNH:dev@jar')
compileOnlyApi('com.github.GTNewHorizons:Angelica:2.2.10:api') {transitive = false}
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.196:dev")
compileOnly('curse.maven:automagy-222153:2285272')
@@ -33,12 +33,16 @@ import crazypants.enderio.conduit.gas.GasUtil;
import crazypants.enderio.conduit.item.ItemConduit;
import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
import crazypants.enderio.conduit.liquid.CosmicEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
import crazypants.enderio.conduit.liquid.FluxedEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.LiquidConduit;
import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.PrismaticNaquadahEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.TranscendentEnderLiquidConduit;
import crazypants.enderio.conduit.me.MEConduit;
import crazypants.enderio.conduit.me.MEUtil;
import crazypants.enderio.conduit.oc.OCConduit;
@@ -203,6 +207,10 @@ public class ClientProxy extends CommonProxy {
CrystallinePinkSlimeEnderLiquidConduit.initIcons();
MelodicEnderLiquidConduit.initIcons();
StellarEnderLiquidConduit.initIcons();
PrismaticNaquadahEnderLiquidConduit.initIcons();
FluxedEnderLiquidConduit.initIcons();
TranscendentEnderLiquidConduit.initIcons();
CosmicEnderLiquidConduit.initIcons();
ItemConduit.initIcons();
if (GasUtil.isGasConduitEnabled()) {
GasConduit.initIcons();
@@ -47,6 +47,7 @@ import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import crazypants.enderio.api.IMC;
import crazypants.enderio.betterbuilderswands.PaintedCustomMapping;
import crazypants.enderio.block.BlockDarkSteelAnvil;
import crazypants.enderio.block.BlockDarkSteelLadder;
import crazypants.enderio.block.BlockDarkSteelPressurePlate;
@@ -190,7 +191,8 @@ import crazypants.util.EE3Util;
after:Waila@[1.5.8,);\
after:Thaumcraft;\
after:appliedenergistics2@[rv2-beta-8,);\
after:Railcraft@[9.16.7,)\
after:Railcraft@[9.16.7,);\
after:betterbuilderswands@[0.13.12,)\
""", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO")
public class EnderIO {
@@ -839,6 +841,9 @@ public class EnderIO {
Log.info("Failed to registered Capacitor Banks as Tinkers Construct Flux Upgrades");
}
}
if (Loader.isModLoaded("betterbuilderswands")) {
PaintedCustomMapping.registerMappings();
}
ThaumcraftCompat.load();
}
@@ -0,0 +1,101 @@
package crazypants.enderio.betterbuilderswands;
import java.util.function.BiFunction;
import java.util.function.IntFunction;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import com.github.bsideup.jabel.Desugar;
import crazypants.enderio.EnderIO;
import crazypants.enderio.machine.painter.BlockPaintedCarpet;
import crazypants.enderio.machine.painter.BlockPaintedFence;
import crazypants.enderio.machine.painter.BlockPaintedFenceGate;
import crazypants.enderio.machine.painter.BlockPaintedGlowstone;
import crazypants.enderio.machine.painter.BlockPaintedSlab;
import crazypants.enderio.machine.painter.BlockPaintedStair;
import crazypants.enderio.machine.painter.BlockPaintedWall;
import crazypants.enderio.machine.painter.TileEntityPaintedBlock;
import portablejim.bbw.BetterBuildersWandsMod;
import portablejim.bbw.basics.Point3d;
import portablejim.bbw.core.conversion.ICustomMapping;
import portablejim.bbw.shims.IPlayerShim;
import portablejim.bbw.shims.IWorldShim;
@Desugar
public record PaintedCustomMapping(Block lookBlock, BiFunction<Block, Integer, ItemStack> itemStackGetter, int meta)
implements ICustomMapping {
@Override
public Block getLookBlock() {
return lookBlock;
}
@Override
public int getMeta() {
return meta;
}
@Override
public ItemStack getItems(IWorldShim world, IPlayerShim player, Point3d point) {
if (world.getTile(point) instanceof TileEntityPaintedBlock painted) {
return itemStackGetter.apply(painted.getSourceBlock(), painted.getSourceBlockMetadata());
}
return null;
}
@Override
public boolean shouldCopyTileNBT() {
return true;
}
public static void registerMappings() {
register(
i -> new PaintedCustomMapping(
EnderIO.blockPaintedGlowstone,
BlockPaintedGlowstone::createItemStackForSourceBlock,
i));
register(
i -> new PaintedCustomMapping(
EnderIO.blockPaintedStair,
BlockPaintedStair::createItemStackForSourceBlock,
i));
register(
i -> new PaintedCustomMapping(
EnderIO.blockPaintedFence,
BlockPaintedFence::createItemStackForSourceBlock,
i));
register(
i -> new PaintedCustomMapping(
EnderIO.blockPaintedFenceGate,
BlockPaintedFenceGate::createItemStackForSourceBlock,
i));
register(
i -> new PaintedCustomMapping(
EnderIO.blockPaintedCarpet,
BlockPaintedCarpet::createItemStackForSourceBlock,
i));
register(
i -> new PaintedCustomMapping(
EnderIO.blockPaintedSlab,
BlockPaintedSlab::createItemStackForSourceBlock,
i));
register(
i -> new PaintedCustomMapping(
EnderIO.blockPaintedWall,
BlockPaintedWall::createItemStackForSourceBlock,
i));
register(
i -> new PaintedCustomMapping(
EnderIO.blockPaintedDoubleSlab,
BlockPaintedSlab::createItemStackForSourceBlock,
i));
}
private static void register(IntFunction<ICustomMapping> mapping) {
for (int i = 0; i < 16; i++) {
BetterBuildersWandsMod.instance.mappingManager.setMapping(mapping.apply(i));
}
}
}
@@ -31,14 +31,18 @@ import crazypants.enderio.conduit.item.IItemConduit;
import crazypants.enderio.conduit.item.ItemConduitNetwork;
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduit;
import crazypants.enderio.conduit.liquid.AdvancedLiquidConduitNetwork;
import crazypants.enderio.conduit.liquid.CosmicEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.CrystallinePinkSlimeEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
import crazypants.enderio.conduit.liquid.EnderLiquidConduitNetwork;
import crazypants.enderio.conduit.liquid.FluxedEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.ILiquidConduit;
import crazypants.enderio.conduit.liquid.LiquidConduitNetwork;
import crazypants.enderio.conduit.liquid.MelodicEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.PrismaticNaquadahEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.StellarEnderLiquidConduit;
import crazypants.enderio.conduit.liquid.TranscendentEnderLiquidConduit;
import crazypants.enderio.conduit.me.IMEConduit;
import crazypants.enderio.conduit.me.MEConduitNetwork;
import crazypants.enderio.conduit.oc.IOCConduit;
@@ -672,6 +676,14 @@ public abstract class AbstractConduit implements IConduit {
return new PowerConduitNetwork();
} else if (StellarEnderLiquidConduit.class.isAssignableFrom(type)) {
return new EnderLiquidConduitNetwork(StellarEnderLiquidConduit.TYPE);
} else if (PrismaticNaquadahEnderLiquidConduit.class.isAssignableFrom(type)) {
return new EnderLiquidConduitNetwork(PrismaticNaquadahEnderLiquidConduit.TYPE);
} else if (FluxedEnderLiquidConduit.class.isAssignableFrom(type)) {
return new EnderLiquidConduitNetwork(FluxedEnderLiquidConduit.TYPE);
} else if (TranscendentEnderLiquidConduit.class.isAssignableFrom(type)) {
return new EnderLiquidConduitNetwork(TranscendentEnderLiquidConduit.TYPE);
} else if (CosmicEnderLiquidConduit.class.isAssignableFrom(type)) {
return new EnderLiquidConduitNetwork(CosmicEnderLiquidConduit.TYPE);
} else if (MelodicEnderLiquidConduit.class.isAssignableFrom(type)) {
return new EnderLiquidConduitNetwork(MelodicEnderLiquidConduit.TYPE);
} else if (CrystallinePinkSlimeEnderLiquidConduit.class.isAssignableFrom(type)) {
@@ -320,7 +320,7 @@ public class ConduitUtil {
}
int signalStrength = getInternalSignalForColor(bundle, col);
if (signalStrength < 15 && DyeColor.RED == col && bundle != null && bundle.getEntity() != null) {
if (signalStrength < 15 && bundle != null && bundle.getEntity() != null) {
TileEntity te = bundle.getEntity();
signalStrength = Math
.max(signalStrength, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord));
@@ -175,6 +175,7 @@ public class ItemSettings extends BaseSettingsPanel {
private void updateButtons() {
rsB.onGuiInit();
rsB.setMode(itemConduit.getExtractionRedstoneMode(gui.getDir()));
colorB.onGuiInit();
loopB.onGuiInit();
loopB.setSelected(itemConduit.isSelfFeedEnabled(gui.getDir()));
@@ -8,10 +8,13 @@ import java.util.Map;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.common.util.ForgeDirection;
import com.enderio.core.common.util.BlockCoord;
import crazypants.enderio.EnderIO;
import crazypants.enderio.conduit.AbstractConduitNetwork;
import crazypants.enderio.conduit.item.NetworkedInventory.Target;
import crazypants.enderio.conduit.item.filter.IItemFilter;
@@ -176,8 +179,8 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
}
}
public List<String> getTargetsForExtraction(BlockCoord extractFrom, IItemConduit con, ItemStack input) {
List<String> result = new ArrayList<>();
public List<IChatComponent> getTargetsForExtraction(BlockCoord extractFrom, IItemConduit con, ItemStack input) {
List<IChatComponent> result = new ArrayList<>();
List<NetworkedInventory> invs = getOrCreate(extractFrom);
for (NetworkedInventory source : invs) {
@@ -187,12 +190,12 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
for (Target t : source.sendPriority) {
IItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir);
if (input == null || f == null || f.doesItemPassFilter(t.inv, input)) {
String s = t.inv.getLocalizedInventoryName() + " "
+ t.inv.location.chatString()
+ " Distance ["
+ t.distance
+ "] ";
result.add(s);
result.add(
t.inv.getInventoryNameComponent()
.appendText(" " + t.inv.location.chatString() + " ").appendSibling(
new ChatComponentTranslation(
EnderIO.lang.addPrefix("gui.mjReader.distance"),
t.distance)));
}
}
}
@@ -202,13 +205,13 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
return result;
}
public List<String> getInputSourcesFor(IItemConduit con, ForgeDirection dir, ItemStack input) {
List<String> result = new ArrayList<>();
public List<IChatComponent> getInputSourcesFor(IItemConduit con, ForgeDirection dir, ItemStack input) {
List<IChatComponent> result = new ArrayList<>();
for (NetworkedInventory inv : inventories) {
if (inv.hasTarget(con, dir)) {
IItemFilter f = inv.con.getInputFilter(inv.conDir);
if (input == null || f == null || f.doesItemPassFilter(inv, input)) {
result.add(inv.getLocalizedInventoryName() + " " + inv.location.chatString());
result.add(inv.getInventoryNameComponent().appendText(" " + inv.location.chatString()));
}
}
}
@@ -12,6 +12,9 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@@ -442,6 +445,10 @@ public class NetworkedInventory {
this.inventorySide = inventorySide;
}
/**
* @deprecated Translates on the server. Use {@link #getInventoryNameComponent()} for chat.
*/
@Deprecated
public String getLocalizedInventoryName() {
String inventoryName = getInventory().getInventoryName();
if (inventoryName == null) {
@@ -453,6 +460,22 @@ public class NetworkedInventory {
}
}
public IChatComponent getInventoryNameComponent() {
String inventoryName = getInventory().getInventoryName();
if (inventoryName == null) {
return new ChatComponentText("null");
}
// Ask the tile entity: InventoryWrapper always reports no custom name.
// The client parses the translation as a format string and falls back to en_US if it fails, so a '%' in the
// en_US text (or in the key when untranslated) could crash it. A dedicated server translates to en_US.
boolean customName = connectedTileEntity instanceof IInventory
&& ((IInventory) connectedTileEntity).hasCustomInventoryName();
if (customName || StatCollector.translateToLocal(inventoryName).contains("%")) {
return new ChatComponentText(inventoryName);
}
return new ChatComponentTranslation(inventoryName);
}
static class Target implements Comparable<Target> {
NetworkedInventory inv;
@@ -47,8 +47,8 @@ public class ExistingItemFilter implements IItemFilter {
private boolean isStackInInventory(NetworkedInventory ni, ItemStack item) {
int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide());
for (int i = 0; i < slots.length; i++) {
ItemStack stack = ni.getInventory().getStackInSlot(i);
for (int slot : slots) {
ItemStack stack = ni.getInventory().getStackInSlot(slot);
if (stackEqual(item, stack)) {
return true;
}
@@ -116,8 +116,8 @@ public class ExistingItemFilter implements IItemFilter {
snapshot = new ArrayList<>();
}
int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide());
for (int i = 0; i < slots.length; i++) {
ItemStack stack = ni.getInventory().getStackInSlot(i);
for (int slot : slots) {
ItemStack stack = ni.getInventory().getStackInSlot(slot);
if (stack != null && !isStackInSnapshot(stack)) {
snapshot.add(stack);
}
@@ -8,6 +8,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
@@ -67,7 +68,7 @@ public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade,
ExistingItemFilter filter = (ExistingItemFilter) createFilterFromStack(item);
String unloc = "item.itemExistingItemFilter."
+ (filter.mergeSnapshot(inv) ? "filterUpdated" : "filterNotUpdated");
ChatUtil.sendNoSpamUnloc(player, EnderIO.lang, unloc);
ChatUtil.sendNoSpam(player, new ChatComponentTranslation(EnderIO.lang.addPrefix(unloc)));
FilterRegister.writeFilterToStack(filter, item);
return true;
}
@@ -87,7 +87,17 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit {
MELODIC(() -> Config.melodicEnderFluidConduitExtractRate, () -> Config.melodicEnderFluidConduitMaxIoRate),
STELLAR(() -> Config.stellarEnderFluidConduitExtractRate, () -> Config.stellarEnderFluidConduitMaxIoRate);
STELLAR(() -> Config.stellarEnderFluidConduitExtractRate, () -> Config.stellarEnderFluidConduitMaxIoRate),
PRISMATIC_NAQUADAH(() -> Config.prismaticNaquadahEnderFluidConduitExtractRate,
() -> Config.prismaticNaquadahEnderFluidConduitMaxIoRate),
FLUXED(() -> Config.fluxedEnderFluidConduitExtractRate, () -> Config.fluxedEnderFluidConduitMaxIoRate),
TRANSCENDENT(() -> Config.transcendentEnderFluidConduitExtractRate,
() -> Config.transcendentEnderFluidConduitMaxIoRate),
COSMIC(() -> Config.cosmicEnderFluidConduitExtractRate, () -> Config.cosmicEnderFluidConduitMaxIoRate);
private final IntSupplier getMaxExtractPerTick;
private final IntSupplier getMaxIoPerTick;
@@ -7,15 +7,16 @@ import java.util.Set;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import com.enderio.core.common.util.BlockCoord;
import com.enderio.core.common.util.ChatUtil;
import com.gtnewhorizon.gtnhlib.chat.customcomponents.ChatComponentFluidName;
import crazypants.enderio.EnderIO;
import crazypants.enderio.conduit.AbstractConduitNetwork;
@@ -110,7 +111,9 @@ public abstract class AbstractTankConduit extends AbstractLiquidConduit {
if (network.fluidTypeLocked) {
network.setFluidTypeLocked(false);
numEmptyEvents = 0;
ChatUtil.sendNoSpamUnloc(player, EnderIO.lang, "itemLiquidConduit.unlockedType");
ChatUtil.sendNoSpam(
player,
new ChatComponentTranslation(EnderIO.lang.addPrefix("itemLiquidConduit.unlockedType")));
}
} else if (network != null) {
network.setFluidType(null);
@@ -128,11 +131,10 @@ public abstract class AbstractTankConduit extends AbstractLiquidConduit {
|| LiquidConduitNetwork.areFluidsCompatable(getFluidType(), fluid))) {
network.setFluidType(fluid);
network.setFluidTypeLocked(true);
ChatUtil.sendNoSpamUnloc(
ChatUtil.sendNoSpam(
player,
EnderIO.lang,
"itemLiquidConduit.lockedType",
" " + FluidRegistry.getFluidName(fluid));
new ChatComponentTranslation(EnderIO.lang.addPrefix("itemLiquidConduit.lockedType"))
.appendText(" ").appendSibling(new ChatComponentFluidName(fluid)));
}
}
return true;
@@ -0,0 +1,57 @@
package crazypants.enderio.conduit.liquid;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import com.enderio.core.client.render.IconUtil;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class CosmicEnderLiquidConduit extends AbstractEnderLiquidConduit {
public static final Type TYPE = Type.COSMIC;
public static final int METADATA = 10;
public static final String ICON_KEY = "enderio:liquidConduitCosmicEnder";
public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreCosmicEnder";
static IIcon iconKey;
static IIcon iconCoreKey;
@SideOnly(Side.CLIENT)
public static void initIcons() {
IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@Override
public void registerIcons(IIconRegister register) {
iconKey = register.registerIcon(ICON_KEY);
iconCoreKey = register.registerIcon(ICON_CORE_KEY);
}
@Override
public int getTextureType() {
return 0;
}
});
}
@Override
public Type getType() {
return TYPE;
}
@Override
public int getMetadata() {
return METADATA;
}
@Override
protected IIcon getIconKey() {
return iconKey;
}
@Override
protected IIcon getIconCoreKey() {
return iconCoreKey;
}
}
@@ -0,0 +1,57 @@
package crazypants.enderio.conduit.liquid;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import com.enderio.core.client.render.IconUtil;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class FluxedEnderLiquidConduit extends AbstractEnderLiquidConduit {
public static final Type TYPE = Type.FLUXED;
public static final int METADATA = 8;
public static final String ICON_KEY = "enderio:liquidConduitFluxedEnder";
public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreFluxedEnder";
static IIcon iconKey;
static IIcon iconCoreKey;
@SideOnly(Side.CLIENT)
public static void initIcons() {
IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@Override
public void registerIcons(IIconRegister register) {
iconKey = register.registerIcon(ICON_KEY);
iconCoreKey = register.registerIcon(ICON_CORE_KEY);
}
@Override
public int getTextureType() {
return 0;
}
});
}
@Override
public Type getType() {
return TYPE;
}
@Override
public int getMetadata() {
return METADATA;
}
@Override
protected IIcon getIconKey() {
return iconKey;
}
@Override
protected IIcon getIconCoreKey() {
return iconCoreKey;
}
}
@@ -16,6 +16,7 @@ import crazypants.enderio.conduit.AbstractItemConduit;
import crazypants.enderio.conduit.IConduit;
import crazypants.enderio.conduit.ItemConduitSubtype;
import crazypants.enderio.config.Config;
import crazypants.enderio.power.PowerDisplayUtil;
public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedTooltipProvider {
@@ -36,7 +37,19 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
"enderio:itemLiquidConduitMelodicEnder"),
new ItemConduitSubtype(
ModObject.itemLiquidConduit.name() + "StellarEnder",
"enderio:itemLiquidConduitStellarEnder") };
"enderio:itemLiquidConduitStellarEnder"),
new ItemConduitSubtype(
ModObject.itemLiquidConduit.name() + "PrismaticNaquadahEnder",
"enderio:itemLiquidConduitPrismaticNaquadahEnder"),
new ItemConduitSubtype(
ModObject.itemLiquidConduit.name() + "FluxedEnder",
"enderio:itemLiquidConduitFluxedEnder"),
new ItemConduitSubtype(
ModObject.itemLiquidConduit.name() + "TranscendentEnder",
"enderio:itemLiquidConduitTranscendentEnder"),
new ItemConduitSubtype(
ModObject.itemLiquidConduit.name() + "CosmicEnder",
"enderio:itemLiquidConduitCosmicEnder") };
public static ItemLiquidConduit create() {
ItemLiquidConduit result = new ItemLiquidConduit();
@@ -70,6 +83,14 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
return new MelodicEnderLiquidConduit();
case StellarEnderLiquidConduit.METADATA:
return new StellarEnderLiquidConduit();
case PrismaticNaquadahEnderLiquidConduit.METADATA:
return new PrismaticNaquadahEnderLiquidConduit();
case FluxedEnderLiquidConduit.METADATA:
return new FluxedEnderLiquidConduit();
case TranscendentEnderLiquidConduit.METADATA:
return new TranscendentEnderLiquidConduit();
case CosmicEnderLiquidConduit.METADATA:
return new CosmicEnderLiquidConduit();
default:
throw new IllegalArgumentException("Unrecognized ender fluid conduit type: " + stack.getItemDamage());
}
@@ -125,14 +146,40 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
maxIo = StellarEnderLiquidConduit.TYPE.getMaxIoPerTick();
break;
case PrismaticNaquadahEnderLiquidConduit.METADATA:
extractRate = PrismaticNaquadahEnderLiquidConduit.TYPE.getMaxExtractPerTick();
maxIo = PrismaticNaquadahEnderLiquidConduit.TYPE.getMaxIoPerTick();
break;
case FluxedEnderLiquidConduit.METADATA:
extractRate = FluxedEnderLiquidConduit.TYPE.getMaxExtractPerTick();
maxIo = FluxedEnderLiquidConduit.TYPE.getMaxIoPerTick();
break;
case TranscendentEnderLiquidConduit.METADATA:
extractRate = TranscendentEnderLiquidConduit.TYPE.getMaxExtractPerTick();
maxIo = TranscendentEnderLiquidConduit.TYPE.getMaxIoPerTick();
break;
case CosmicEnderLiquidConduit.METADATA:
extractRate = CosmicEnderLiquidConduit.TYPE.getMaxExtractPerTick();
maxIo = CosmicEnderLiquidConduit.TYPE.getMaxIoPerTick();
break;
default:
throw new IllegalArgumentException(
"Unrecognized ender fluid conduit type: " + itemstack.getItemDamage());
}
String mbt = " " + EnderIO.lang.localize("fluid.millibucketsTick");
list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " " + extractRate + mbt);
list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + maxIo + mbt);
list.add(
EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " "
+ PowerDisplayUtil.formatPower(extractRate)
+ mbt);
list.add(
EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " "
+ PowerDisplayUtil.formatPower(maxIo)
+ mbt);
if (itemstack.getItemDamage() == 0) {
SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduit");
@@ -0,0 +1,57 @@
package crazypants.enderio.conduit.liquid;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import com.enderio.core.client.render.IconUtil;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class PrismaticNaquadahEnderLiquidConduit extends AbstractEnderLiquidConduit {
public static final Type TYPE = Type.PRISMATIC_NAQUADAH;
public static final int METADATA = 7;
public static final String ICON_KEY = "enderio:liquidConduitPrismaticNaquadahEnder";
public static final String ICON_CORE_KEY = "enderio:liquidConduitCorePrismaticNaquadahEnder";
static IIcon iconKey;
static IIcon iconCoreKey;
@SideOnly(Side.CLIENT)
public static void initIcons() {
IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@Override
public void registerIcons(IIconRegister register) {
iconKey = register.registerIcon(ICON_KEY);
iconCoreKey = register.registerIcon(ICON_CORE_KEY);
}
@Override
public int getTextureType() {
return 0;
}
});
}
@Override
public Type getType() {
return TYPE;
}
@Override
public int getMetadata() {
return METADATA;
}
@Override
protected IIcon getIconKey() {
return iconKey;
}
@Override
protected IIcon getIconCoreKey() {
return iconCoreKey;
}
}
@@ -0,0 +1,57 @@
package crazypants.enderio.conduit.liquid;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import com.enderio.core.client.render.IconUtil;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TranscendentEnderLiquidConduit extends AbstractEnderLiquidConduit {
public static final Type TYPE = Type.TRANSCENDENT;
public static final int METADATA = 9;
public static final String ICON_KEY = "enderio:liquidConduitTranscendentEnder";
public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreTranscendentEnder";
static IIcon iconKey;
static IIcon iconCoreKey;
@SideOnly(Side.CLIENT)
public static void initIcons() {
IconUtil.addIconProvider(new IconUtil.IIconProvider() {
@Override
public void registerIcons(IIconRegister register) {
iconKey = register.registerIcon(ICON_KEY);
iconCoreKey = register.registerIcon(ICON_CORE_KEY);
}
@Override
public int getTextureType() {
return 0;
}
});
}
@Override
public Type getType() {
return TYPE;
}
@Override
public int getMetadata() {
return METADATA;
}
@Override
protected IIcon getIconKey() {
return iconKey;
}
@Override
protected IIcon getIconCoreKey() {
return iconCoreKey;
}
}
@@ -15,7 +15,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@@ -213,14 +215,20 @@ public class OCConduit extends AbstractConduit implements IOCConduit {
return null;
}
private static String prettyNode(Node o) {
String at = "";
private static IChatComponent prettyNode(Node o) {
Environment host = o.host();
String name = host.getClass().getName().replaceFirst("^.*\\.", "");
if (host instanceof TileEntity) {
BlockCoord bc = new BlockCoord((TileEntity) host);
at = " at " + bc.x + "/" + bc.y + "/" + bc.z;
return new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemOCConduit.chat.nodeAt"),
name,
coords(new BlockCoord((TileEntity) host)));
}
return host.getClass().getName().replaceFirst("^.*\\.", "") + at;
return new ChatComponentText(name);
}
private static String coords(BlockCoord bc) {
return bc.x + "/" + bc.y + "/" + bc.z;
}
private static EnumChatFormatting dye2chat(DyeColor dyeColor) {
@@ -277,23 +285,34 @@ public class OCConduit extends AbstractConduit implements IOCConduit {
for (DyeColor color : DyeColor.VALUES) {
if (node(color).neighbors().iterator().hasNext()) {
noconnections = false;
ChatComponentText coltxt = new ChatComponentText(color.getLocalisedName());
ChatComponentTranslation coltxt = new ChatComponentTranslation(
DyeColor.DYE_ORE_UNLOCAL_NAMES[color.ordinal()]);
coltxt.getChatStyle().setColor(dye2chat(color));
ChatComponentText chantxt = new ChatComponentText("Channel ");
chantxt.appendSibling(coltxt);
chantxt.appendText(" at " + bc.x + "/" + bc.y + "/" + bc.z);
player.addChatMessage(chantxt);
player.addChatMessage(
new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemOCConduit.chat.channel"),
coltxt,
coords(bc)));
for (Node other : node(color).neighbors()) {
player.addChatMessage(new ChatComponentText(" Connected to: " + prettyNode(other)));
player.addChatMessage(
new ChatComponentText(" ").appendSibling(
new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemOCConduit.chat.connectedTo"),
prettyNode(other))));
}
}
}
if (noconnections) {
player.addChatMessage(
new ChatComponentText("No connections at " + bc.x + "/" + bc.y + "/" + bc.z));
new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemOCConduit.chat.noConnections"),
coords(bc)));
}
} else {
player.addChatMessage(new ChatComponentText("No network at " + bc.x + "/" + bc.y + "/" + bc.z));
player.addChatMessage(
new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemOCConduit.chat.noNetwork"),
coords(bc)));
}
}
return true;
@@ -122,6 +122,14 @@ public final class Config {
public static int stellarEnderFluidConduitExtractRate = 20_000;
public static int stellarEnderFluidConduitMaxIoRate = 80_000;
public static int prismaticNaquadahEnderFluidConduitExtractRate = 100_000;
public static int prismaticNaquadahEnderFluidConduitMaxIoRate = 400_000;
public static int fluxedEnderFluidConduitExtractRate = 1_000_000;
public static int fluxedEnderFluidConduitMaxIoRate = 4_000_000;
public static int transcendentEnderFluidConduitExtractRate = 20_000_000;
public static int transcendentEnderFluidConduitMaxIoRate = 80_000_000;
public static int cosmicEnderFluidConduitExtractRate = 200_000_000;
public static int cosmicEnderFluidConduitMaxIoRate = 800_000_000;
public static int melodicEnderFluidConduitExtractRate = 10_000;
public static int melodicEnderFluidConduitMaxIoRate = 40_000;
public static int crystallinePinkSlimeEnderFluidConduitExtractRate = 2_000;
@@ -1004,6 +1012,65 @@ public final class Config {
"Number of liters per tick that can pass through a single connection to a stellar ender fluid conduit.")
.getInt(stellarEnderFluidConduitMaxIoRate);
prismaticNaquadahEnderFluidConduitExtractRate = config.get(
sectionEfficiency.name,
"prismaticNaquadahEnderFluidConduitExtractRate",
prismaticNaquadahEnderFluidConduitExtractRate,
"Number of liters per tick extracted by prismatic naquadah ender fluid conduits auto extracting")
.getInt(prismaticNaquadahEnderFluidConduitExtractRate);
prismaticNaquadahEnderFluidConduitMaxIoRate = config.get(
sectionEfficiency.name,
"prismaticNaquadahEnderFluidConduitMaxIoRate",
prismaticNaquadahEnderFluidConduitMaxIoRate,
"Number of liters per tick that can pass through a single connection to a prismatic naquadah ender fluid conduit.")
.getInt(prismaticNaquadahEnderFluidConduitMaxIoRate);
fluxedEnderFluidConduitExtractRate = config
.get(
sectionEfficiency.name,
"fluxedEnderFluidConduitExtractRate",
fluxedEnderFluidConduitExtractRate,
"Number of liters per tick extracted by fluxed ender fluid conduits auto extracting")
.getInt(fluxedEnderFluidConduitExtractRate);
fluxedEnderFluidConduitMaxIoRate = config.get(
sectionEfficiency.name,
"fluxedEnderFluidConduitMaxIoRate",
fluxedEnderFluidConduitMaxIoRate,
"Number of liters per tick that can pass through a single connection to a fluxed ender fluid conduit.")
.getInt(fluxedEnderFluidConduitMaxIoRate);
transcendentEnderFluidConduitExtractRate = config
.get(
sectionEfficiency.name,
"transcendentEnderFluidConduitExtractRate",
transcendentEnderFluidConduitExtractRate,
"Number of liters per tick extracted by transcendent ender fluid conduits auto extracting")
.getInt(transcendentEnderFluidConduitExtractRate);
transcendentEnderFluidConduitMaxIoRate = config.get(
sectionEfficiency.name,
"transcendentEnderFluidConduitMaxIoRate",
transcendentEnderFluidConduitMaxIoRate,
"Number of liters per tick that can pass through a single connection to a transcendent ender fluid conduit.")
.getInt(transcendentEnderFluidConduitMaxIoRate);
cosmicEnderFluidConduitExtractRate = config
.get(
sectionEfficiency.name,
"cosmicEnderFluidConduitExtractRate",
cosmicEnderFluidConduitExtractRate,
"Number of liters per tick extracted by cosmic ender fluid conduits auto extracting")
.getInt(cosmicEnderFluidConduitExtractRate);
cosmicEnderFluidConduitMaxIoRate = config.get(
sectionEfficiency.name,
"cosmicEnderFluidConduitMaxIoRate",
cosmicEnderFluidConduitMaxIoRate,
"Number of liters per tick that can pass through a single connection to a cosmic ender fluid conduit.")
.getInt(cosmicEnderFluidConduitMaxIoRate);
gasConduitExtractRate = config
.get(
sectionEfficiency.name,
@@ -18,6 +18,7 @@ import com.enderio.core.common.util.ChatUtil;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.api.tool.IHideFacades;
@@ -76,7 +77,7 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider,
}
if (isCopy && performedAction && player.worldObj.isRemote) {
ChatUtil.sendNoSpamClient("Copied conduit settings");
ChatUtil.sendNoSpamClientUnloc(EnderIO.lang, "itemConduitProbe.chat.copied");
}
return performedAction;
@@ -1,15 +1,21 @@
package crazypants.enderio.item;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import com.enderio.core.common.util.ChatUtil;
import com.gtnewhorizon.gtnhlib.chat.customcomponents.ChatComponentItemName;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -32,22 +38,23 @@ import io.netty.buffer.ByteBuf;
public class PacketConduitProbe implements IMessage, IMessageHandler<PacketConduitProbe, IMessage> {
private static final String OF = " " + EnderIO.lang.localize("gui.powerMonitor.of") + " ";
private static final String CON_STORAGE = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading1") + ": ";
private static final String CAP_BANK_STOR = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading2") + ": ";
private static final String MACH_BUF_STOR = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading3") + ": ";
private static final String AVE_OUT = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading4") + ": ";
private static final String AVE_IN = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading5") + ": ";
private static final String OF = "gui.powerMonitor.of";
private static final String CON_STORAGE = "gui.powerMonitor.monHeading1";
private static final String CAP_BANK_STOR = "gui.powerMonitor.monHeading2";
private static final String MACH_BUF_STOR = "gui.powerMonitor.monHeading3";
private static final String AVE_OUT = "gui.powerMonitor.monHeading4";
private static final String AVE_IN = "gui.powerMonitor.monHeading5";
private static final String NET_HEADING = EnderIO.lang.localize("gui.mjReader.networkHeading");
private static final String CON_BUF = " " + EnderIO.lang.localize("gui.mjReader.conduitBuffer") + ": ";
private static final String NET_HEADING = "gui.mjReader.networkHeading";
private static final String CON_BUF = "gui.mjReader.conduitBuffer";
private static final String ITEM_HEADING = EnderIO.lang.localize("gui.mjReader.itemHeading");
private static final String ITEM_NO_CONNECTIONS = EnderIO.lang.localize("gui.mjReader.itemNoConnections");
private static final String ITEM_HEADING = "gui.mjReader.itemHeading";
private static final String ITEM_NO_CONNECTIONS = "gui.mjReader.itemNoConnections";
private static final String ENERGY_CONDUIT = EnderIO.lang.localize("itemPowerConduit");
private static final String REQUEST_RANGE = " " + EnderIO.lang.localize("gui.mjReader.requestRange") + ": ";;
private static final String CUR_REQUEST = " " + EnderIO.lang.localize("gui.mjReader.currentRequest") + ": ";;
private static final String ENERGY_CONDUIT = "itemPowerConduit.name";
private static final String REQUEST_RANGE = "gui.mjReader.requestRange";
private static final String CUR_REQUEST = "gui.mjReader.currentRequest";
private static final String RF = "power.rf";
public static boolean canCreatePacket(World world, int x, int y, int z) {
Block block = world.getBlock(x, y, z);
@@ -154,191 +161,127 @@ public class PacketConduitProbe implements IMessage, IMessageHandler<PacketCondu
}
public static void sendInfoMessage(EntityPlayer player, IItemConduit conduit, ItemStack input) {
String color = "\u00A7a ";
StringBuilder sb = new StringBuilder();
sb.append(color);
List<IChatComponent> lines = new ArrayList<>();
if (conduit.getExternalConnections().isEmpty()) {
sb.append(ITEM_HEADING);
sb.append(" ");
sb.append(ITEM_NO_CONNECTIONS);
sb.append("\n");
lines.add(
line(EnumChatFormatting.GREEN).appendSibling(tr(ITEM_HEADING)).appendText(" ")
.appendSibling(tr(ITEM_NO_CONNECTIONS)));
} else {
for (ForgeDirection dir : conduit.getExternalConnections()) {
ConnectionMode mode = conduit.getConnectionMode(dir);
sb.append(ITEM_HEADING);
sb.append(" ");
sb.append(EnderIO.lang.localize("gui.mjReader.connectionDir"));
sb.append(" ");
sb.append(dir);
sb.append("\n");
lines.add(
line(EnumChatFormatting.GREEN).appendSibling(tr(ITEM_HEADING)).appendText(" ")
.appendSibling(tr("gui.mjReader.connectionDir")).appendText(" " + dir));
ItemConduitNetwork icn = (ItemConduitNetwork) conduit.getNetwork();
if (icn != null && mode.acceptsInput()) {
color = "\u00A79 ";
sb.append(color);
IChatComponent line = line(EnumChatFormatting.BLUE);
if (input == null) {
sb.append(EnderIO.lang.localize("gui.mjReader.extractedItems"));
line.appendSibling(tr("gui.mjReader.extractedItems"));
} else {
sb.append(EnderIO.lang.localize("gui.mjReader.extractedItem"));
sb.append(" ");
sb.append(input.getDisplayName());
line.appendSibling(tr("gui.mjReader.extractedItem")).appendText(" ")
.appendSibling(new ChatComponentItemName(input));
}
sb.append(" ");
List<String> targets = icn
line.appendText(" ");
List<IChatComponent> targets = icn
.getTargetsForExtraction(conduit.getLocation().getLocation(dir), conduit, input);
if (targets.isEmpty()) {
sb.append(" ");
sb.append(EnderIO.lang.localize("gui.mjReader.noOutputs"));
sb.append(".\n");
lines.add(line.appendSibling(tr("gui.mjReader.noOutputs")).appendText("."));
} else {
sb.append(" ");
sb.append(EnderIO.lang.localize("gui.mjReader.insertedInto"));
sb.append("\n");
for (String str : targets) {
sb.append(" - ");
sb.append(str);
sb.append(" ");
sb.append("\n");
lines.add(line.appendSibling(tr("gui.mjReader.insertedInto")));
for (IChatComponent target : targets) {
lines.add(new ChatComponentText(" - ").appendSibling(target));
}
}
}
if (icn != null && mode.acceptsOutput()) {
color = "\u00A79 ";
sb.append(color);
List<String> targets = icn.getInputSourcesFor(conduit, dir, input);
IChatComponent line = line(EnumChatFormatting.BLUE);
List<IChatComponent> targets = icn.getInputSourcesFor(conduit, dir, input);
if (targets.isEmpty()) {
if (input == null) {
sb.append(EnderIO.lang.localize("gui.mjReader.noItems"));
line.appendSibling(tr("gui.mjReader.noItems"));
} else {
sb.append(EnderIO.lang.localize("gui.mjReader.noItem"));
sb.append(" ");
sb.append(input.getDisplayName());
line.appendSibling(tr("gui.mjReader.noItem")).appendText(" ")
.appendSibling(new ChatComponentItemName(input));
}
lines.add(line);
} else {
if (input == null) {
sb.append(EnderIO.lang.localize("gui.mjReader.receiveItems"));
line.appendSibling(tr("gui.mjReader.receiveItems"));
} else {
sb.append(EnderIO.lang.localize("gui.mjReader.receiveItem1"));
sb.append(" ");
sb.append(input.getDisplayName());
sb.append(" ");
sb.append(EnderIO.lang.localize("gui.mjReader.receiveItem2"));
line.appendSibling(
new ChatComponentTranslation(
EnderIO.lang.addPrefix("gui.mjReader.receiveItem"),
new ChatComponentItemName(input)));
}
sb.append("\n");
for (String str : targets) {
sb.append(" - ");
sb.append(str);
sb.append("\n");
lines.add(line);
for (IChatComponent target : targets) {
lines.add(new ChatComponentText(" - ").appendSibling(target));
}
}
}
}
}
String[] lines = sb.toString().split("\n");
ChatUtil.sendNoSpam(player, lines);
ChatUtil.sendNoSpam(player, lines.toArray(new IChatComponent[0]));
}
private static IChatComponent tr(String key) {
return new ChatComponentTranslation(EnderIO.lang.addPrefix(key));
}
private static IChatComponent line(EnumChatFormatting color) {
IChatComponent line = new ChatComponentText(" ");
line.getChatStyle().setColor(color);
return line;
}
private static IChatComponent power(long amount, long max) {
return new ChatComponentText(PowerDisplayUtil.formatPower(amount) + " ").appendSibling(tr(OF))
.appendText(" " + PowerDisplayUtil.formatPower(max) + " ").appendSibling(tr(RF));
}
private static IChatComponent label(String key) {
return new ChatComponentText(" ").appendSibling(tr(key)).appendText(": ");
}
public static void sendInfoMessage(EntityPlayer player, NetworkPowerManager pm) {
PowerTracker tracker = pm.getNetworkPowerTracker();
String color = "\u00A7a ";
StringBuilder sb = new StringBuilder();
sb.append(color);
sb.append(NET_HEADING);
sb.append("\n");
color = "\u00A79 ";
sb.append(color);
sb.append(CON_STORAGE);
sb.append(PowerDisplayUtil.formatPower(pm.getPowerInConduits()));
sb.append(OF);
sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInConduits()));
sb.append(" ");
sb.append(PowerDisplayUtil.abrevation());
sb.append("\n");
sb.append(CAP_BANK_STOR);
sb.append(PowerDisplayUtil.formatPower(pm.getPowerInCapacitorBanks()));
sb.append(OF);
sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInCapacitorBanks()));
sb.append(" ");
sb.append(PowerDisplayUtil.abrevation());
sb.append("\n");
sb.append(MACH_BUF_STOR);
sb.append(PowerDisplayUtil.formatPower(pm.getPowerInReceptors()));
sb.append(OF);
sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInReceptors()));
sb.append(" ");
sb.append(PowerDisplayUtil.abrevation());
sb.append("\n");
sb.append(AVE_OUT);
sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickSent()));
sb.append("\n");
sb.append(AVE_IN);
sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickRecieved()));
String[] lines = sb.toString().split("\n");
ChatUtil.sendNoSpam(player, lines);
ChatUtil.sendNoSpam(
player,
line(EnumChatFormatting.GREEN).appendSibling(tr(NET_HEADING)),
line(EnumChatFormatting.BLUE).appendSibling(label(CON_STORAGE))
.appendSibling(power(pm.getPowerInConduits(), pm.getMaxPowerInConduits())),
label(CAP_BANK_STOR)
.appendSibling(power(pm.getPowerInCapacitorBanks(), pm.getMaxPowerInCapacitorBanks())),
label(MACH_BUF_STOR).appendSibling(power(pm.getPowerInReceptors(), pm.getMaxPowerInReceptors())),
label(AVE_OUT).appendText(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickSent())),
label(AVE_IN).appendText(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickRecieved())));
}
public static void sendPowerConduitInfo(EntityPlayer player, IPowerConduit con, PowerTracker tracker) {
String color = "\u00A7a ";
StringBuilder sb = new StringBuilder();
sb.append(color);
sb.append(ENERGY_CONDUIT);
color = "\u00A79 ";
sb.append(color);
sb.append(CON_BUF);
sb.append(PowerDisplayUtil.formatPower(con.getEnergyStored()));
sb.append(OF);
sb.append(PowerDisplayUtil.formatPower(con.getMaxEnergyStored()));
sb.append(" ");
sb.append(PowerDisplayUtil.abrevation());
sb.append("\n");
sb.append(AVE_OUT);
sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickSent()));
sb.append("\n");
sb.append(AVE_IN);
sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickRecieved()));
String[] lines = sb.toString().split("\n");
ChatUtil.sendNoSpam(player, lines);
ChatUtil.sendNoSpam(
player,
line(EnumChatFormatting.GREEN).appendSibling(tr(ENERGY_CONDUIT)).appendSibling(
line(EnumChatFormatting.BLUE).appendSibling(label(CON_BUF))
.appendSibling(power(con.getEnergyStored(), con.getMaxEnergyStored()))),
label(AVE_OUT).appendText(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickSent())),
label(AVE_IN).appendText(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickRecieved())));
}
private void sendPowerReciptorInfo(EntityPlayer player, Block block, int stored, int maxStored, int minRec,
int maxRec, int request) {
String color = "\u00A7a ";
StringBuilder sb = new StringBuilder();
sb.append(color);
sb.append(block.getLocalizedName());
color = "\u00A79 ";
sb.append(color);
sb.append(CON_BUF);
sb.append(PowerDisplayUtil.formatPower(stored));
sb.append(OF);
sb.append(PowerDisplayUtil.formatPower(maxStored));
sb.append(" ");
sb.append(PowerDisplayUtil.abrevation());
sb.append("\n");
sb.append(REQUEST_RANGE);
sb.append(PowerDisplayUtil.formatPower(minRec));
sb.append(" - ");
sb.append(PowerDisplayUtil.formatPower(maxRec));
sb.append(" ");
sb.append(PowerDisplayUtil.abrevation());
sb.append("\n");
sb.append(CUR_REQUEST);
sb.append(PowerDisplayUtil.formatPower(request));
sb.append(" ");
sb.append(PowerDisplayUtil.abrevation());
String[] lines = sb.toString().split("\n");
ChatUtil.sendNoSpam(player, lines);
ChatUtil.sendNoSpam(
player,
line(EnumChatFormatting.GREEN)
.appendSibling(new ChatComponentTranslation(block.getUnlocalizedName() + ".name"))
.appendSibling(
line(EnumChatFormatting.BLUE).appendSibling(label(CON_BUF))
.appendSibling(power(stored, maxStored))),
label(REQUEST_RANGE).appendText(
PowerDisplayUtil.formatPower(minRec) + " - " + PowerDisplayUtil.formatPower(maxRec) + " ")
.appendSibling(tr(RF)),
label(CUR_REQUEST).appendText(PowerDisplayUtil.formatPower(request) + " ").appendSibling(tr(RF)));
}
}
@@ -31,12 +31,15 @@ public class BasicManyToOneRecipe implements IManyToOneRecipe {
@Override
public boolean isValidRecipeComponents(ItemStack... items) {
List<RecipeInput> inputs = new ArrayList<>(Arrays.asList(recipe.getInputs()));
for (ItemStack is : items) {
List<RecipeInput> inputs = new ArrayList<RecipeInput>(Arrays.asList(recipe.getInputs()));
for (int slot = 0; slot < items.length; slot++) {
ItemStack is = items[slot];
if (is != null) {
RecipeInput remove = null;
for (RecipeInput ri : inputs) {
if (ri.isInput(is)) {
int riSlot = ri.getSlotNumber();
// Match by item type and, if the recipe specifies a slot, also by slot index
if (ri.isInput(is) && (riSlot == -1 || riSlot == slot)) {
remove = ri;
break;
}
@@ -148,6 +148,7 @@ public class GuiVacuumChest extends GuiContainerBaseEIO {
break;
case RANGE_ID:
te.setShowRange(showRangeB.isSelected());
break;
case ID_WHITELIST:
itemFilter = te.getItemFilter();
if (itemFilter != null) {
@@ -10,7 +10,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@@ -163,14 +166,13 @@ public class BlockTravelAnchor extends BlockEio
public static void sendPrivateChatMessage(EntityPlayer player, UserIdent owner) {
if (!player.isSneaking()) {
IChatComponent ownerName = new ChatComponentText(owner.getPlayerName());
ownerName.getChatStyle().setColor(EnumChatFormatting.RED);
ChatUtil.sendNoSpam(
player,
EnderIO.lang.localize("gui.travelAccessable.privateBlock1") + " "
+ EnumChatFormatting.RED
+ owner.getPlayerName()
+ EnumChatFormatting.WHITE
+ " "
+ EnderIO.lang.localize("gui.travelAccessable.privateBlock2"));
new ChatComponentTranslation(
EnderIO.lang.addPrefix("gui.travelAccessable.privateBlock"),
ownerName));
}
}
@@ -11,7 +11,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
@@ -103,8 +105,9 @@ public class ItemCoordSelector extends Item implements IResourceTooltipProvider
}
if (!world.isRemote) {
player.addChatMessage(
new ChatComponentText(
EnderIO.lang.localize("itemCoordSelector.chat.setCoords", bc.chatString())));
new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemCoordSelector.chat.setCoords"),
bc.chatString()));
}
}
@@ -116,11 +119,9 @@ public class ItemCoordSelector extends Item implements IResourceTooltipProvider
}
if (!world.isRemote) {
player.addChatMessage(
new ChatComponentText(
EnderIO.lang.localize(
"itemCoordSelector.chat.setDimension",
EnumChatFormatting.GREEN.toString(),
Integer.toString(dim))));
new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemCoordSelector.chat.setDimension"),
dimensionComponent(dim)));
}
}
@@ -194,21 +195,29 @@ public class ItemCoordSelector extends Item implements IResourceTooltipProvider
private void onCoordsChanged(EntityPlayer player, BlockCoord bc) {
if (!player.worldObj.isRemote) {
player.addChatMessage(
new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.newCoords", bc.chatString())));
new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemCoordSelector.chat.newCoords"),
bc.chatString()));
}
}
private void onDimensionChanged(EntityPlayer player, int dim) {
if (!player.worldObj.isRemote) {
player.addChatMessage(
new ChatComponentText(
EnderIO.lang.localize(
"itemCoordSelector.chat.newDimension",
EnumChatFormatting.GREEN.toString(),
Integer.toString(dim))));
new ChatComponentTranslation(
EnderIO.lang.addPrefix("itemCoordSelector.chat.newDimension"),
dimensionComponent(dim)));
}
}
private static IChatComponent dimensionComponent(int dim) {
// Color the argument itself: chat resets formatting after each component, so a code in the lang string
// doesn't carry over to it.
IChatComponent component = new ChatComponentText(Integer.toString(dim));
component.getChatStyle().setColor(EnumChatFormatting.GREEN);
return component;
}
public void setCoords(ItemStack stack, BlockCoord bc) {
stack.stackTagCompound.setBoolean("default", false);
bc.writeToNBT(stack.stackTagCompound);
@@ -640,8 +640,7 @@ enderio.gui.mjReader.insertedInto=bude vložen do:
enderio.gui.mjReader.noItems=Nepřijímá zádné předměty.
enderio.gui.mjReader.noItem=Nemůže přijmout
enderio.gui.mjReader.receiveItems=Může přijmout předměty z:
enderio.gui.mjReader.receiveItem1=Může přijmout
enderio.gui.mjReader.receiveItem2=z:
enderio.gui.mjReader.receiveItem=Může přijmout %s z:
#CapactorBank
enderio.gui.capBank.inputRs=Vstupní ruditový mód
@@ -684,8 +683,7 @@ enderio.stirlingGenerator.output=Generuje:
enderio.stirlingGenerator.burnRate=Hodnota spalování:
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Pouze
enderio.gui.travelAccessable.privateBlock2=může změnit nastavení tohoto bloku.
enderio.gui.travelAccessable.privateBlock=Pouze %s může změnit nastavení tohoto bloku.
enderio.gui.travelAccessable.public=Veřejné
enderio.gui.travelAccessable.private=Soukromé
enderio.gui.travelAccessable.protected=Chráněné
@@ -1061,8 +1059,8 @@ item.itemCoordSelector.tooltip.detailed.line5=select that specific block.
item.itemCoordSelector.tooltip.detailed.line6=Can select from a distance.
enderio.itemCoordSelector.chat.newCoords=New Coords: %s
enderio.itemCoordSelector.chat.setCoords=Set Coords: %s
enderio.itemCoordSelector.chat.newDimension=New Dimension: %s%s
enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s
enderio.itemCoordSelector.chat.newDimension=New Dimension: %s
enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s
enderio.item.itemSoulVessel.tooltip.health=Health:
enderio.item.itemSoulVessel.tooltip.fluidname=Fluid Name:
enderio.item.itemSoulVessel.tooltip.color=Color:
@@ -684,8 +684,14 @@ item.itemCoordSelector.tooltip.detailed.line5=den spezifischen Block auszuwähle
item.itemCoordSelector.tooltip.detailed.line6=Kann aus einer Entfernung auswählen
enderio.itemCoordSelector.chat.newCoords=Neue Koordinaten: %s
enderio.itemCoordSelector.chat.setCoords=Festgelegte Koordinaten: %s
enderio.itemCoordSelector.chat.newDimension=Neue Dimension: %s%s
enderio.itemCoordSelector.chat.setDimension=Festgelegte Dimension: %s%s
enderio.itemCoordSelector.chat.newDimension=Neue Dimension: %s
enderio.itemCoordSelector.chat.setDimension=Festgelegte Dimension: %s
enderio.itemConduitProbe.chat.copied=Conduit Einstellungen kopiert
enderio.itemOCConduit.chat.channel=Kanal %s zu %s
enderio.itemOCConduit.chat.connectedTo=Verbunden mit: %s
enderio.itemOCConduit.chat.nodeAt=%s zu %s
enderio.itemOCConduit.chat.noConnections=Keine Verbindungen an %s
enderio.itemOCConduit.chat.noNetwork=Netzwerk nicht verbunden mit %s
#Painter
tile.blockPainter.name=Färbemaschine
@@ -1041,8 +1047,7 @@ enderio.gui.mjReader.insertedInto=wird insertiert nach:
enderio.gui.mjReader.noItems=Empfängt keine Items.
enderio.gui.mjReader.noItem=Kann nicht empfangen
enderio.gui.mjReader.receiveItems=Kann Items empfangen von:
enderio.gui.mjReader.receiveItem1=Kann
enderio.gui.mjReader.receiveItem2=empfangen von:
enderio.gui.mjReader.receiveItem=Kann %s empfangen von:
#CapactorBank
enderio.gui.capBank.inputRs=Input-Redstone-Modus
@@ -1096,8 +1101,7 @@ enderio.stirlingGenerator.upgrades={0} gibt eine Effizienz von {2}{1,number,#.#}
enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF verbleibend
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Nur
enderio.gui.travelAccessable.privateBlock2=darf die Einstellungen dieses Blocks ändern.
enderio.gui.travelAccessable.privateBlock=Nur %s darf die Einstellungen dieses Blocks ändern.
enderio.gui.travelAccessable.public=Öffentlich
enderio.gui.travelAccessable.private=Privat
enderio.gui.travelAccessable.protected=Geschützt
@@ -62,6 +62,10 @@ enderio.itemLiquidConduitCrystallineEnder.name=Crystalline Ender Fluid Conduit
enderio.itemLiquidConduitCrystallinePinkSlimeEnder.name=Crystalline Pink Slime Ender Fluid Conduit
enderio.itemLiquidConduitMelodicEnder.name=Melodic Ender Fluid Conduit
enderio.itemLiquidConduitStellarEnder.name=Stellar Ender Fluid Conduit
enderio.itemLiquidConduitPrismaticNaquadahEnder.name=Prismatic Naquadah Ender Fluid Conduit
enderio.itemLiquidConduitFluxedEnder.name=Fluxed Ender Fluid Conduit
enderio.itemLiquidConduitTranscendentEnder.name=Transcendent Ender Fluid Conduit
enderio.itemLiquidConduitCosmicEnder.name=Cosmic Ender Fluid Conduit
enderio.itemLiquidConduit.lockedType=Fluid type locked to
enderio.itemLiquidConduit.unlockedType=Fluid type unlocked
enderio.itemLiquidConduit.lockedWaila=Locked to
@@ -779,8 +783,14 @@ item.itemCoordSelector.tooltip.detailed.line5=select that specific block.
item.itemCoordSelector.tooltip.detailed.line6=Can select from a distance.
enderio.itemCoordSelector.chat.newCoords=New Coords: %s
enderio.itemCoordSelector.chat.setCoords=Set Coords: %s
enderio.itemCoordSelector.chat.newDimension=New Dimension: %s%s
enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s
enderio.itemCoordSelector.chat.newDimension=New Dimension: %s
enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s
enderio.itemConduitProbe.chat.copied=Copied conduit settings
enderio.itemOCConduit.chat.channel=Channel %s at %s
enderio.itemOCConduit.chat.connectedTo=Connected to: %s
enderio.itemOCConduit.chat.nodeAt=%s at %s
enderio.itemOCConduit.chat.noConnections=No connections at %s
enderio.itemOCConduit.chat.noNetwork=No network at %s
#Painter
tile.blockPainter.name=Painting Machine
@@ -1146,8 +1156,8 @@ enderio.gui.mjReader.insertedInto=will be inserted into:
enderio.gui.mjReader.noItems=Receives no items.
enderio.gui.mjReader.noItem=Can not receive
enderio.gui.mjReader.receiveItems=Can receive items from:
enderio.gui.mjReader.receiveItem1=Can receive
enderio.gui.mjReader.receiveItem2=from:
enderio.gui.mjReader.receiveItem=Can receive %s from:
enderio.gui.mjReader.distance=Distance [%s]
#CapactorBank
enderio.gui.capBank.inputRs=Input Redstone Mode
@@ -1208,8 +1218,7 @@ enderio.gui.blockBuffer.omni.name=Omni Buffer
enderio.gui.blockBuffer.creative.name=Creative Buffer
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Only
enderio.gui.travelAccessable.privateBlock2=may change this blocks settings.
enderio.gui.travelAccessable.privateBlock=Only %s may change this blocks settings.
enderio.gui.travelAccessable.public=Public
enderio.gui.travelAccessable.private=Private
enderio.gui.travelAccessable.protected=Protected
@@ -517,8 +517,8 @@ item.itemCoordSelector.tooltip.detailed.line3=Shift+Clic-derecho a un bloque par
item.itemCoordSelector.tooltip.detailed.line4=Se puede seleccionar desde la distancia.
enderio.itemCoordSelector.chat.newCoords=Nuevas Coordenadas: %s
enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s
#Painter
tile.blockPainter.name=Máquina de Pintar
@@ -790,8 +790,7 @@ enderio.gui.mjReader.insertedInto=Será insertado a:
enderio.gui.mjReader.noItems=No recibe objetos.
enderio.gui.mjReader.noItem=No puede recibir.
enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
enderio.gui.mjReader.receiveItem1=Puede recibir
enderio.gui.mjReader.receiveItem2=de:
enderio.gui.mjReader.receiveItem=Puede recibir %s de:
#CapactorBank
enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
@@ -845,8 +844,7 @@ enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de efic
enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Solo
enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.privateBlock=Solo %s puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.public=Público
enderio.gui.travelAccessable.private=Privado
enderio.gui.travelAccessable.protected=Protegido
@@ -519,8 +519,8 @@ item.itemCoordSelector.tooltip.detailed.line3=Shift+Clic-derecho a un bloque par
item.itemCoordSelector.tooltip.detailed.line4=Se puede seleccionar desde la distancia.
enderio.itemCoordSelector.chat.newCoords=Nuevas Coordenadas: %s
enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s
#Painter
tile.blockPainter.name=Máquina de Pintar
@@ -792,8 +792,7 @@ enderio.gui.mjReader.insertedInto=Será insertado a:
enderio.gui.mjReader.noItems=No recibe objetos.
enderio.gui.mjReader.noItem=No puede recibir.
enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
enderio.gui.mjReader.receiveItem1=Puede recibir
enderio.gui.mjReader.receiveItem2=de:
enderio.gui.mjReader.receiveItem=Puede recibir %s de:
#CapactorBank
enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
@@ -847,8 +846,7 @@ enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de efic
enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Solo
enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.privateBlock=Solo %s puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.public=Público
enderio.gui.travelAccessable.private=Privado
enderio.gui.travelAccessable.protected=Protegido
@@ -517,8 +517,8 @@ item.itemCoordSelector.tooltip.detailed.line3=Shift+Clic-derecho a un bloque par
item.itemCoordSelector.tooltip.detailed.line4=Se puede seleccionar desde la distancia.
enderio.itemCoordSelector.chat.newCoords=Nuevas Coordenadas: %s
enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s
#Painter
tile.blockPainter.name=Máquina de Pintar
@@ -790,8 +790,7 @@ enderio.gui.mjReader.insertedInto=Será insertado a:
enderio.gui.mjReader.noItems=No recibe objetos.
enderio.gui.mjReader.noItem=No puede recibir.
enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
enderio.gui.mjReader.receiveItem1=Puede recibir
enderio.gui.mjReader.receiveItem2=de:
enderio.gui.mjReader.receiveItem=Puede recibir %s de:
#CapactorBank
enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
@@ -845,8 +844,7 @@ enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de efic
enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Solo
enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.privateBlock=Solo %s puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.public=Público
enderio.gui.travelAccessable.private=Privado
enderio.gui.travelAccessable.protected=Protegido
@@ -517,8 +517,8 @@ item.itemCoordSelector.tooltip.detailed.line3=Shift+Clic-derecho a un bloque par
item.itemCoordSelector.tooltip.detailed.line4=Se puede seleccionar desde la distancia.
enderio.itemCoordSelector.chat.newCoords=Nuevas Coordenadas: %s
enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s
#Painter
tile.blockPainter.name=Máquina de Pintar
@@ -790,8 +790,7 @@ enderio.gui.mjReader.insertedInto=Será insertado a:
enderio.gui.mjReader.noItems=No recibe objetos.
enderio.gui.mjReader.noItem=No puede recibir.
enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
enderio.gui.mjReader.receiveItem1=Puede recibir
enderio.gui.mjReader.receiveItem2=de:
enderio.gui.mjReader.receiveItem=Puede recibir %s de:
#CapactorBank
enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
@@ -845,8 +844,7 @@ enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de efic
enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Solo
enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.privateBlock=Solo %s puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.public=Público
enderio.gui.travelAccessable.private=Privado
enderio.gui.travelAccessable.protected=Protegido
@@ -517,8 +517,8 @@ item.itemCoordSelector.tooltip.detailed.line3=Shift+Clic-derecho a un bloque par
item.itemCoordSelector.tooltip.detailed.line4=Se puede seleccionar desde la distancia.
enderio.itemCoordSelector.chat.newCoords=Nuevas Coordenadas: %s
enderio.itemCoordSelector.chat.setCoords=Establecer Coordenadas: %s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s%s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s%s
enderio.itemCoordSelector.chat.newDimension=Nueva Dimensión: %s
enderio.itemCoordSelector.chat.setDimension=Establecer Dimensión: %s
#Painter
tile.blockPainter.name=Máquina de Pintar
@@ -788,8 +788,7 @@ enderio.gui.mjReader.insertedInto=Será insertado a:
enderio.gui.mjReader.noItems=No recibe objetos.
enderio.gui.mjReader.noItem=No puede recibir.
enderio.gui.mjReader.receiveItems=Puede recibir objetos de:
enderio.gui.mjReader.receiveItem1=Puede recibir
enderio.gui.mjReader.receiveItem2=de:
enderio.gui.mjReader.receiveItem=Puede recibir %s de:
#CapactorBank
enderio.gui.capBank.inputRs=Modo de Entrada de Redstone
@@ -843,8 +842,7 @@ enderio.stirlingGenerator.upgrades={0} proporciona {2}{1,number,#.#}x{3} de efic
enderio.stirlingGenerator.remaining={0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF Restantes.
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Solo
enderio.gui.travelAccessable.privateBlock2=Puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.privateBlock=Solo %s puede cambiar los ajustes de este bloque.
enderio.gui.travelAccessable.public=Público
enderio.gui.travelAccessable.private=Privado
enderio.gui.travelAccessable.protected=Protegido
@@ -520,8 +520,8 @@ item.itemCoordSelector.tooltip.detailed.line5=sélectionner ce bloc.
item.itemCoordSelector.tooltip.detailed.line6=Peut sélectioner à distance.
enderio.itemCoordSelector.chat.newCoords=Nouvelles Coords: %s
enderio.itemCoordSelector.chat.setCoords=Définir Coords: %s
enderio.itemCoordSelector.chat.newDimension=Nouvelle Dimension: %s%s
enderio.itemCoordSelector.chat.setDimension=Définir Dimension: %s%s
enderio.itemCoordSelector.chat.newDimension=Nouvelle Dimension: %s
enderio.itemCoordSelector.chat.setDimension=Définir Dimension: %s
#Painter
tile.blockPainter.name=Machine à Enduction
@@ -810,8 +810,7 @@ enderio.gui.mjReader.insertedInto=sera inséré dans :
enderio.gui.mjReader.noItems=Ne reçoit aucun objet.
enderio.gui.mjReader.noItem=Ne peut pas recevoir
enderio.gui.mjReader.receiveItems=Peut recevoir des objet de :
enderio.gui.mjReader.receiveItem1=Peut recevoir
enderio.gui.mjReader.receiveItem2=de :
enderio.gui.mjReader.receiveItem=Peut recevoir %s de :
#CapacitorBank
enderio.gui.capBank.inputRs=Mode Redstone Entrée
@@ -865,8 +864,7 @@ enderio.stirlingGenerator.upgrades={0} donne efficacité {2}{1,number,#.#}x{3}
enderio.stirlingGenerator.remaining=Reste {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Seulement
enderio.gui.travelAccessable.privateBlock2=peut modifier les paramètres de ce bloc.
enderio.gui.travelAccessable.privateBlock=Seulement %s peut modifier les paramètres de ce bloc.
enderio.gui.travelAccessable.public=Publique
enderio.gui.travelAccessable.private=Privé
enderio.gui.travelAccessable.protected=Protégé
@@ -678,8 +678,7 @@ enderio.gui.mjReader.insertedInto=will be inserted into:
enderio.gui.mjReader.noItems=Receives no items.
enderio.gui.mjReader.noItem=Can not receive
enderio.gui.mjReader.receiveItems=Can receive items from:
enderio.gui.mjReader.receiveItem1=Can receive
enderio.gui.mjReader.receiveItem2=from:
enderio.gui.mjReader.receiveItem=Can receive %s from:
#CapactorBank
enderio.gui.capBank.inputRs=Input Redstone Mode
@@ -724,8 +723,7 @@ enderio.stirlingGenerator.output=Generating:
enderio.stirlingGenerator.burnRate=Burn Rate:
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Only
enderio.gui.travelAccessable.privateBlock2=may change this blocks settings.
enderio.gui.travelAccessable.privateBlock=Only %s may change this blocks settings.
enderio.gui.travelAccessable.public=Public
enderio.gui.travelAccessable.private=Private
enderio.gui.travelAccessable.protected=Protected
@@ -179,8 +179,7 @@ enderio.gui.mjReader.insertedInto=zostanie wysłany do:
enderio.gui.mjReader.noItems=Nie otrzymuje rzeczy.
enderio.gui.mjReader.noItem=Nie można przesłać
enderio.gui.mjReader.receiveItems=Może otrzymać rzeczy z:
enderio.gui.mjReader.receiveItem1=Przyjmie
enderio.gui.mjReader.receiveItem2=z:
enderio.gui.mjReader.receiveItem=Przyjmie %s z:
#CapactorBank
enderio.gui.capBank.inputRs=Włącznik przyrostu energii
@@ -208,8 +207,7 @@ enderio.gui.alloy.mode.alloy=Tylko stopy
enderio.gui.alloy.mode.furnace=Tylko jak zwykły piec
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Można
enderio.gui.travelAccessable.privateBlock2=zmienić tylko te ustawienia.
enderio.gui.travelAccessable.privateBlock=Można %s zmienić tylko te ustawienia.
enderio.gui.travelAccessable.public=Publiczny
enderio.gui.travelAccessable.private=Prywatny
enderio.gui.travelAccessable.protected=Chroniony
@@ -728,8 +728,7 @@ enderio.gui.mjReader.insertedInto=vai ser inserido em:
enderio.gui.mjReader.noItems=Não recebe itens.
enderio.gui.mjReader.noItem=Não pode receber
enderio.gui.mjReader.receiveItems=Pode receber itens de:
enderio.gui.mjReader.receiveItem1=Pode receber
enderio.gui.mjReader.receiveItem2=de:
enderio.gui.mjReader.receiveItem=Pode receber %s de:
#CapactorBank
enderio.gui.capBank.inputRs=Entrada Redstone Mode
@@ -774,8 +773,7 @@ enderio.stirlingGenerator.output=Gerando:
enderio.stirlingGenerator.burnRate=Taxa de Queima:
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Apenas
enderio.gui.travelAccessable.privateBlock2=pode mudar as configurações desse bloco
enderio.gui.travelAccessable.privateBlock=Apenas %s pode mudar as configurações desse bloco
enderio.gui.travelAccessable.public=Público
enderio.gui.travelAccessable.private=Privado
enderio.gui.travelAccessable.protected=Protegido
@@ -730,8 +730,7 @@ enderio.gui.mjReader.insertedInto=vai ser inserido em:
enderio.gui.mjReader.noItems=Não recebe itens.
enderio.gui.mjReader.noItem=Não pode receber
enderio.gui.mjReader.receiveItems=Pode receber itens de:
enderio.gui.mjReader.receiveItem1=Pode receber
enderio.gui.mjReader.receiveItem2=de:
enderio.gui.mjReader.receiveItem=Pode receber %s de:
#CapactorBank
enderio.gui.capBank.inputRs=Entrada Redstone Mode
@@ -776,8 +775,7 @@ enderio.stirlingGenerator.output=A Gerar:
enderio.stirlingGenerator.burnRate=Taxa de Queima:
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Apenas
enderio.gui.travelAccessable.privateBlock2=pode mudar as configurações desse bloco
enderio.gui.travelAccessable.privateBlock=Apenas %s pode mudar as configurações desse bloco
enderio.gui.travelAccessable.public=Público
enderio.gui.travelAccessable.private=Privado
enderio.gui.travelAccessable.protected=Protegido
@@ -727,8 +727,14 @@ item.itemCoordSelector.tooltip.detailed.line5=выбрать конкретны
item.itemCoordSelector.tooltip.detailed.line6=Можно выбирать блоки на расстоянии.
enderio.itemCoordSelector.chat.newCoords=Новые координаты: %s
enderio.itemCoordSelector.chat.setCoords=Выбранные координаты: %s
enderio.itemCoordSelector.chat.newDimension=Новое измерение: %s%s
enderio.itemCoordSelector.chat.setDimension=Выбранное измерение: %s%s
enderio.itemCoordSelector.chat.newDimension=Новое измерение: %s
enderio.itemCoordSelector.chat.setDimension=Выбранное измерение: %s
enderio.itemConduitProbe.chat.copied=Настройки труб скопированы
enderio.itemOCConduit.chat.channel=Канал %s на %s
enderio.itemOCConduit.chat.connectedTo=Подключено к: %s
enderio.itemOCConduit.chat.nodeAt=%s на %s
enderio.itemOCConduit.chat.noConnections=Нет подключений на %s
enderio.itemOCConduit.chat.noNetwork=Нет сети на %s
#Painter
tile.blockPainter.name=Покрасочный механизм
@@ -1086,8 +1092,8 @@ enderio.gui.mjReader.insertedInto=будет направлен:
enderio.gui.mjReader.noItems=Не получает предметов.
enderio.gui.mjReader.noItem=Не может получать
enderio.gui.mjReader.receiveItems=Может получать предметы от:
enderio.gui.mjReader.receiveItem1=Может получать
enderio.gui.mjReader.receiveItem2=от:
enderio.gui.mjReader.receiveItem=Может получать %s от:
enderio.gui.mjReader.distance=Расстояние [%s]
#CapactorBank
enderio.gui.capBank.inputRs=Режим красного камня на входе
@@ -1141,8 +1147,7 @@ enderio.stirlingGenerator.upgrades={0} даёт {2}{1,number,#.#}x{3} эффек
enderio.stirlingGenerator.remaining=Осталось {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=Только
enderio.gui.travelAccessable.privateBlock2=может управлять настройками этого блока.
enderio.gui.travelAccessable.privateBlock=Только %s может изменить настройки этого блока.
enderio.gui.travelAccessable.public=Общедоступный
enderio.gui.travelAccessable.private=Частный
enderio.gui.travelAccessable.protected=Защищённый
@@ -727,8 +727,8 @@ item.itemCoordSelector.tooltip.detailed.line5=选取特定方块.
item.itemCoordSelector.tooltip.detailed.line6=可以在远处选取.
enderio.itemCoordSelector.chat.newCoords=新坐标: %s
enderio.itemCoordSelector.chat.setCoords=设置坐标: %s
enderio.itemCoordSelector.chat.newDimension=新世界: %s%s
enderio.itemCoordSelector.chat.setDimension=设置世界: %s%s
enderio.itemCoordSelector.chat.newDimension=新世界: %s
enderio.itemCoordSelector.chat.setDimension=设置世界: %s
#Painter
tile.blockPainter.name=喷涂机
@@ -1086,8 +1086,7 @@ enderio.gui.mjReader.insertedInto=会被输入于:
enderio.gui.mjReader.noItems=未接收到物品.
enderio.gui.mjReader.noItem=无法接收
enderio.gui.mjReader.receiveItems=合法的接收对象:
enderio.gui.mjReader.receiveItem1=可以接收
enderio.gui.mjReader.receiveItem2=从:
enderio.gui.mjReader.receiveItem=可以接收 %s 从:
#CapactorBank
enderio.gui.capBank.inputRs=输入红石控制
@@ -1141,8 +1140,7 @@ enderio.stirlingGenerator.upgrades={0} 提供 {2}{1,number,#.#}x{3} 的效率
enderio.stirlingGenerator.remaining=残余 {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=只有
enderio.gui.travelAccessable.privateBlock2=才能改变该方块的设置.
enderio.gui.travelAccessable.privateBlock=只有 %s 才能改变该方块的设置.
enderio.gui.travelAccessable.public=公共
enderio.gui.travelAccessable.private=私有
enderio.gui.travelAccessable.protected=被保护
@@ -698,8 +698,7 @@ enderio.gui.mjReader.insertedInto=會被輸入于:
enderio.gui.mjReader.noItems=未接收到物品.
enderio.gui.mjReader.noItem=無法接收
enderio.gui.mjReader.receiveItems=合法的接收對象:
enderio.gui.mjReader.receiveItem1=可以接收
enderio.gui.mjReader.receiveItem2=從:
enderio.gui.mjReader.receiveItem=可以接收 %s 從:
#CapactorBank
enderio.gui.capBank.inputRs=輸入紅石控制
@@ -744,8 +743,7 @@ enderio.stirlingGenerator.output=產能速率:
enderio.stirlingGenerator.burnRate=燃燒速率:
#Travel Blocks
enderio.gui.travelAccessable.privateBlock1=只有
enderio.gui.travelAccessable.privateBlock2=才能改變該方塊的設置.
enderio.gui.travelAccessable.privateBlock=只有 %s 才能改變該方塊的設置.
enderio.gui.travelAccessable.public=公共
enderio.gui.travelAccessable.private=私有
enderio.gui.travelAccessable.protected=被保護
@@ -1080,8 +1078,8 @@ item.itemCoordSelector.tooltip.detailed.line5=select that specific block.
item.itemCoordSelector.tooltip.detailed.line6=Can select from a distance.
enderio.itemCoordSelector.chat.newCoords=New Coords: %s
enderio.itemCoordSelector.chat.setCoords=Set Coords: %s
enderio.itemCoordSelector.chat.newDimension=New Dimension: %s%s
enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s
enderio.itemCoordSelector.chat.newDimension=New Dimension: %s
enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s
enderio.item.itemSoulVessel.tooltip.health=Health:
enderio.item.itemSoulVessel.tooltip.fluidname=Fluid Name:
enderio.item.itemSoulVessel.tooltip.color=Color:
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

@@ -0,0 +1,45 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
18,
17,
16,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
3,
2,
1
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB