diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index e4f40d30..4515287c 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -46,7 +46,8 @@ public class GardenLogic extends FarmLogic { public GardenLogic(IFarmHousing housing) { super(housing); produce = new ArrayList<>(); - (farmables = new ArrayList<>()).add(new FarmableFlower()); + farmables = new ArrayList<>(); + farmables.add(new FarmableFlower()); farmables.add(new FarmableVanillaFlower()); } @@ -81,7 +82,7 @@ public class GardenLogic extends FarmLogic { public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { world = housing.getWorld(); return maintainSoil(x, y, z, direction, extent) - || (!isManual && maintainWater(x, y, z, direction, extent)) + || !isManual && maintainWater(x, y, z, direction, extent) || maintainCrops(x, y + 1, z, direction, extent); } @@ -135,6 +136,7 @@ public class GardenLogic extends FarmLogic { if (i % 2 == 0) { return trySetSoil(position); } + FarmDirection cclock = FarmDirection.EAST; if (direction == FarmDirection.EAST) { cclock = FarmDirection.SOUTH; @@ -143,6 +145,7 @@ public class GardenLogic extends FarmLogic { } else if (direction == FarmDirection.WEST) { cclock = FarmDirection.SOUTH; } + Vect previous = translateWithOffset(position.x, position.y, position.z, cclock, 1); ItemStack soil2 = getAsItemStack(previous); if (!Gardening.isSoil(soil2.getItem())) { @@ -186,14 +189,31 @@ public class GardenLogic extends FarmLogic { private ItemStack getAvailableLoam() { EnumMoisture[] moistures; if (moisture == EnumMoisture.DAMP) { - moistures = new EnumMoisture[]{EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY}; + moistures = new EnumMoisture[]{ + EnumMoisture.DAMP, + EnumMoisture.NORMAL, + EnumMoisture.DRY + }; } else if (moisture == EnumMoisture.DRY) { - moistures = new EnumMoisture[]{EnumMoisture.DRY, EnumMoisture.DAMP, EnumMoisture.DRY}; + moistures = new EnumMoisture[]{ + EnumMoisture.DRY, + EnumMoisture.DAMP, + EnumMoisture.DRY + }; } else { - moistures = new EnumMoisture[]{EnumMoisture.DRY, EnumMoisture.NORMAL, EnumMoisture.DAMP}; + moistures = new EnumMoisture[]{ + EnumMoisture.DRY, + EnumMoisture.NORMAL, + EnumMoisture.DAMP + }; } - EnumAcidity[] acidities = {EnumAcidity.NEUTRAL, EnumAcidity.ACID, EnumAcidity.ALKALINE}; + EnumAcidity[] acidities = { + EnumAcidity.NEUTRAL, + EnumAcidity.ACID, + EnumAcidity.ALKALINE + }; + for (EnumMoisture moist : moistures) { for (EnumAcidity acid : acidities) { for (Block type : new Block[]{Botany.flowerbed, Botany.loam, Botany.soil}) { @@ -205,6 +225,7 @@ public class GardenLogic extends FarmLogic { } } } + if (housing.getFarmInventory().hasResources(new ItemStack[]{new ItemStack(Blocks.dirt)})) { return new ItemStack(Blocks.dirt); } @@ -217,15 +238,17 @@ public class GardenLogic extends FarmLogic { private boolean trySetSoil(Vect position, ItemStack loam) { ItemStack copy = loam; - if (loam != null) { - if (loam.getItem() == Item.getItemFromBlock(Blocks.dirt)) { - loam = new ItemStack(Botany.soil, 0, 4); - } - setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage()); - housing.getFarmInventory().removeResources(new ItemStack[]{copy}); - return true; + if (loam == null) { + return false; } - return false; + + if (loam.getItem() == Item.getItemFromBlock(Blocks.dirt)) { + loam = new ItemStack(Botany.soil, 0, 4); + } + + setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage()); + housing.getFarmInventory().removeResources(new ItemStack[]{copy}); + return true; } private boolean trySetWater(Vect position) { diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 782a205d..955a2068 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -195,7 +195,7 @@ public class BlockFlower extends BlockContainer { @Override public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { - ArrayList drops = new ArrayList(); + ArrayList drops = new ArrayList<>(); TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() == 0) { ItemStack flower = ((TileEntityFlower) tile).getItemStack(); diff --git a/src/main/java/binnie/botany/genetics/AlleleColor.java b/src/main/java/binnie/botany/genetics/AlleleColor.java index a650390f..a78ac250 100644 --- a/src/main/java/binnie/botany/genetics/AlleleColor.java +++ b/src/main/java/binnie/botany/genetics/AlleleColor.java @@ -4,7 +4,6 @@ import forestry.api.genetics.IAlleleInteger; public class AlleleColor implements IAlleleInteger { private String uid; - private String name; private int value; private EnumFlowerColor color; private boolean dominant = true; @@ -12,7 +11,6 @@ public class AlleleColor implements IAlleleInteger { public AlleleColor(EnumFlowerColor color, String uid, String name, int value) { this.color = color; this.uid = uid; - this.name = name; this.value = value; } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index 0059e607..a229b8b4 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java @@ -1,5 +1,6 @@ package binnie.core.craftgui.minecraft.control; +import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; @@ -14,6 +15,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -142,7 +144,7 @@ public class ControlSlot extends ControlSlotBase { } private List getControlSlots() { - List slots = new ArrayList(); + List slots = new ArrayList<>(); if (getParent() instanceof ControlSlotArray || getParent() instanceof ControlPlayerInventory) { for (IWidget child : getParent().getWidgets()) { slots.add((ControlSlot) child); @@ -166,11 +168,9 @@ public class ControlSlot extends ControlSlotBase { } public ControlSlot assign(InventoryType inventory, int index) { - if (slot != null) { - return this; + if (slot == null) { + slot = ((Window) getSuperParent()).getContainer().getOrCreateSlot(inventory, index); } - - slot = ((Window) getSuperParent()).getContainer().getOrCreateSlot(inventory, index); return this; } @@ -183,22 +183,34 @@ public class ControlSlot extends ControlSlotBase { InventorySlot slot = getInventorySlot(); if (getInventorySlot() != null) { tooltip.add(slot.getName()); - tooltip.add("Insert Side: " + MachineSide.asString(slot.getInputSides())); - tooltip.add("Extract Side: " + MachineSide.asString(slot.getOutputSides())); + tooltip.add(I18N.localise(BinnieCore.instance, "gui.side.insertSide", MachineSide.asString(slot.getInputSides()))); + tooltip.add(I18N.localise(BinnieCore.instance, "gui.side.extractSide", MachineSide.asString(slot.getOutputSides()))); + if (slot.isReadOnly()) { - tooltip.add("Pickup Only Slot"); + tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.pickupOnly")); + } + + if (slot.getValidator() == null) { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", I18N.localise(BinnieCore.instance, "gui.slot.anyItem"))); + } else { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", slot.getValidator().getTooltip())); } - tooltip.add("Accepts: " + ((slot.getValidator() == null) ? "Any Item" : slot.getValidator().getTooltip())); } else if (this.slot.inventory instanceof WindowInventory) { SlotValidator s = ((WindowInventory) this.slot.inventory).getValidator(this.slot.getSlotIndex()); - tooltip.add("Accepts: " + ((s == null) ? "Any Item" : s.getTooltip())); + if (s == null) { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", I18N.localise(BinnieCore.instance, "gui.slot.anyItem"))); + } else { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", s.getTooltip())); + } } else if (this.slot.inventory instanceof InventoryPlayer) { - tooltip.add("Player Inventory"); + tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.playerInventory")); } } public InventorySlot getInventorySlot() { - return (slot instanceof CustomSlot) ? ((CustomSlot) slot).getInventorySlot() : null; + return (slot instanceof CustomSlot) + ? ((CustomSlot) slot).getInventorySlot() + : null; } static { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index a405e510..6fd3ee1f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -1,5 +1,6 @@ package binnie.core.craftgui.minecraft.control; +import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -7,6 +8,7 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.util.I18N; public class ControlUser extends Control implements ITooltip { protected String team; @@ -28,8 +30,9 @@ public class ControlUser extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { tooltip.setType(Tooltip.Type.User); - tooltip.add("Owner"); - if (username != "") { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.owner")); + + if (!username.isEmpty()) { tooltip.add(username); } tooltip.setMaxWidth(200); diff --git a/src/main/java/binnie/core/machines/inventory/MachineSide.java b/src/main/java/binnie/core/machines/inventory/MachineSide.java index 1790f697..b3cdcfdb 100644 --- a/src/main/java/binnie/core/machines/inventory/MachineSide.java +++ b/src/main/java/binnie/core/machines/inventory/MachineSide.java @@ -1,24 +1,37 @@ package binnie.core.machines.inventory; +import binnie.core.BinnieCore; +import binnie.core.util.I18N; import net.minecraftforge.common.util.ForgeDirection; import java.util.Collection; import java.util.EnumSet; public class MachineSide { - private static EnumSet All = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN, ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); - public static EnumSet TopAndBottom = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN); - public static EnumSet None = EnumSet.noneOf(ForgeDirection.class); - public static EnumSet Top = EnumSet.of(ForgeDirection.UP); - public static EnumSet Bottom = EnumSet.of(ForgeDirection.DOWN); - public static EnumSet Sides = EnumSet.of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); + public static final EnumSet TOP_AND_BOTTOM = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN); + public static final EnumSet NONE = EnumSet.noneOf(ForgeDirection.class); + public static final EnumSet SIDES = EnumSet.of( + ForgeDirection.NORTH, + ForgeDirection.SOUTH, + ForgeDirection.EAST, + ForgeDirection.WEST + ); + + private static final EnumSet ALL = EnumSet.of( + ForgeDirection.UP, + ForgeDirection.DOWN, + ForgeDirection.NORTH, + ForgeDirection.SOUTH, + ForgeDirection.EAST, + ForgeDirection.WEST + ); public static String asString(Collection sides) { - if (sides.containsAll(MachineSide.All)) { - return "Any"; + if (sides.containsAll(MachineSide.ALL)) { + return I18N.localise(BinnieCore.instance, "gui.side.any"); } if (sides.isEmpty()) { - return "None"; + return I18N.localise(BinnieCore.instance, "gui.side.none"); } String text = ""; @@ -26,48 +39,48 @@ public class MachineSide { if (sides.size() > 0) { text += ", "; } - text += "Up"; + text += I18N.localise(BinnieCore.instance, "gui.side.up"); } if (sides.contains(ForgeDirection.DOWN)) { if (sides.size() > 0) { text += ", "; } - text += "Down"; + text += I18N.localise(BinnieCore.instance, "gui.side.down"); } - if (sides.containsAll(MachineSide.Sides)) { + if (sides.containsAll(MachineSide.SIDES)) { if (sides.size() > 0) { text += ", "; } - text += "Sides"; + text += I18N.localise(BinnieCore.instance, "gui.side.sides"); } else { if (sides.contains(ForgeDirection.NORTH)) { if (sides.size() > 0) { text += ", "; } - text += "North"; + text += I18N.localise(BinnieCore.instance, "gui.side.north"); } if (sides.contains(ForgeDirection.EAST)) { if (sides.size() > 0) { text += ", "; } - text += "East"; + text += I18N.localise(BinnieCore.instance, "gui.side.east"); } if (sides.contains(ForgeDirection.SOUTH)) { if (sides.size() > 0) { text += ", "; } - text += "South"; + text += I18N.localise(BinnieCore.instance, "gui.side.south"); } if (sides.contains(ForgeDirection.WEST)) { if (sides.size() > 0) { text += ", "; } - text += "West"; + text += I18N.localise(BinnieCore.instance, "gui.side.west"); } } return text; diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/src/main/java/binnie/core/machines/inventory/SlotValidator.java index 6d634a19..431960db 100644 --- a/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -1,5 +1,7 @@ package binnie.core.machines.inventory; +import binnie.core.BinnieCore; +import binnie.core.util.I18N; import forestry.api.genetics.AlleleManager; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -53,7 +55,7 @@ public abstract class SlotValidator extends Validator { @Override public String getTooltip() { - return "Breedable Individual"; + return I18N.localise(BinnieCore.instance, "gui.slot.breedableIndividual"); } } } diff --git a/src/main/java/binnie/extratrees/machines/Brewery.java b/src/main/java/binnie/extratrees/machines/Brewery.java index 7a2f2b92..6bbe8ffe 100644 --- a/src/main/java/binnie/extratrees/machines/Brewery.java +++ b/src/main/java/binnie/extratrees/machines/Brewery.java @@ -174,11 +174,11 @@ public class Brewery { ComponentTankContainer tanks = new ComponentTankContainer(machine); tanks.addTank(Brewery.tankInput, "input", 5000); tanks.getTankSlot(Brewery.tankInput).setValidator(new TankValidatorFermentInput()); - tanks.getTankSlot(Brewery.tankInput).setOutputSides(MachineSide.TopAndBottom); + tanks.getTankSlot(Brewery.tankInput).setOutputSides(MachineSide.TOP_AND_BOTTOM); tanks.addTank(Brewery.tankOutput, "output", 5000); tanks.getTankSlot(Brewery.tankOutput).setValidator(new TankValidatorFermentOutput()); tanks.getTankSlot(Brewery.tankOutput).forbidInsertion(); - tanks.getTankSlot(Brewery.tankOutput).setOutputSides(MachineSide.Sides); + tanks.getTankSlot(Brewery.tankOutput).setOutputSides(MachineSide.SIDES); new ComponentPowerReceptor(machine); new ComponentBreweryLogic(machine); diff --git a/src/main/java/binnie/extratrees/machines/Distillery.java b/src/main/java/binnie/extratrees/machines/Distillery.java index 31322309..11824377 100644 --- a/src/main/java/binnie/extratrees/machines/Distillery.java +++ b/src/main/java/binnie/extratrees/machines/Distillery.java @@ -81,11 +81,11 @@ public class Distillery { ComponentTankContainer tanks = new ComponentTankContainer(machine); tanks.addTank(Distillery.tankInput, "input", 5000); tanks.getTankSlot(Distillery.tankInput).setValidator(new TankValidatorDistilleryInput()); - tanks.getTankSlot(Distillery.tankInput).setOutputSides(MachineSide.TopAndBottom); + tanks.getTankSlot(Distillery.tankInput).setOutputSides(MachineSide.TOP_AND_BOTTOM); tanks.addTank(Distillery.tankOutput, "output", 5000); tanks.getTankSlot(Distillery.tankOutput).setValidator(new TankValidatorDistilleryOutput()); tanks.getTankSlot(Distillery.tankOutput).setReadOnly(); - tanks.getTankSlot(Distillery.tankOutput).setOutputSides(MachineSide.Sides); + tanks.getTankSlot(Distillery.tankOutput).setOutputSides(MachineSide.SIDES); new ComponentPowerReceptor(machine); new ComponentDistilleryLogic(machine); } diff --git a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java index 602a9ef2..7133bbcd 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java @@ -14,6 +14,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.incubator.Incubator; @@ -22,8 +23,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; public class WindowIncubator extends WindowMachine { - protected static Texture ProgressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUIProcess); - protected static Texture Progress = new StandardTexture(38, 91, 38, 32, GeneticsTexture.GUIProcess); + protected static Texture progressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUIProcess); + protected static Texture progress = new StandardTexture(38, 91, 38, 32, GeneticsTexture.GUIProcess); public WindowIncubator(EntityPlayer player, IInventory inventory, Side side) { super(228, 196, player, inventory, side); @@ -35,23 +36,23 @@ public class WindowIncubator extends WindowMachine { @Override public void initialiseClient() { - setTitle("Incubator"); + setTitle(getTitle()); int x = 16; int y = 32; - new ControlLiquidTank(this, x, y).setTankID(0); + new ControlLiquidTank(this, x, y).setTankID(Incubator.TANK_INPUT); x += 26; new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.SLOT_QUEUE); x += 20; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon()); x += 18; - new ControlMachineProgress(this, x, y + 6, WindowIncubator.ProgressBase, WindowIncubator.Progress, Position.LEFT); - new ControlSlot(this, x + 11, y + 3 + 10).assign(3); + new ControlMachineProgress(this, x, y + 6, WindowIncubator.progressBase, WindowIncubator.progress, Position.LEFT); + new ControlSlot(this, x + 10, y + 3 + 10).assign(Incubator.SLOT_INCUBATOR); x += 40; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon()); x += 18; new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.SLOT_OUTPUT); x += 26; - new ControlLiquidTank(this, x, y).setTankID(1); + new ControlLiquidTank(this, x, y).setTankID(Incubator.TANK_OUTPUT); x += 34; new ControlEnergyBar(this, x, y + 3, 16, 54, Position.BOTTOM); new ControlErrorState(this, 91.0f, 82.0f); @@ -60,7 +61,7 @@ public class WindowIncubator extends WindowMachine { @Override public String getTitle() { - return "Incubator"; + return I18N.localise(Genetics.instance, "machine.labMachine.incubator"); } @Override @@ -70,6 +71,6 @@ public class WindowIncubator extends WindowMachine { @Override protected String getName() { - return "Incubator"; + return getTitle(); } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java index 492c67e0..ade910de 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java @@ -16,6 +16,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.inoculator.Inoculator; @@ -37,7 +38,7 @@ public class WindowInoculator extends WindowMachine { @Override public void initialiseClient() { - setTitle("Inoculator"); + setTitle(getTitle()); int x = 16; int y = 32; new ControlLiquidTank(this, x, y + 18 + 16).setTankID(0); @@ -55,7 +56,7 @@ public class WindowInoculator extends WindowMachine { @Override public String getTitle() { - return "Inoculator"; + return I18N.localise(Genetics.instance, "machine.machine.inoculator"); } @Override @@ -65,6 +66,6 @@ public class WindowInoculator extends WindowMachine { @Override protected String getName() { - return "Inoculator"; + return getTitle(); } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java index 423ed46e..f24256da 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java @@ -15,6 +15,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.craftgui.minecraft.control.ControlSlotCharge; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.isolator.Isolator; @@ -36,23 +37,23 @@ public class WindowIsolator extends WindowMachine { @Override public void initialiseClient() { - setTitle("Isolator"); + setTitle(getTitle()); int x = 16; int y = 32; - new ControlLiquidTank(this, x, y).setTankID(0); + new ControlLiquidTank(this, x, y).setTankID(Isolator.TANK_ETHANOL); x += 26; new ControlSlotArray(this, x, y + 3, 1, 3).create(Isolator.SLOT_RESERVE); x += 20; new ControlIconDisplay(this, x, y + 3 + 1, GUIIcon.ArrowRight.getIcon()); x += 18; - new ControlSlot(this, x, y + 3).assign(5); - new ControlSlot(this, x, y + 36 + 3).assign(0); - new ControlSlotCharge(this, x + 18 + 2, y + 36 + 3, 0).setColor(15722671); + new ControlSlot(this, x, y + 3).assign(Isolator.SLOT_TARGET); + new ControlSlot(this, x, y + 36 + 3).assign(Isolator.SLOT_ENZYME); + new ControlSlotCharge(this, x + 18 + 2, y + 36 + 3, 0).setColor(0xefe8af); x += 18; new ControlProgress(this, x, y + 3, WindowIsolator.ProgressBase, WindowIsolator.Progress, Position.LEFT); x += 142; - new ControlSlot(this, x, y + 3).assign(6); - new ControlSlot(this, x, y + 3 + 36).assign(1); + new ControlSlot(this, x, y + 3).assign(Isolator.SLOT_RESULT); + new ControlSlot(this, x, y + 3 + 36).assign(Isolator.SLOT_SEQUENCER_VIAL); new ControlIconDisplay(this, x + 1, y + 3 + 19, GUIIcon.ArrowUp.getIcon()); x += 20; new ControlIconDisplay(this, x, y + 3 + 1, GUIIcon.ArrowRight.getIcon()); @@ -65,7 +66,7 @@ public class WindowIsolator extends WindowMachine { @Override public String getTitle() { - return "Incubator"; + return I18N.localise(Genetics.instance, "machine.machine.isolator"); } @Override @@ -75,6 +76,6 @@ public class WindowIsolator extends WindowMachine { @Override protected String getName() { - return "Isolator"; + return getTitle(); } } diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java index 84631267..24d21e6c 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -20,7 +20,11 @@ public class Incubator { public static final int SLOT_INCUBATOR = 3; public static final int TANK_INPUT = 0; public static final int TANK_OUTPUT = 1; + public static final float ENERGY_PER_TICK = 2.0f; public static final List RECIPES = new ArrayList<>(); + public static final int POWER_CAPACITY = 2000; + public static final int INPUT_TANK_CAPACITY = 2000; + public static final int OUTPU_TANK_CAPACITY = 2000; public static void addRecipes() { Incubator.RECIPES.add(new IncubatorRecipe(Binnie.Liquid.getLiquidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f) { diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java index 62a95fc8..b446ce99 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java @@ -5,6 +5,8 @@ import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.machines.transfer.TransferRequest; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; import binnie.genetics.api.IIncubatorRecipe; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -17,7 +19,7 @@ public class IncubatorComponentLogic extends ComponentProcessIndefinate implemen private boolean roomForOutput; public IncubatorComponentLogic(Machine machine) { - super(machine, 2.0f); + super(machine, Incubator.ENERGY_PER_TICK); recipe = null; rand = new Random(); roomForOutput = true; @@ -25,20 +27,29 @@ public class IncubatorComponentLogic extends ComponentProcessIndefinate implemen @Override public ErrorState canWork() { - if (recipe == null) { - return new ErrorState("No Recipe", "There is no valid recipe"); + if (recipe != null) { + return super.canWork(); } - return super.canWork(); + return new ErrorState( + I18N.localise(Genetics.instance, "machine.incubator.error.noRecipe.title"), + I18N.localise(Genetics.instance, "machine.incubator.error.noRecipe") + ); } @Override public ErrorState canProgress() { if (recipe != null) { if (!recipe.isInputLiquidSufficient(getUtil().getFluid(Incubator.TANK_INPUT))) { - return new ErrorState.InsufficientLiquid("Not enough incubation liquid", Incubator.TANK_INPUT); + return new ErrorState.InsufficientLiquid( + I18N.localise(Genetics.instance, "machine.incubator.error.noLiquid"), + Incubator.TANK_INPUT + ); } if (!roomForOutput) { - return new ErrorState.TankSpace("No room for output", Incubator.TANK_OUTPUT); + return new ErrorState.TankSpace( + I18N.localise(Genetics.instance, "machine.incubator.error.noRoom"), + Incubator.TANK_OUTPUT + ); } } return super.canProgress(); diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java index 0b2358fe..17788a98 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java @@ -37,10 +37,10 @@ public class IncubatorPackage extends PackageGeneticBase implements IMachineInfo slot.setReadOnly(); } - new ComponentPowerReceptor(machine, 2000); + new ComponentPowerReceptor(machine, Incubator.POWER_CAPACITY); ComponentTankContainer tanks = new ComponentTankContainer(machine); - tanks.addTank(Incubator.TANK_INPUT, "input", 2000).forbidExtraction(); - tanks.addTank(Incubator.TANK_OUTPUT, "output", 2000).setReadOnly(); + tanks.addTank(Incubator.TANK_INPUT, "input", Incubator.INPUT_TANK_CAPACITY).forbidExtraction(); + tanks.addTank(Incubator.TANK_OUTPUT, "output", Incubator.OUTPU_TANK_CAPACITY).setReadOnly(); new IncubatorComponentLogic(machine); } diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java index b699df0e..af995d2c 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java @@ -75,23 +75,21 @@ public abstract class IncubatorRecipe implements IIncubatorRecipe { @Override public boolean roomForOutput(MachineUtil machine) { if (output != null && !machine.isTankEmpty(Incubator.TANK_OUTPUT)) { - if (!machine.getFluid(Incubator.TANK_OUTPUT).isFluidEqual(output)) { - return false; - } - if (!machine.spaceInTank(Incubator.TANK_OUTPUT, output.amount)) { + if (!machine.getFluid(Incubator.TANK_OUTPUT).isFluidEqual(output) || + !machine.spaceInTank(Incubator.TANK_OUTPUT, output.amount)) { return false; } } ItemStack outputStack = getOutputStack(machine); - if (outputStack != null) { - ItemStack output = outputStack.copy(); - TransferRequest product = new TransferRequest(output, machine.getInventory()) - .setTargetSlots(Incubator.SLOT_OUTPUT) - .ignoreValidation(); - ItemStack leftover = product.transfer(false); - return leftover == null; + if (outputStack == null) { + return true; } - return true; + + ItemStack output = outputStack.copy(); + TransferRequest product = new TransferRequest(output, machine.getInventory()) + .setTargetSlots(Incubator.SLOT_OUTPUT) + .ignoreValidation(); + return product.transfer(false) == null; } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java b/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java index 3cbf094d..a7f3e145 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java @@ -2,6 +2,8 @@ package binnie.genetics.machine.inoculator; import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; @@ -19,6 +21,6 @@ public class IndividualInoculateValidator extends SlotValidator { @Override public String getTooltip() { - return "Inoculable Individual"; + return I18N.localise(Genetics.instance, "machine.inoculator.inoculableIndividual"); } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java b/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java index 41dd4069..e3fb3592 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java @@ -17,6 +17,9 @@ public class Inoculator { public static final int[] SLOT_FINISHED = new int[]{10, 11, 12, 13}; public static final int TANK_VECTOR = 0; public static final int TANK_CAPACITY = 1000; + public static final int RF_COST = 600000; + public static final int TIME_PERIOD = 12000; + public static final int POWER_STORAGE = 15000; public static void setGene(IGene gene, ItemStack target, int chromoN) { int chromosomeID = gene.getChromosome().ordinal(); diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java index b14c5f30..d7a0aea9 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java @@ -89,7 +89,7 @@ public class InoculatorComponentFX extends MachineComponent implements return; } - ItemStack stack = getUtil().getStack(9); + ItemStack stack = getUtil().getStack(Inoculator.SLOT_TARGET); dummyEntityItem.worldObj = getMachine().getWorld(); dummyEntityItem.setEntityItemStack(stack); EntityItem dummyEntityItem = this.dummyEntityItem; diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java index e2cf62fc..b2a61ea2 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java @@ -4,6 +4,8 @@ import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; @@ -16,11 +18,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class InoculatorComponentLogic extends ComponentProcessSetCost implements IProcess { - private float bacteriaDrain; + private float bacteriaDrain = 0.0f; public InoculatorComponentLogic(Machine machine) { - super(machine, 600000, 12000); - bacteriaDrain = 0.0f; + super(machine, Inoculator.RF_COST, Inoculator.TIME_PERIOD); } @Override @@ -44,19 +45,31 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements @Override public String getTooltip() { int n = getNumberOfGenes(); - return "Inoculating with " + n + " gene" + ((n > 1) ? "s" : ""); + if (n > 1) { + return I18N.localise(Genetics.instance, "machine.inoculator.inoculatingWithGenes", n); + } + return I18N.localise(Genetics.instance, "machine.inoculator.inoculatingWithGene"); } @Override public ErrorState canWork() { if (getUtil().isSlotEmpty(Inoculator.SLOT_TARGET)) { - return new ErrorState.NoItem("No Individual to Inoculate", Inoculator.SLOT_TARGET); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.inoculator.error.noIndividual"), + Inoculator.SLOT_TARGET + ); } if (getUtil().isSlotEmpty(Inoculator.SLOT_SERUM_VIAL)) { - return new ErrorState.NoItem("No Serum", Inoculator.SLOT_SERUM_VIAL); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.inoculator.error.noSerum"), + Inoculator.SLOT_SERUM_VIAL + ); } if (getUtil().isTankEmpty(Inoculator.TANK_VECTOR)) { - return new ErrorState.InsufficientLiquid("Not enough liquid", Inoculator.TANK_VECTOR); + return new ErrorState.InsufficientLiquid( + I18N.localise(Genetics.instance, "machine.inoculator.error.noLiquid"), + Inoculator.TANK_VECTOR + ); } ErrorState state = isValidSerum(); @@ -66,7 +79,10 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements ItemStack stack = getUtil().getStack(Inoculator.SLOT_SERUM_VIAL); if (stack != null && Engineering.getCharges(stack) == 0) { - return new ErrorState("Empty Serum", "Serum is empty"); + return new ErrorState( + I18N.localise(Genetics.instance, "machine.inoculator.error.emptySerum.title"), + I18N.localise(Genetics.instance, "machine.inoculator.error.emptySerum") + ); } return super.canWork(); } @@ -76,30 +92,40 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements ItemStack target = getUtil().getStack(Inoculator.SLOT_TARGET); IGene[] genes = Engineering.getGenes(serum); if (genes.length == 0) { - return new ErrorState("Invalid Serum", "Serum does not hold any genes"); + return new ErrorState( + I18N.localise(Genetics.instance, "machine.inoculator.error.invalidSerum.title"), + I18N.localise(Genetics.instance, "machine.inoculator.error.invalidSerum.0") + ); } if (!genes[0].getSpeciesRoot().isMember(target)) { - return new ErrorState("Invalid Serum", "Mismatch of Serum Type and Target"); + return new ErrorState( + I18N.localise(Genetics.instance, "machine.inoculator.error.invalidSerum.title"), + I18N.localise(Genetics.instance, "machine.inoculator.error.invalidSerum.1") + ); } IIndividual individual = genes[0].getSpeciesRoot().getMember(target); boolean hasAll = true; for (IGene gene : genes) { - if (hasAll) { - IGenome genome = individual.getGenome(); - IChromosomeType chromosome = gene.getChromosome(); - String geneAlleleUID = gene.getAllele().getUID(); - IAllele a = genome.getActiveAllele(chromosome); - IAllele b = genome.getInactiveAllele(chromosome); - hasAll = a.getUID().equals(geneAlleleUID) - && b.getUID().equals(geneAlleleUID); + if (!hasAll) { + continue; } + + IGenome genome = individual.getGenome(); + IChromosomeType chromosome = gene.getChromosome(); + String geneAlleleUID = gene.getAllele().getUID(); + IAllele a = genome.getActiveAllele(chromosome); + IAllele b = genome.getInactiveAllele(chromosome); + hasAll = a.getUID().equals(geneAlleleUID) && b.getUID().equals(geneAlleleUID); } - if (hasAll) { - return new ErrorState("Defunct Serum", "Individual already possesses this allele"); + if (!hasAll) { + return null; } - return null; + return new ErrorState( + I18N.localise(Genetics.instance, "machine.inoculator.error.defunctSerum.title"), + I18N.localise(Genetics.instance, "machine.inoculator.error.defunctSerum") + ); } @Override @@ -132,7 +158,7 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements protected void onTickTask() { bacteriaDrain += 15.0f * getProgressPerTick() / 100.0f; if (bacteriaDrain >= 1.0f) { - getUtil().drainTank(0, 1); + getUtil().drainTank(Inoculator.TANK_VECTOR, 1); bacteriaDrain--; } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java index cf4ddd0a..d462e72e 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java @@ -65,7 +65,7 @@ public class InoculatorPackage extends PackageGeneticBase implements IMachineInf ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); transfer.addRestock(Inoculator.SLOT_RESERVE, Inoculator.SLOT_TARGET, 1); transfer.addRestock(Inoculator.SLOT_SERUM_RESERVE, Inoculator.SLOT_SERUM_VIAL); - transfer.addStorage(0, Inoculator.SLOT_SERUM_EXPENDED, new ComponentInventoryTransfer.Condition() { + transfer.addStorage(Inoculator.SLOT_SERUM_VIAL, Inoculator.SLOT_SERUM_EXPENDED, new ComponentInventoryTransfer.Condition() { @Override public boolean fufilled(ItemStack stack) { return Engineering.getCharges(stack) == 0; @@ -81,7 +81,7 @@ public class InoculatorPackage extends PackageGeneticBase implements IMachineInf } }); - new ComponentPowerReceptor(machine, 15000); + new ComponentPowerReceptor(machine, Inoculator.POWER_STORAGE); new InoculatorComponentLogic(machine); new InoculatorComponentFX(machine); new ComponentTankContainer(machine) diff --git a/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java b/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java index fc12b03b..4fa5888c 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java @@ -1,6 +1,8 @@ package binnie.genetics.machine.inoculator; import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; import binnie.genetics.api.IItemSerum; import binnie.genetics.machine.ModuleMachine; import net.minecraft.item.ItemStack; @@ -17,6 +19,6 @@ public class SerumSlotValidator extends SlotValidator { @Override public String getTooltip() { - return "Serum Vials & Arrays"; + return I18N.localise(Genetics.instance, "machine.inoculator.serums"); } } diff --git a/src/main/java/binnie/genetics/machine/isolator/EthanolTankValidator.java b/src/main/java/binnie/genetics/machine/isolator/EthanolTankValidator.java index ee2df9b3..534de65d 100644 --- a/src/main/java/binnie/genetics/machine/isolator/EthanolTankValidator.java +++ b/src/main/java/binnie/genetics/machine/isolator/EthanolTankValidator.java @@ -1,12 +1,13 @@ package binnie.genetics.machine.isolator; import binnie.core.machines.inventory.TankValidator; +import binnie.core.util.I18N; import net.minecraftforge.fluids.FluidStack; public class EthanolTankValidator extends TankValidator { @Override public String getTooltip() { - return "Ethanol"; + return I18N.localise("fluid.bioethanol"); } @Override diff --git a/src/main/java/binnie/genetics/machine/isolator/Isolator.java b/src/main/java/binnie/genetics/machine/isolator/Isolator.java index 417aeda4..ffc43f8d 100644 --- a/src/main/java/binnie/genetics/machine/isolator/Isolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/Isolator.java @@ -8,4 +8,8 @@ public class Isolator { public static final int SLOT_TARGET = 5; public static final int SLOT_RESULT = 6; public static final int TANK_ETHANOL = 0; + public static final int RF_COST = 192000; + public static final int TIME_PERIOD = 4800; + public static final int POWER_CAPACITY = 20000; + public static final int ETHANOL_CAPACITY = 1000; } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java index 3459a87f..38eebda3 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java @@ -22,6 +22,7 @@ public class IsolatorComponentFX extends MachineComponent implements IRender.Ran if (!getUtil().getProcess().isInProgress()) { return; } + BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new EntityFX(world, x + 0.4 + 0.2 * rand.nextDouble(), y + 1.6, z + 0.4 + rand.nextDouble() * 0.2, 0.0, 0.0, 0.0) { double angle = 0.0; diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java index 7722166f..ff955fdd 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java @@ -6,6 +6,8 @@ import binnie.core.machines.inventory.IChargedSlots; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; import binnie.genetics.item.ItemSequence; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -17,26 +19,33 @@ import net.minecraft.item.ItemStack; import java.util.Random; public class IsolatorComponentLogic extends ComponentProcessSetCost implements IProcess { - protected float enzymePerProcess; - protected float ethanolPerProcess; + protected float enzymePerProcess = 0.5f; + protected float ethanolPerProcess = 10.0f; public IsolatorComponentLogic(Machine machine) { - super(machine, 192000, 4800); - enzymePerProcess = 0.5f; - ethanolPerProcess = 10.0f; + super(machine, Isolator.RF_COST, Isolator.TIME_PERIOD); } @Override public ErrorState canWork() { if (getUtil().isSlotEmpty(Isolator.SLOT_TARGET)) { - return new ErrorState.NoItem("No individual to isolate", Isolator.SLOT_TARGET); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.isolator.error.noIndividual"), + Isolator.SLOT_TARGET + ); } // TODO check slot id in validation if (!getUtil().isSlotEmpty(Isolator.SLOT_RESULT)) { - return new ErrorState.NoSpace("No room for DNA sequences", Isolator.SLOT_FINISHED); + return new ErrorState.NoSpace( + I18N.localise(Genetics.instance, "machine.isolator.error.noRoom"), + Isolator.SLOT_FINISHED + ); } if (getUtil().isSlotEmpty(Isolator.SLOT_SEQUENCER_VIAL)) { - return new ErrorState.NoItem("No empty sequencer vials", Isolator.SLOT_SEQUENCER_VIAL); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.isolator.error.noVials"), + Isolator.SLOT_SEQUENCER_VIAL + ); } return super.canWork(); } @@ -44,10 +53,16 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I @Override public ErrorState canProgress() { if (!getUtil().liquidInTank(Isolator.TANK_ETHANOL, (int) ethanolPerProcess)) { - return new ErrorState.InsufficientLiquid("Insufficient ethanol", Isolator.TANK_ETHANOL); + return new ErrorState.InsufficientLiquid( + I18N.localise(Genetics.instance, "machine.isolator.error.noLiquid"), + Isolator.TANK_ETHANOL + ); } if (getUtil().getSlotCharge(Isolator.SLOT_ENZYME) == 0.0f) { - return new ErrorState.NoItem("No enzyme", Isolator.SLOT_ENZYME); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.isolator.error.noEnzyme"), + Isolator.SLOT_ENZYME + ); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java index 6f5f38ac..0fcc4aef 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java @@ -57,7 +57,7 @@ public class IsolatorPackage extends PackageGeneticBase implements IMachineInfor } ComponentTankContainer tanks = new ComponentTankContainer(machine); - tanks.addTank(Isolator.TANK_ETHANOL, "input", 1000); + tanks.addTank(Isolator.TANK_ETHANOL, "input", Isolator.ETHANOL_CAPACITY); tanks.getTankSlot(Isolator.TANK_ETHANOL).setValidator(new EthanolTankValidator()); ComponentChargedSlots chargedSlots = new ComponentChargedSlots(machine); @@ -66,7 +66,7 @@ public class IsolatorPackage extends PackageGeneticBase implements IMachineInfor ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); transfer.addRestock(Isolator.SLOT_RESERVE, Isolator.SLOT_TARGET, 1); transfer.addStorage(Isolator.SLOT_RESULT, Isolator.SLOT_FINISHED); - new ComponentPowerReceptor(machine, 20000); + new ComponentPowerReceptor(machine, Isolator.POWER_CAPACITY); new IsolatorComponentLogic(machine); new IsolatorComponentFX(machine); } diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/src/main/resources/assets/binniecore/lang/en_US.lang index 237eb5fa..76189fe4 100644 --- a/src/main/resources/assets/binniecore/lang/en_US.lang +++ b/src/main/resources/assets/binniecore/lang/en_US.lang @@ -226,6 +226,7 @@ binniecore.gui.nottolerated=Not Tolerated binniecore.gui.design=Design binniecore.gui.tooltip.info=Info +binniecore.gui.tooltip.owner=Owner binniecore.gui.tooltip.help=Help binniecore.gui.tooltip.help.0=To activate help tooltips, binniecore.gui.tooltip.help.1=hold down the tab key and @@ -292,9 +293,6 @@ binniecore.allele.extrabees.effect.wither.desc=Withers anyone who approaches binniecore.allele.extrabees.effect.spawn_zombie.desc=Randomly spawns zombies binniecore.allele.forestry.effectFestiveEaster.desc=Does nothing - - -< Names for slots when using help tooltip > binniecore.gui.slot.slot=Slot binniecore.gui.slot.input=Input Slot binniecore.gui.slot.process=Process Slot @@ -322,7 +320,24 @@ binniecore.gui.slot.serum.input=Serum Input Slot binniecore.gui.slot.serum.output=Serum Output Slot binniecore.gui.slot.serum.active=Active Serum Slot binniecore.gui.slot.yeast=Yeast Slot +binniecore.gui.slot.breedableIndividual=Breedable Individual +binniecore.gui.slot.pickupOnly=Pickup Only Slot +binniecore.gui.slot.playerInventory=Player Inventory +binniecore.gui.slot.anyItem=Any Item +binniecore.gui.slot.accepts=Accepts: %s binniecore.gui.tank.input=Input Tank binniecore.gui.tank.process=Process Tank binniecore.gui.tank.output=Output Tank + +binniecore.gui.side.any=Any +binniecore.gui.side.none=None +binniecore.gui.side.up=Up +binniecore.gui.side.down=Down +binniecore.gui.side.sides=Sides +binniecore.gui.side.north=North +binniecore.gui.side.east=East +binniecore.gui.side.west=West +binniecore.gui.side.south=South +binniecore.gui.side.insertSide=Insert Side: %s +binniecore.gui.side.extractSide=Extract Side: %s diff --git a/src/main/resources/assets/binniecore/lang/ru_RU.lang b/src/main/resources/assets/binniecore/lang/ru_RU.lang index abedc35b..71a7f6d7 100644 --- a/src/main/resources/assets/binniecore/lang/ru_RU.lang +++ b/src/main/resources/assets/binniecore/lang/ru_RU.lang @@ -226,6 +226,7 @@ binniecore.gui.nottolerated=неустойчив binniecore.gui.design=Дизайн binniecore.gui.tooltip.info=Информация +binniecore.gui.tooltip.owner=Владелец binniecore.gui.tooltip.help=Помощь binniecore.gui.tooltip.help.0=Для показа всплывающих подсказок binniecore.gui.tooltip.help.1=зажмите клавишу TAB и @@ -292,9 +293,6 @@ binniecore.allele.extrabees.effect.wither.desc=Иссушает существ binniecore.allele.extrabees.effect.spawn_zombie.desc=Спаун зомби binniecore.allele.forestry.effectFestiveEaster.desc=Ничего не делает - - -< Names for slots when using help tooltip > binniecore.gui.slot.slot=Слот binniecore.gui.slot.input=Приёмный слот binniecore.gui.slot.process=Рабочий слот @@ -322,7 +320,24 @@ binniecore.gui.slot.serum.input=Приёмный слот для сыворот binniecore.gui.slot.serum.output=Выдающий слот для сыворотки binniecore.gui.slot.serum.active=Активный слот для сыворотки binniecore.gui.slot.yeast=Слот для дрожжей +binniecore.gui.slot.breedableIndividual=Образец +binniecore.gui.slot.pickupOnly=Автоматическое помещение в слот +binniecore.gui.slot.playerInventory=Инвентарь игрока +binniecore.gui.slot.anyItem=Любой предмет +binniecore.gui.slot.accepts=Принимается: %s -binniecore.gui.tank.input=Приёмный резервуар +binniecore.gui.tank.input=Приёмочный резервуар binniecore.gui.tank.process=Рабочий резервуар binniecore.gui.tank.output=Выдающий резервуар + +binniecore.gui.side.any=любое направление +binniecore.gui.side.none=никакая +binniecore.gui.side.up=верх +binniecore.gui.side.down=низ +binniecore.gui.side.sides=любая сторона +binniecore.gui.side.north=север +binniecore.gui.side.east=восток +binniecore.gui.side.west=запад +binniecore.gui.side.south=юг +binniecore.gui.side.insertSide=Принимающая сторона: %s +binniecore.gui.side.extractSide=Выдающая сторона: %s diff --git a/src/main/resources/assets/genetics/lang/en_GB.lang b/src/main/resources/assets/genetics/lang/en_GB.lang index 1afa90f8..c8435920 100644 --- a/src/main/resources/assets/genetics/lang/en_GB.lang +++ b/src/main/resources/assets/genetics/lang/en_GB.lang @@ -1,5 +1,10 @@ genetics.machine.machine.isolator=Isolator genetics.machine.machine.isolator.info=The Isolator takes a random allele from a bee, tree or other individual and copies it into an empty sequence vial. This requires the use of ethanol as a solvent and an enzyme to cut up the DNA. The unsequenced serums can then be amplified in a Polymeriser and sequenced in a Sequencer. +genetics.machine.isolator.error.noIndividual=No individual to isolate +genetics.machine.isolator.error.noRoom=No room for DNA sequences +genetics.machine.isolator.error.noVials=No empty sequencer vials +genetics.machine.isolator.error.noLiquid=Insufficient ethanol +genetics.machine.isolator.error.noEnzyme=No enzyme genetics.machine.machine.sequencer=Sequencer genetics.machine.machine.sequencer.info=The Sequencer takes unsequenced serums and determines which allele is present in them. This requires the use of fluorescent dye and has a long computational time. @@ -9,6 +14,20 @@ genetics.machine.machine.polymeriser.info=The Polymeriser takes serums and refil genetics.machine.machine.inoculator=Inoculator genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process takes a very long time and requires a Bacteria Vector, but is 100% successful. +genetics.machine.inoculator.error.noIndividual=No Individual to Inoculate +genetics.machine.inoculator.error.noSerum=No Serum +genetics.machine.inoculator.error.noLiquid=Not enough liquid +genetics.machine.inoculator.error.emptySerum.title=Empty Serum +genetics.machine.inoculator.error.emptySerum=Serum is empty +genetics.machine.inoculator.error.invalidSerum.title=Invalid Serum +genetics.machine.inoculator.error.invalidSerum.0=Serum does not hold any genes +genetics.machine.inoculator.error.invalidSerum.1=Mismatch of Serum Type and Target +genetics.machine.inoculator.error.defunctSerum.title=Defunct Serum +genetics.machine.inoculator.error.defunctSerum=Individual already possesses this allele +genetics.machine.inoculator.inoculatingWithGene=Inoculating with 1 gene +genetics.machine.inoculator.inoculatingWithGenes=Inoculating with %d genes +genetics.machine.inoculator.inoculableIndividual=Inoculable Individual +genetics.machine.inoculator.serums=Serum Vials & Arrays genetics.machine.labMachine.genepool=Genepool genetics.machine.labMachine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. All genetic information is lost and the source of the DNA is destroyed. @@ -31,6 +50,10 @@ genetics.machine.analyser.error.noItem=No item to analyse genetics.machine.labMachine.incubator=Incubator genetics.machine.labMachine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. +genetics.machine.incubator.error.noRecipe.title=No Recipe +genetics.machine.incubator.error.noRecipe=There is no valid recipe +genetics.machine.incubator.error.noLiquid=Not enough incubation liquid +genetics.machine.incubator.error.noRoom=No room for output genetics.machine.labMachine.acclimatiser=Acclimatiser genetics.machine.labMachine.acclimatiser.info= diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 64520b5a..44243b26 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -1,5 +1,10 @@ genetics.machine.machine.isolator=Isolator genetics.machine.machine.isolator.info=The Isolator takes a random allele from a bee, tree or other individual and copies it into an empty sequence vial. This requires the use of ethanol as a solvent and an enzyme to cut up the DNA. The unsequenced serums can then be amplified in a Polymeriser and sequenced in a Sequencer. +genetics.machine.isolator.error.noIndividual=No individual to isolate +genetics.machine.isolator.error.noRoom=No room for DNA sequences +genetics.machine.isolator.error.noVials=No empty sequencer vials +genetics.machine.isolator.error.noLiquid=Insufficient ethanol +genetics.machine.isolator.error.noEnzyme=No enzyme genetics.machine.machine.sequencer=Sequencer genetics.machine.machine.sequencer.info=The Sequencer takes unsequenced serums and determines which allele is present in them. This process is slow and requires the use of fluorescent dye. @@ -9,6 +14,20 @@ genetics.machine.machine.polymeriser.info=The Polymeriser fills empty serums wit genetics.machine.machine.inoculator=Inoculator genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process is very slow and requires a Bacteria Vector, but is always successful. +genetics.machine.inoculator.error.noIndividual=No Individual to Inoculate +genetics.machine.inoculator.error.noSerum=No Serum +genetics.machine.inoculator.error.noLiquid=Not enough liquid +genetics.machine.inoculator.error.emptySerum.title=Empty Serum +genetics.machine.inoculator.error.emptySerum=Serum is empty +genetics.machine.inoculator.error.invalidSerum.title=Invalid Serum +genetics.machine.inoculator.error.invalidSerum.0=Serum does not hold any genes +genetics.machine.inoculator.error.invalidSerum.1=Mismatch of Serum Type and Target +genetics.machine.inoculator.error.defunctSerum.title=Defunct Serum +genetics.machine.inoculator.error.defunctSerum=Individual already possesses this allele +genetics.machine.inoculator.inoculatingWithGene=Inoculating with 1 gene +genetics.machine.inoculator.inoculatingWithGenes=Inoculating with %d genes +genetics.machine.inoculator.inoculableIndividual=Inoculable Individual +genetics.machine.inoculator.serums=Serum Vials & Arrays genetics.machine.labMachine.genepool=Genepool genetics.machine.labMachine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. During this process, all genetic information is lost and the source of the DNA is destroyed. @@ -31,6 +50,10 @@ genetics.machine.analyser.error.noItem=No item to analyze genetics.machine.labMachine.incubator=Incubator genetics.machine.labMachine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. +genetics.machine.incubator.error.noRecipe.title=No Recipe +genetics.machine.incubator.error.noRecipe=There is no valid recipe +genetics.machine.incubator.error.noLiquid=Not enough incubation liquid +genetics.machine.incubator.error.noRoom=No room for output genetics.machine.labMachine.acclimatiser=Acclimatiser genetics.machine.labMachine.acclimatiser.info= diff --git a/src/main/resources/assets/genetics/lang/ru_RU.lang b/src/main/resources/assets/genetics/lang/ru_RU.lang index 27a0c844..5982f3ac 100644 --- a/src/main/resources/assets/genetics/lang/ru_RU.lang +++ b/src/main/resources/assets/genetics/lang/ru_RU.lang @@ -1,5 +1,10 @@ genetics.machine.machine.isolator=Изолятор genetics.machine.machine.isolator.info=Изолятор извлекает случайный ген от пчелы, дерева или другого организма и копирует его в пустой пузырек сыворотки (empty sequence vial). Требуется Этанол для растворения и Фермент для извлечения ДНК. Полученная сыворотка с геном затем может быть усилена в Полимеризаторе и исследована в Секвенсоре. +genetics.machine.isolator.error.noIndividual=Нет образцов для изоляции +genetics.machine.isolator.error.noRoom=Нет места для ДНК секвенции +genetics.machine.isolator.error.noVials=Нет пустых флаконов +genetics.machine.isolator.error.noLiquid=Недостаточно этанола +genetics.machine.isolator.error.noEnzyme=Нет энзима genetics.machine.machine.sequencer=Секвенсор genetics.machine.machine.sequencer.info=Секвенсор предназначен для анализа новых генов, извлечённых из организмов. Секвенсор принимает неисследованную сыворотку и определяет, какие гены присутствуют в ней. В результате ген попадает в общую генетическую базу данных. Процесс занимает много времени и требует использования Флюорофора (жёлтый+оранжевый+светопыль) @@ -9,6 +14,20 @@ genetics.machine.machine.polymeriser.info=Полимеризатор усили genetics.machine.machine.inoculator=Инокулятор genetics.machine.machine.inoculator.info=Инокулятор использует сыворотку для прививки новых генов. Процесс продолжителен и требует Бактерию Вектор, но на 100% успешен. +genetics.machine.inoculator.error.noIndividual=Нет образцов для инокуляции +genetics.machine.inoculator.error.noSerum=Нет сыворотки +genetics.machine.inoculator.error.noLiquid=Не хватает жидкости +genetics.machine.inoculator.error.emptySerum.title=Пустая сыворотка +genetics.machine.inoculator.error.emptySerum=Пустая сыворотка +genetics.machine.inoculator.error.invalidSerum.title=Некорректная сыворотка +genetics.machine.inoculator.error.invalidSerum.0=Сыворотка не содержит генов +genetics.machine.inoculator.error.invalidSerum.1=Сыворотка не подходит для этого образца +genetics.machine.inoculator.error.defunctSerum.title=Недействующая сыворотка +genetics.machine.inoculator.error.defunctSerum=Образец уже обладает этим геном +genetics.machine.inoculator.inoculatingWithGene=Инокуляция с одним gene +genetics.machine.inoculator.inoculatingWithGenes=Инокуляция с %d генами +genetics.machine.inoculator.inoculableIndividual=Образец для инокуляции +genetics.machine.inoculator.serums=Сывороточные флаконы и массивы genetics.machine.labMachine.genepool=Экстрактор ДНК genetics.machine.labMachine.genepool.info=Растворяет организмы с помощью Этанола и Фермента в Жидкую ДНК, которая нужна для работы некоторых генетических машин. Вся генетическая информация теряется и организм-источник ДНК разрушается. @@ -31,6 +50,10 @@ genetics.machine.analyser.error.noItem=Нет образца для анализ genetics.machine.labMachine.incubator=Инкубатор genetics.machine.labMachine.incubator.info=В инкубаторе производятся большинство жидкостей и веществ мода "Генетика" по разным рецептам из жидких и твёрдых веществ. Рецепты: 1. Вода + Питательная Среда = Жидкая Питательная Среда; 2. Жидкая Питательная Среда + Пшеница = Бактерия; 3. Бактерия + Сахар = Фермент; 4. Бактерия + Костная Мука = Полимеризованная Бактерия; 5. Бактерия + Огненный Порошок = Бактерия Вектор. Также в инкубаторе можно из зародыша (личинки, гусеницы, пыльцы) вырастить взрослых особей (пчёлы, бабочки, деревья). Жидкая Питательная Среда + зародыш = взрослая особь. +genetics.machine.incubator.error.noRecipe.title=Нет рецепта +genetics.machine.incubator.error.noRecipe=Это некорректный рецепт +genetics.machine.incubator.error.noLiquid=Не хватает инкубационной жидкости +genetics.machine.incubator.error.noRoom=Нет места в баке genetics.machine.labMachine.acclimatiser=Акклиматизатор genetics.machine.labMachine.acclimatiser.info=Акклиматизатор изменяет гены, отвечающие за акклиматизацию. Диапазоны сухо-влажно и горячо-холодно могут быть расширены до максимальных. Требует катализаторы. Осушение - песок, увлажнение - вода, потепление - лава или огненный порошок, похолодание - лёд или снежок. Кислотность почвы - мульча или зола.