diff --git a/binnie-mods-2.0(1.7.10)-pre15-ru-u8.zs b/binnie-mods-2.0(1.7.10)-pre15-ru-u8.zs index baf69c62..355d56f1 100644 --- a/binnie-mods-2.0(1.7.10)-pre15-ru-u8.zs +++ b/binnie-mods-2.0(1.7.10)-pre15-ru-u8.zs @@ -67,71 +67,6 @@ NEI.overrideName(,"Плотницкий молоток"); .addTooltip(format.darkGreen("Carpentry Hammer")); -# MACHINES KOMPONENTS GENETICS - - -# Reinforced Casing -NEI.overrideName(,"Укреплённый корпус"); -.addTooltip(format.darkGreen("Reinforced Casing")); - -# DNA Dye -NEI.overrideName(,"Краситель для ДНК"); -.addTooltip(format.darkGreen("DNA Dye")); - -# Fluorescent Dye -NEI.overrideName(,"Флюорофор"); -.addTooltip(format.darkGreen("Fluorescent Dye")); - -# Enzyme -NEI.overrideName(,"Фермент"); -.addTooltip(format.darkGreen("Enzyme")); - -# Growth Medium -NEI.overrideName(,"Питательная среда"); -.addTooltip(format.darkGreen("Growth Medium")); - -# Blank Sequence -NEI.overrideName(,"Пустая последовательность"); -.addTooltip(format.darkGreen("Blank Sequence")); - -# Empty Serum Vial -NEI.overrideName(,"Колба с пустой сывороткой"); -.addTooltip(format.darkGreen("Empty Serum Vial")); - -# Empty Serum Array -NEI.overrideName(,"Массив с пустой сывороткой"); -.addTooltip(format.darkGreen("Empty Serum Array")); - -# Glass Cylinder -NEI.overrideName(,"Пустой баллон"); -.addTooltip(format.darkGreen("Glass Cylinder")); - -# Integrated Circuit Board -NEI.overrideName(,"Интегральная печатная плата"); -.addTooltip(format.darkGreen("Integrated Circuit Board")); - -# Integrated CPU -NEI.overrideName(,"Интегральный процессор"); -.addTooltip(format.darkGreen("Integrated CPU")); - -# Integrated Casing -NEI.overrideName(,"Интегральный корпус"); -.addTooltip(format.darkGreen("Integrated Casing")); - -# DNA Sequence -.addTooltip(format.lightPurple("Последовательность ДНК")); - -# Serum -.addTooltip(format.lightPurple("Сыворотка")); - -# Serum Array -.addTooltip(format.lightPurple("Массив с сывороткой")); - -# Soil Meter -NEI.overrideName(,"Почвомер"); -.addTooltip(format.darkGreen("Soil Meter")); - - # EXTRA TREES MISC # Sawdust diff --git a/build.gradle b/build.gradle index 5bc0c8fd..fd6196f7 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ processResources { include 'mcmod.info' expand 'version': project.version, 'mcversion': project.minecraft.version, - 'modid': archivesBaseName + 'modid': "BinnieMods" } from(sourceSets.main.resources.srcDirs) { diff --git a/src/main/java/binnie/botany/genetics/AlleleColor.java b/src/main/java/binnie/botany/genetics/AlleleColor.java index a78ac250..e1fe8e64 100644 --- a/src/main/java/binnie/botany/genetics/AlleleColor.java +++ b/src/main/java/binnie/botany/genetics/AlleleColor.java @@ -8,7 +8,7 @@ public class AlleleColor implements IAlleleInteger { private EnumFlowerColor color; private boolean dominant = true; - public AlleleColor(EnumFlowerColor color, String uid, String name, int value) { + public AlleleColor(EnumFlowerColor color, String uid, int value) { this.color = color; this.uid = uid; this.value = value; diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index c814a914..91d47e33 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -97,8 +97,8 @@ public enum EnumFlowerColor implements IFlowerColor { EnumFlowerColor(String name, int color) { this.name = name; this.color = color; - allele = new AlleleColor(this, "botany.color" + name(), toString(), this.color); - int r = this.color >> 16 & 0xFF; + allele = new AlleleColor(this, "botany.color" + name(), color); + int r = color >> 16 & 0xFF; r = (int) (0.45 * (r + 214)); int g = (int) (0.45 * (r + 174)); int b = (int) (0.45 * (r + 131)); diff --git a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java index 8c2d616e..1cca3e12 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java @@ -32,7 +32,7 @@ public class WindowAcclimatiser extends WindowMachine { @Override public void initialiseClient() { - setTitle(getTitle()); + super.initialiseClient(); int x = 59; int y = 32; new ControlSlotArray(this, x, y, 2, 2).create(Acclimatiser.SLOT_RESERVE); diff --git a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java index 3b93f902..496eae2a 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java @@ -39,7 +39,7 @@ public class WindowAnalyser extends WindowMachine { @Override public void initialiseClient() { - setTitle(getTitle()); + super.initialiseClient(); WindowAnalyser.progressBase = new StandardTexture(0, 51, 66, 40, GeneticsTexture.GUIProcess.getTexture()); WindowAnalyser.progress = new StandardTexture(66, 51, 66, 40, GeneticsTexture.GUIProcess.getTexture()); int x = 16; diff --git a/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java b/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java index 17f76061..12d00599 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java @@ -32,14 +32,12 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import java.util.Arrays; import java.util.List; import java.util.Map; public class WindowGeneBank extends WindowMachine { - public static IIcon[] iconsDNA; public boolean isNei; protected ControlGeneScroll genes; diff --git a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java index 9cc044b1..95269173 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java @@ -37,7 +37,7 @@ public class WindowGenepool extends WindowMachine { @Override public void initialiseClient() { - setTitle(getTitle()); + super.initialiseClient(); int x = 16; int y = 32; new ControlLiquidTank(this, x, y).setTankID(1); diff --git a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java index 7133bbcd..77b65356 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java @@ -36,7 +36,7 @@ public class WindowIncubator extends WindowMachine { @Override public void initialiseClient() { - setTitle(getTitle()); + super.initialiseClient(); int x = 16; int y = 32; new ControlLiquidTank(this, x, y).setTankID(Incubator.TANK_INPUT); diff --git a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java index ade910de..0cfa278c 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java @@ -38,7 +38,7 @@ public class WindowInoculator extends WindowMachine { @Override public void initialiseClient() { - setTitle(getTitle()); + super.initialiseClient(); int x = 16; int y = 32; new ControlLiquidTank(this, x, y + 18 + 16).setTankID(0); diff --git a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java index f24256da..8f605d69 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java @@ -37,7 +37,7 @@ public class WindowIsolator extends WindowMachine { @Override public void initialiseClient() { - setTitle(getTitle()); + super.initialiseClient(); int x = 16; int y = 32; new ControlLiquidTank(this, x, y).setTankID(Isolator.TANK_ETHANOL); diff --git a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java index f954608c..fdcc2a9a 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.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.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.polymeriser.Polymeriser; @@ -23,11 +24,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; public class WindowPolymeriser extends WindowMachine { - protected static Texture ProgressBase = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUIProcess.getTexture()); - protected static Texture Progress = new StandardTexture(76, 91, 160, 79, GeneticsTexture.GUIProcess.getTexture()); - - static { - } + protected static Texture progressBase = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUIProcess.getTexture()); + protected static Texture progress = new StandardTexture(76, 91, 160, 79, GeneticsTexture.GUIProcess.getTexture()); public WindowPolymeriser(EntityPlayer player, IInventory inventory, Side side) { super(278, 212, player, inventory, side); @@ -45,23 +43,23 @@ public class WindowPolymeriser extends WindowMachine { new ControlSlotArray(this, x, y, 1, 4).create(Polymeriser.SLOT_SERUM_RESERVE); new ControlIconDisplay(this, x + 18, y + 1, GUIIcon.ArrowRight.getIcon()); x += 34; - new ControlMachineProgress(this, x + 18, y - 6, WindowPolymeriser.ProgressBase, WindowPolymeriser.Progress, Position.LEFT); + new ControlMachineProgress(this, x + 18, y - 6, progressBase, progress, Position.LEFT); new ControlSlot(this, x, y).assign(0); new ControlLiquidTank(this, x, y + 18 + 16, true).setTankID(0); new ControlLiquidTank(this, x, y + 18 + 16 + 18 + 8, true).setTankID(1); new ControlEnergyBar(this, x + 120, 96, 64, 16, Position.LEFT); x += 40; new ControlSlot(this, x + 30, y + 18 + 8).assign(1); - new ControlSlotCharge(this, x + 30 + 20, y + 18 + 8, 1).setColor(16766976); + new ControlSlotCharge(this, x + 30 + 20, y + 18 + 8, 1).setColor(0xffd800); x += 138; new ControlSlotArray(this, x, y + 9, 2, 2).create(Polymeriser.SLOT_SERUM_FINISHED); - ControlErrorState errorState = new ControlErrorState(this, 244.0f, 97.0f); + new ControlErrorState(this, 244.0f, 97.0f); new ControlPlayerInventory(this); } @Override public String getTitle() { - return "Polymeriser"; + return I18N.localise(Genetics.instance, "machine.machine.polymeriser"); } @Override @@ -71,6 +69,6 @@ public class WindowPolymeriser extends WindowMachine { @Override protected String getName() { - return "Polymeriser"; + return getTitle(); } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java index 0616bd61..44a992ee 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java +++ b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java @@ -17,6 +17,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.sequencer.Sequencer; @@ -27,8 +28,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; public class WindowSequencer extends WindowMachine { - protected static Texture ProgressBase = new StandardTexture(64, 114, 98, 9, ExtraBeeTexture.GUIProgress.getTexture()); - protected static Texture Progress = new StandardTexture(64, 123, 98, 9, ExtraBeeTexture.GUIProgress.getTexture()); + protected static Texture progressBase = new StandardTexture(64, 114, 98, 9, ExtraBeeTexture.GUIProgress.getTexture()); + protected static Texture progress = new StandardTexture(64, 123, 98, 9, ExtraBeeTexture.GUIProgress.getTexture()); protected ControlText slotText; @@ -43,14 +44,17 @@ public class WindowSequencer extends WindowMachine { @Override public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { if (side == Side.CLIENT && name.equals("username")) { - slotText.setValue(EnumChatFormatting.DARK_GRAY + "Genes will be sequenced by " + nbt.getString("username")); + slotText.setValue( + EnumChatFormatting.DARK_GRAY + + I18N.localise(Genetics.instance, "machine.sequencer.gui.sequensedBy", nbt.getString("username")) + ); } super.recieveGuiNBT(side, player, name, nbt); } @Override public void initialiseClient() { - setTitle("Sequencer"); + super.initialiseClient(); int x = 16; int y = 32; CraftGUIUtil.horizontalGrid(x, y, TextJustification.MiddleCenter, 2.0f, new ControlSlotArray(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSequencerProgress(this, 0, 0), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSlot(this, 0.0f, 0.0f).assign(6)); @@ -58,7 +62,7 @@ public class WindowSequencer extends WindowMachine { slotTarget.assign(5); x = 34; y = 92; - slotText = new ControlText(this, new IArea(0.0f, y, w(), 12.0f), EnumChatFormatting.DARK_GRAY + "Userless. Will not save sequences", TextJustification.MiddleCenter); + slotText = new ControlText(this, new IArea(0.0f, y, w(), 12.0f), EnumChatFormatting.DARK_GRAY + I18N.localise(Genetics.instance, "machine.sequencer.gui.willNotSave"), TextJustification.MiddleCenter); y += 20; ControlSlot slotDye = new ControlSlot(this, x, y); slotDye.assign(0); @@ -67,13 +71,13 @@ public class WindowSequencer extends WindowMachine { x += 32; new ControlEnergyBar(this, x, y, 60, 16, Position.LEFT); x += 92; - ControlErrorState errorState = new ControlErrorState(this, x, y + 1); + new ControlErrorState(this, x, y + 1); new ControlPlayerInventory(this); } @Override public String getTitle() { - return "Incubator"; + return I18N.localise(Genetics.instance, "machine.machine.sequencer"); } @Override @@ -83,6 +87,6 @@ public class WindowSequencer extends WindowMachine { @Override protected String getName() { - return "Sequencer"; + return getTitle(); } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java b/src/main/java/binnie/genetics/craftgui/WindowSplicer.java index e342cc0d..fd225dd6 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java +++ b/src/main/java/binnie/genetics/craftgui/WindowSplicer.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.inoculator.Inoculator; @@ -23,8 +24,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; public class WindowSplicer extends WindowMachine { - protected static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture()); - protected static Texture Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture()); + protected static Texture progressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture()); + protected static Texture progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture()); public WindowSplicer(EntityPlayer player, IInventory inventory, Side side) { super(280, 240, player, inventory, side); @@ -36,21 +37,42 @@ public class WindowSplicer extends WindowMachine { @Override public void initialiseClient() { - setTitle("Splicer"); + super.initialiseClient(); int x = 16; new ControlSplicerProgress(this, 84.0f, 32.0f, w() - 172.0f, 102.0f); - CraftGUIUtil.horizontalGrid(x, 62.0f, new ControlSlotArray(this, 0, 0, 2, 1).create(Splicer.SLOT_SERUM_RESERVE), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSlot(this, 0.0f, 0.0f).assign(0)); - new ControlSlotArray(this, x + 12, 84, 2, 1).create(Splicer.SLOT_SERUM_EXPENDED); + CraftGUIUtil.horizontalGrid( + x, + 62.0f, + new ControlSlotArray(this, 0, 0, 2, 1) + .create(Splicer.SLOT_SERUM_RESERVE), + new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), + new ControlSlot(this, 0.0f, 0.0f) + .assign(Splicer.SLOT_SERUM_VIAL) + ); + new ControlSlotArray(this, x + 12, 84, 2, 1) + .create(Splicer.SLOT_SERUM_EXPENDED); new ControlIconDisplay(this, x + 12 + 36 + 4, 86.0f, GUIIcon.ArrowUpLeft.getIcon()); new ControlEnergyBar(this, 196, 64, 60, 16, Position.LEFT); new ControlErrorState(this, 218.0f, 86.0f); - CraftGUIUtil.verticalGrid((w() - 72.0f) / 2.0f, 32.0f, TextJustification.MiddleCenter, 4.0f, new ControlSlotArray(this, 0, 0, 4, 1).create(Inoculator.SLOT_RESERVE), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowDown.getIcon()), new ControlSlot(this, 0.0f, 0.0f).assign(9), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowDown.getIcon()), new ControlSlotArray(this, 0, 0, 4, 1).create(Inoculator.SLOT_FINISHED)); + CraftGUIUtil.verticalGrid( + (w() - 72.0f) / 2.0f, + 32.0f, + TextJustification.MiddleCenter, + 4.0f, + new ControlSlotArray(this, 0, 0, 4, 1) + .create(Inoculator.SLOT_RESERVE), + new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowDown.getIcon()), + new ControlSlot(this, 0.0f, 0.0f) + .assign(Splicer.SLOT_TARGET), + new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowDown.getIcon()), + new ControlSlotArray(this, 0, 0, 4, 1) + .create(Inoculator.SLOT_FINISHED)); new ControlPlayerInventory(this); } @Override public String getTitle() { - return "Inoculator"; + return I18N.localise(Genetics.instance, "machine.advMachine.splicer"); } @Override @@ -60,6 +82,6 @@ public class WindowSplicer extends WindowMachine { @Override protected String getName() { - return "Inoculator"; + return getTitle(); } } diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 69d35ae9..1335e03d 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -1,6 +1,7 @@ package binnie.genetics.item; import binnie.core.item.IItemMisc; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; @@ -9,26 +10,26 @@ import net.minecraft.util.IIcon; import java.util.List; public enum GeneticsItems implements IItemMisc { - LaboratoryCasing("Reinforced Casing", "casingIron"), - DNADye("DNA Dye", "dnaDye"), - FluorescentDye("Fluorescent Dye", "dyeFluor"), - Enzyme("Enzyme", "enzyme"), - GrowthMedium("Growth Medium", "growthMedium"), - EmptySequencer("Blank Sequence", "sequencerEmpty"), - EmptySerum("Empty Serum Vial", "serumEmpty"), - EmptyGenome("Empty Serum Array", "genomeEmpty"), - Cylinder("Glass Cylinder", "cylinderEmpty"), - IntegratedCircuit("Integrated Circuit Board", "integratedCircuit"), - IntegratedCPU("Integrated CPU", "integratedCPU"), - IntegratedCasing("Integrated Casing", "casingCircuit"); + LaboratoryCasing("casingIron"), + DNADye("dnaDye"), + FluorescentDye("dyeFluor"), + Enzyme("enzyme"), + GrowthMedium("growthMedium"), + EmptySequencer("sequencerEmpty"), + EmptySerum("serumEmpty"), + EmptyGenome("genomeEmpty"), + Cylinder("cylinderEmpty"), + IntegratedCircuit("integratedCircuit"), + IntegratedCPU("integratedCPU"), + IntegratedCasing("casingCircuit"); protected IIcon icon; protected String name; protected String iconPath; - GeneticsItems(String name, String iconPath) { + GeneticsItems(String name) { this.name = name; - this.iconPath = iconPath; + this.iconPath = name; } @Override @@ -47,7 +48,7 @@ public enum GeneticsItems implements IItemMisc { @Override public String getName(ItemStack itemStack) { - return name; + return I18N.localise(Genetics.instance, "item." + name + ".name"); } @Override diff --git a/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java new file mode 100644 index 00000000..7bf20a61 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java @@ -0,0 +1,18 @@ +package binnie.genetics.machine.polymeriser; + +import binnie.core.machines.inventory.Validator; +import binnie.core.util.I18N; +import binnie.genetics.item.GeneticLiquid; +import net.minecraftforge.fluids.FluidStack; + +class DnaValidator extends Validator { + @Override + public boolean isValid(FluidStack itemStack) { + return GeneticLiquid.RawDNA.get(1).isFluidEqual(itemStack); + } + + @Override + public String getTooltip() { + return I18N.localise("fluid.rawDNA"); + } +} diff --git a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java index 20c64538..735fb2f8 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java @@ -7,4 +7,9 @@ public class Polymeriser { public static final int SLOT_GOLD = 1; public static final int[] SLOT_SERUM_RESERVE = new int[]{2, 3, 4, 5}; public static final int[] SLOT_SERUM_FINISHED = new int[]{6, 7, 8, 9}; + public static final int RF_COST = 96000; + public static final int TIME_PERIOD = 2400; + public static final int BACTERIA_TANK_CAPACITY = 1000; + public static final int DNA_TANK_CAPACITY = 1000; + public static final int POWER_CAPACITY = 8000; } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java index 6a51fbb9..8859911c 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java @@ -4,23 +4,23 @@ 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.genetics.Engineering; import net.minecraft.item.ItemStack; public class PolymeriserComponentLogic extends ComponentProcessSetCost implements IProcess { private static float chargePerProcess = 0.4f; - private float dnaDrain; - private float bacteriaDrain; + private float dnaDrain = 0.0f; + private float bacteriaDrain = 0.0f; public PolymeriserComponentLogic(Machine machine) { - super(machine, 96000, 2400); - dnaDrain = 0.0f; - bacteriaDrain = 0.0f; + super(machine, Polymeriser.RF_COST, Polymeriser.TIME_PERIOD); } private float getCatalyst() { - return (getUtil().getSlotCharge(1) > 0.0f) ? 0.2f : 1.0f; + return (getUtil().getSlotCharge(Polymeriser.SLOT_GOLD) > 0.0f) ? 0.2f : 1.0f; } @Override @@ -66,16 +66,25 @@ public class PolymeriserComponentLogic extends ComponentProcessSetCost implement @Override public String getTooltip() { int n = getNumberOfGenes(); - return "Replicating " + n + " genes" + ((n > 1) ? "s" : ""); + if (n > 1) { + return I18N.localise(Genetics.instance, "machine.polymeriser.replicatingWithGenes", n); + } + return I18N.localise(Genetics.instance, "machine.polymeriser.replicatingWithGene"); } @Override public ErrorState canWork() { if (getUtil().isSlotEmpty(Polymeriser.SLOT_SERUM)) { - return new ErrorState.NoItem("No item to replicate", Polymeriser.SLOT_SERUM); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.polymeriser.error.noItem"), + Polymeriser.SLOT_SERUM + ); } if (!getUtil().getStack(Polymeriser.SLOT_SERUM).isItemDamaged()) { - return new ErrorState.InvalidItem("Item filled", Polymeriser.SLOT_SERUM); + return new ErrorState.InvalidItem( + I18N.localise(Genetics.instance, "machine.polymeriser.error.itemFilled"), + Polymeriser.SLOT_SERUM + ); } return super.canWork(); } @@ -83,10 +92,16 @@ public class PolymeriserComponentLogic extends ComponentProcessSetCost implement @Override public ErrorState canProgress() { if (getUtil().getFluid(Polymeriser.TANK_BACTERIA) == null) { - return new ErrorState.InsufficientLiquid("Insufficient Bacteria", Polymeriser.TANK_BACTERIA); + return new ErrorState.InsufficientLiquid( + I18N.localise(Genetics.instance, "machine.polymeriser.error.noLiquid"), + Polymeriser.TANK_BACTERIA + ); } if (getUtil().getFluid(Polymeriser.TANK_DNA) == null) { - return new ErrorState.InsufficientLiquid("Insufficient DNA", Polymeriser.TANK_DNA); + return new ErrorState.InsufficientLiquid( + I18N.localise(Genetics.instance, "machine.polymeriser.error.noDNA"), + Polymeriser.TANK_DNA + ); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java index 511a6827..b1c7f4db 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java @@ -9,18 +9,15 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.Validator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.item.GeneticLiquid; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.PackageGeneticBase; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; public class PolymeriserPackage extends PackageGeneticBase implements IMachineInformation { public PolymeriserPackage() { @@ -59,34 +56,14 @@ public class PolymeriserPackage extends PackageGeneticBase implements IMachineIn }); ComponentTankContainer tank = new ComponentTankContainer(machine); - tank.addTank(Polymeriser.TANK_BACTERIA, "input", 1000); - tank.getTankSlot(Polymeriser.TANK_BACTERIA).setValidator(new Validator() { - @Override - public boolean isValid(FluidStack itemStack) { - return GeneticLiquid.BacteriaPoly.get(1).isFluidEqual(itemStack); - } + tank.addTank(Polymeriser.TANK_BACTERIA, "input", Polymeriser.BACTERIA_TANK_CAPACITY); + tank.getTankSlot(Polymeriser.TANK_BACTERIA).setValidator(new PolymerisingBacteriaValidator()); - @Override - public String getTooltip() { - return "Polymerising Bacteria"; - } - }); - - tank.addTank(Polymeriser.TANK_DNA, "input", 1000); - tank.getTankSlot(Polymeriser.TANK_DNA).setValidator(new Validator() { - @Override - public boolean isValid(FluidStack itemStack) { - return GeneticLiquid.RawDNA.get(1).isFluidEqual(itemStack); - } - - @Override - public String getTooltip() { - return "Raw DNA"; - } - }); + tank.addTank(Polymeriser.TANK_DNA, "input", Polymeriser.DNA_TANK_CAPACITY); + tank.getTankSlot(Polymeriser.TANK_DNA).setValidator(new DnaValidator()); new ComponentChargedSlots(machine).addCharge(Polymeriser.SLOT_GOLD); - new ComponentPowerReceptor(machine, 8000); + new ComponentPowerReceptor(machine, Polymeriser.POWER_CAPACITY); new PolymeriserComponentLogic(machine); new PolymeriserComponentFX(machine); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java new file mode 100644 index 00000000..64856d21 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java @@ -0,0 +1,18 @@ +package binnie.genetics.machine.polymeriser; + +import binnie.core.machines.inventory.Validator; +import binnie.core.util.I18N; +import binnie.genetics.item.GeneticLiquid; +import net.minecraftforge.fluids.FluidStack; + +class PolymerisingBacteriaValidator extends Validator { + @Override + public boolean isValid(FluidStack itemStack) { + return GeneticLiquid.BacteriaPoly.get(1).isFluidEqual(itemStack); + } + + @Override + public String getTooltip() { + return I18N.localise("fluid.polymerisingBacteria"); + } +} diff --git a/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java index 9c7c351d..80ba78d3 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java @@ -1,6 +1,8 @@ package binnie.genetics.machine.polymeriser; import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; import binnie.genetics.api.IItemChargable; import binnie.genetics.machine.ModuleMachine; import net.minecraft.item.ItemStack; @@ -17,6 +19,6 @@ public class UnfilledSerumSlotValidator extends SlotValidator { @Override public String getTooltip() { - return "Unfilled Serum"; + return I18N.localise(Genetics.instance, "machine.polymeriser.unfilledSerum"); } } diff --git a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java b/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java index 2e442da2..2de23f24 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java @@ -7,6 +7,7 @@ public class Sequencer { public static final int SLOT_DYE_INDEX = 0; public static final int SLOT_TARGET_INDEX = 5; public static final int SLOT_DONE_INDEX = 6; + public static final int POWER_CAPACITY = 10000; public static BinnieIcon fxSeqA; public static BinnieIcon fxSeqG; diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java index 873cebf3..0df66569 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java @@ -5,6 +5,8 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.power.ComponentProcess; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.item.GeneticsItems; @@ -38,7 +40,10 @@ public class SequencerComponentLogic extends ComponentProcess implements IProces @Override public ErrorState canWork() { if (getUtil().isSlotEmpty(Sequencer.SLOT_TARGET_INDEX)) { - return new ErrorState.NoItem("No DNA sequence", Sequencer.SLOT_TARGET_INDEX); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.sequencer.error.noSequence"), + Sequencer.SLOT_TARGET_INDEX + ); } return super.canWork(); } @@ -46,15 +51,24 @@ public class SequencerComponentLogic extends ComponentProcess implements IProces @Override public ErrorState canProgress() { if (getMachine().getOwner() == null) { - return new ErrorState("No Owner", "Replace this block to claim this machine"); + return new ErrorState( + I18N.localise(Genetics.instance, "machine.sequencer.error.noOwner.title"), + I18N.localise(Genetics.instance, "machine.sequencer.error.noOwner") + ); } if (getUtil().getSlotCharge(Sequencer.SLOT_DYE_INDEX) == 0.0f) { - return new ErrorState.NoItem("Insufficient Dye", Sequencer.SLOT_DYE_INDEX); + return new ErrorState.NoItem( + "Insufficient Dye", + Sequencer.SLOT_DYE_INDEX + ); } ItemStack stack = getUtil().getStack(Sequencer.SLOT_DONE_INDEX); if (stack != null && stack.stackSize >= 64) { - return new ErrorState.NoSpace("No space for empty sequences", Sequencer.SLOT_DONE_INDEX); + return new ErrorState.NoSpace( + I18N.localise(Genetics.instance, "machine.sequencer.error.noSpace"), + Sequencer.SLOT_DONE_INDEX + ); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java index 5d7cecb7..5ac25a9d 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java @@ -20,8 +20,6 @@ import binnie.genetics.machine.PackageGeneticBase; import net.minecraft.tileentity.TileEntity; public class SequencerPackage extends PackageGeneticBase implements IMachineInformation { - private SequencerComponentLogic logic; - public SequencerPackage() { super("sequencer", GeneticsTexture.Sequencer, 0xb7ff32, true); Sequencer.fxSeqA = Binnie.Resource.getBlockIcon(Genetics.instance, "fx/sequencer.a"); @@ -57,10 +55,10 @@ public class SequencerPackage extends PackageGeneticBase implements IMachineInfo transfer.addRestock(Sequencer.SLOT_RESERVE, Sequencer.SLOT_TARGET_INDEX, 1); new ComponentChargedSlots(machine).addCharge(Sequencer.SLOT_DYE_INDEX); - new ComponentPowerReceptor(machine, 10000); + new ComponentPowerReceptor(machine, Sequencer.POWER_CAPACITY); new SequencerComponentFX(machine); - logic = new SequencerComponentLogic(machine); + SequencerComponentLogic logic = new SequencerComponentLogic(machine); transfer.setTransferListener(logic); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java index f705f96c..f6d2babe 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java @@ -1,6 +1,7 @@ package binnie.genetics.machine.sequencer; import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.machine.ModuleMachine; @@ -22,6 +23,6 @@ public class UnsequencedSlotValidator extends SlotValidator { @Override public String getTooltip() { - return "Unsequenced DNA"; + return I18N.localise(Genetics.instance, "machine.sequencer.unsequencedDNA"); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java b/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java index 30ee5977..3bc031e9 100644 --- a/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java +++ b/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java @@ -2,6 +2,8 @@ package binnie.genetics.machine.splicer; 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 "Splicable Individual"; + return I18N.localise(Genetics.instance, "machine.splicer.splicableIndividual"); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java b/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java index 83296cd3..86d19496 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java @@ -1,6 +1,8 @@ package binnie.genetics.machine.splicer; 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 @@ class SerumSlotValidator extends SlotValidator { @Override public String getTooltip() { - return "Serum Vials & Arrays"; + return I18N.localise(Genetics.instance, "machine.splicer.serums"); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/Splicer.java b/src/main/java/binnie/genetics/machine/splicer/Splicer.java index 676d10ce..b0f156cf 100644 --- a/src/main/java/binnie/genetics/machine/splicer/Splicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/Splicer.java @@ -15,6 +15,9 @@ public class Splicer { public static final int[] SLOT_RESERVE = new int[]{5, 6, 7, 8, 9}; public static final int SLOT_TARGET = 9; public static final int[] SLOT_FINISHED = new int[]{10, 11, 12, 13}; + public static final int RF_COST = 12000000; + public static final int TIME_PERIOD = 1200; + public static final int POWER_CAPACITY = 20000; public static void setGene(IGene gene, ItemStack target, int chromoN) { int chromosomeID = gene.getChromosome().ordinal(); diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java index 7d3ca060..a007c5c8 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.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; @@ -19,7 +21,7 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP public int nOfGenes; public SplicerComponentLogic(Machine machine) { - super(machine, 12000000, 1200); + super(machine, Splicer.RF_COST, Splicer.TIME_PERIOD); nOfGenes = 0; } @@ -64,7 +66,8 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP int i = 0; for (IGene gene : genes) { - if (ind.getGenome().getActiveAllele(gene.getChromosome()) != gene.getAllele() || ind.getGenome().getInactiveAllele(gene.getChromosome()) != gene.getAllele()) { + if (ind.getGenome().getActiveAllele(gene.getChromosome()) != gene.getAllele() || + ind.getGenome().getInactiveAllele(gene.getChromosome()) != gene.getAllele()) { i++; } } @@ -87,16 +90,32 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP public String getTooltip() { int n = getNumberOfGenes(); int f = getFullNumberOfGenes(); - return "Splicing in " + n + ((f > 1) ? ("/" + f) : "") + " gene" + ((n > 1) ? "s" : ""); + if (f > 1) { + if (n > 1) { + return I18N.localise(Genetics.instance, "machine.splicer.splicingIn.0", n, f); + } + return I18N.localise(Genetics.instance, "machine.splicer.splicingIn.1", n, f); + } + + if (n > 1) { + return I18N.localise(Genetics.instance, "machine.splicer.splicingIn.2", n); + } + return I18N.localise(Genetics.instance, "machine.splicer.splicingIn.3", n); } @Override public ErrorState canWork() { if (getUtil().isSlotEmpty(Splicer.SLOT_TARGET)) { - return new ErrorState.NoItem("No Individual to Splice", Splicer.SLOT_TARGET); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.splicer.error.noIndividual"), + Splicer.SLOT_TARGET + ); } if (getUtil().isSlotEmpty(Splicer.SLOT_SERUM_VIAL)) { - return new ErrorState.NoItem("No Serum", Splicer.SLOT_SERUM_VIAL); + return new ErrorState.NoItem( + I18N.localise(Genetics.instance, "machine.splicer.error.noSerum"), + Splicer.SLOT_SERUM_VIAL + ); } ErrorState state = isValidSerum(); @@ -105,7 +124,10 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP } if (getUtil().getStack(0) != null && Engineering.getCharges(getUtil().getStack(Splicer.SLOT_SERUM_VIAL)) == 0) { - return new ErrorState("Empty Serum", "Serum is empty"); + return new ErrorState( + I18N.localise(Genetics.instance, "machine.splicer.error.emptySerum.title"), + I18N.localise(Genetics.instance, "machine.splicer.error.emptySerum") + ); } return super.canWork(); } @@ -115,10 +137,16 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP ItemStack target = getUtil().getStack(Splicer.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.splicer.error.invalidSerum.title"), + I18N.localise(Genetics.instance, "machine.splicer.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.splicer.error.invalidSerum.title"), + I18N.localise(Genetics.instance, "machine.splicer.error.invalidSerum.1") + ); } IIndividual individual = genes[0].getSpeciesRoot().getMember(target); @@ -136,7 +164,10 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP } if (hasAll) { - return new ErrorState("Defunct Serum", "Individual already possesses this allele"); + return new ErrorState( + I18N.localise(Genetics.instance, "machine.splicer.error.defunctSerum.title"), + I18N.localise(Genetics.instance, "machine.splicer.error.defunctSerum") + ); } return null; } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java b/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java index e03a31f3..dcd6a2d8 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java @@ -80,7 +80,7 @@ public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase impl } }); - new ComponentPowerReceptor(machine, 20000); + new ComponentPowerReceptor(machine, Splicer.POWER_CAPACITY); new SplicerComponentLogic(machine); new SplicerComponentFX(machine); } diff --git a/src/main/resources/assets/genetics/lang/en_GB.lang b/src/main/resources/assets/genetics/lang/en_GB.lang index c8435920..aadb8d72 100644 --- a/src/main/resources/assets/genetics/lang/en_GB.lang +++ b/src/main/resources/assets/genetics/lang/en_GB.lang @@ -1,3 +1,19 @@ +fluid.polymerisingBacteria=Polymerising Bacteria +fluid.rawDNA=Raw DNA + +genetics.item.casingIron.name=Reinforced Casing +genetics.item.dnaDye.name=DNA Dye +genetics.item.dyeFluor.name=Fluorescent Dye +genetics.item.enzyme.name=Enzyme +genetics.item.growthMedium.name=Growth Medium +genetics.item.sequencerEmpty.name=Blank Sequence +genetics.item.serumEmpty.name=Empty Serum Vial +genetics.item.genomeEmpty.name=Empty Serum Array +genetics.item.cylinderEmpty.name=Glass Cylinder +genetics.item.integratedCircuit.name=Integrated Circuit Board +genetics.item.integratedCPU.name=Integrated CPU +genetics.item.casingCircuit.name=Integrated Casing + 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 @@ -8,9 +24,23 @@ 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. +genetics.machine.sequencer.unsequencedDNA=Unsequenced DNA +genetics.machine.sequencer.error.noSequence=No DNA sequence +genetics.machine.sequencer.error.noOwner.title=No Owner +genetics.machine.sequencer.error.noOwner=Replace this block to claim this machine +genetics.machine.sequencer.error.noSpace=No space for empty sequences +genetics.machine.sequencer.gui.sequensedBy=Genes will be sequenced by %s +genetics.machine.sequencer.gui.willNotSave=Userless. Will not save sequences genetics.machine.machine.polymeriser=Polymeriser genetics.machine.machine.polymeriser.info=The Polymeriser takes serums and refills them using Raw DNA and replicating bacteria. This can be accelerated using gold nuggets. +genetics.machine.polymeriser.error.noItem=No item to replicate +genetics.machine.polymeriser.error.itemFilled=Item Filled +genetics.machine.polymeriser.error.noLiquid=Insufficient Bacteria +genetics.machine.polymeriser.error.noDNA=Insufficient DNA +genetics.machine.polymeriser.replicatingWithGene=Replicating with 1 gene +genetics.machine.polymeriser.replicatingWithGenes=Replicating with %d genes +genetics.machine.polymeriser.unfilledSerum=Unfilled Serum 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. @@ -64,6 +94,21 @@ genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Cannot Acclimatize genetics.machine.advMachine.splicer=Splicer genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine to insert genes into individuals. It is fast, but needs insane amounts of power. +genetics.machine.splicer.error.noIndividual=No Individual to Splice +genetics.machine.splicer.error.noSerum=No Serum +genetics.machine.splicer.error.emptySerum.title=Empty Serum +genetics.machine.splicer.error.emptySerum=Serum is empty +genetics.machine.splicer.error.invalidSerum.title=Invalid Serum +genetics.machine.splicer.error.invalidSerum.0=Serum does not hold any genes +genetics.machine.splicer.error.invalidSerum.1=Mismatch of Serum Type and Target +genetics.machine.splicer.error.defunctSerum.title=Defunct Serum +genetics.machine.splicer.error.defunctSerum=Individual already possesses this allele +genetics.machine.splicer.splicableIndividual=Splicable Individual +genetics.machine.splicer.serums=Serum Vials & Arrays +genetics.machine.splicer.splicingIn.0=Splicing in %d/%d genes +genetics.machine.splicer.splicingIn.1=Splicing in %d/%d gene +genetics.machine.splicer.splicingIn.2=Splicing in %d genes +genetics.machine.splicer.splicingIn.3=Splicing in %d gene genetics.item.sequence=DNA Sequence genetics.item.sequence.0=Very Faint diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 44243b26..ea43689b 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -1,3 +1,19 @@ +fluid.polymerisingBacteria=Polymerising Bacteria +fluid.rawDNA=Raw DNA + +genetics.item.casingIron.name=Reinforced Casing +genetics.item.dnaDye.name=DNA Dye +genetics.item.dyeFluor.name=Fluorescent Dye +genetics.item.enzyme.name=Enzyme +genetics.item.growthMedium.name=Growth Medium +genetics.item.sequencerEmpty.name=Blank Sequence +genetics.item.serumEmpty.name=Empty Serum Vial +genetics.item.genomeEmpty.name=Empty Serum Array +genetics.item.cylinderEmpty.name=Glass Cylinder +genetics.item.integratedCircuit.name=Integrated Circuit Board +genetics.item.integratedCPU.name=Integrated CPU +genetics.item.casingCircuit.name=Integrated Casing + 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 @@ -8,9 +24,23 @@ 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. +genetics.machine.sequencer.unsequencedDNA=Unsequenced DNA +genetics.machine.sequencer.error.noSequence=No DNA sequence +genetics.machine.sequencer.error.noOwner.title=No Owner +genetics.machine.sequencer.error.noOwner=Replace this block to claim this machine +genetics.machine.sequencer.error.noSpace=No space for empty sequences +genetics.machine.sequencer.gui.sequensedBy=Genes will be sequenced by %s +genetics.machine.sequencer.gui.willNotSave=Userless. Will not save sequences genetics.machine.machine.polymeriser=Polymeriser genetics.machine.machine.polymeriser.info=The Polymeriser fills empty serums with Raw DNA and replicating bacteria. This process can be accelerated using gold nuggets. +genetics.machine.polymeriser.error.noItem=No item to replicate +genetics.machine.polymeriser.error.itemFilled=Item Filled +genetics.machine.polymeriser.error.noLiquid=Insufficient Bacteria +genetics.machine.polymeriser.error.noDNA=Insufficient DNA +genetics.machine.polymeriser.replicatingWithGene=Replicating with 1 gene +genetics.machine.polymeriser.replicatingWithGenes=Replicating with %d genes +genetics.machine.polymeriser.unfilledSerum=Unfilled Serum 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. @@ -64,6 +94,21 @@ genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Cannot Acclimatise genetics.machine.advMachine.splicer=Splicer genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine that is used to insert genes into individuals. This process is fast, but requires monumental amounts of power. +genetics.machine.splicer.error.noIndividual=No Individual to Splice +genetics.machine.splicer.error.noSerum=No Serum +genetics.machine.splicer.error.emptySerum.title=Empty Serum +genetics.machine.splicer.error.emptySerum=Serum is empty +genetics.machine.splicer.error.invalidSerum.title=Invalid Serum +genetics.machine.splicer.error.invalidSerum.0=Serum does not hold any genes +genetics.machine.splicer.error.invalidSerum.1=Mismatch of Serum Type and Target +genetics.machine.splicer.error.defunctSerum.title=Defunct Serum +genetics.machine.splicer.error.defunctSerum=Individual already possesses this allele +genetics.machine.splicer.splicableIndividual=Splicable Individual +genetics.machine.splicer.serums=Serum Vials & Arrays +genetics.machine.splicer.splicingIn.0=Splicing in %d/%d genes +genetics.machine.splicer.splicingIn.1=Splicing in %d/%d gene +genetics.machine.splicer.splicingIn.2=Splicing in %d genes +genetics.machine.splicer.splicingIn.3=Splicing in %d gene genetics.item.sequence=DNA Sequence genetics.item.sequence.0=Very Faint diff --git a/src/main/resources/assets/genetics/lang/ru_RU.lang b/src/main/resources/assets/genetics/lang/ru_RU.lang index 5982f3ac..e85ceac6 100644 --- a/src/main/resources/assets/genetics/lang/ru_RU.lang +++ b/src/main/resources/assets/genetics/lang/ru_RU.lang @@ -1,3 +1,19 @@ +fluid.polymerisingBacteria=Полимеризированная бактерия +fluid.rawDNA=Сырая ДНК + +genetics.item.casingIron.name=Укреплённый корпус +genetics.item.dnaDye.name=Краситель ДНК +genetics.item.dyeFluor.name=Флюорофор +genetics.item.enzyme.name=Фермент +genetics.item.growthMedium.name=Питательная среда +genetics.item.sequencerEmpty.name=Пустая последовательность +genetics.item.serumEmpty.name=Колба без сыворотки +genetics.item.genomeEmpty.name=Массив без сыворотки +genetics.item.cylinderEmpty.name=Пустой баллон +genetics.item.integratedCircuit.name=Интегральная печатная плата +genetics.item.integratedCPU.name=Интегральный процессор +genetics.item.casingCircuit.name=Интегральный корпус + genetics.machine.machine.isolator=Изолятор genetics.machine.machine.isolator.info=Изолятор извлекает случайный ген от пчелы, дерева или другого организма и копирует его в пустой пузырек сыворотки (empty sequence vial). Требуется Этанол для растворения и Фермент для извлечения ДНК. Полученная сыворотка с геном затем может быть усилена в Полимеризаторе и исследована в Секвенсоре. genetics.machine.isolator.error.noIndividual=Нет образцов для изоляции @@ -8,9 +24,23 @@ genetics.machine.isolator.error.noEnzyme=Нет энзима genetics.machine.machine.sequencer=Секвенсор genetics.machine.machine.sequencer.info=Секвенсор предназначен для анализа новых генов, извлечённых из организмов. Секвенсор принимает неисследованную сыворотку и определяет, какие гены присутствуют в ней. В результате ген попадает в общую генетическую базу данных. Процесс занимает много времени и требует использования Флюорофора (жёлтый+оранжевый+светопыль) +genetics.machine.sequencer.unsequencedDNA=Неиследованная ДНК +genetics.machine.sequencer.error.noSequence=Нет генов для анализа +genetics.machine.sequencer.error.noOwner.title=Нет владельца +genetics.machine.sequencer.error.noOwner=Замените этот блок машины +genetics.machine.sequencer.error.noSpace=Нет места для пустых последовательностей +genetics.machine.sequencer.gui.sequensedBy=Гены будут проанализированы игроком %s +genetics.machine.sequencer.gui.willNotSave=Потеря владелец. Гены не будут извлечены genetics.machine.machine.polymeriser=Полимеризатор genetics.machine.machine.polymeriser.info=Полимеризатор усиливает (концентрирует) сыворотку с геном с помощью Сырой ДНК и Полимеризованной Бактерии. Эта операция обязательна перед использованием сыворотки в Инокуляторе или Секвенсоре и Сплайсере. Процесс может быть ускорен с помощью золотых самородков. +genetics.machine.polymeriser.error.noItem=Нет образца для репликации +genetics.machine.polymeriser.error.itemFilled=Предмет заполнен +genetics.machine.polymeriser.error.noLiquid=Недостаточно Бактерии +genetics.machine.polymeriser.error.noDNA=Недостаточно ДНК +genetics.machine.polymeriser.replicatingWithGene=Репликация с одним геном +genetics.machine.polymeriser.replicatingWithGenes=Репликация с %d генами +genetics.machine.polymeriser.unfilledSerum=Unfilled Serum genetics.machine.machine.inoculator=Инокулятор genetics.machine.machine.inoculator.info=Инокулятор использует сыворотку для прививки новых генов. Процесс продолжителен и требует Бактерию Вектор, но на 100% успешен. @@ -24,7 +54,7 @@ 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.inoculatingWithGene=Инокуляция с одним геном genetics.machine.inoculator.inoculatingWithGenes=Инокуляция с %d генами genetics.machine.inoculator.inoculableIndividual=Образец для инокуляции genetics.machine.inoculator.serums=Сывороточные флаконы и массивы @@ -64,6 +94,21 @@ genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Невозможн genetics.machine.advMachine.splicer=Сплайсер genetics.machine.advMachine.splicer.info=Сплайсер аналогичен инокулятору, но гораздо быстрее и требует огромную мощность. +genetics.machine.splicer.error.noIndividual=No Individual to Splice +genetics.machine.splicer.error.noSerum=Нет сыворотки +genetics.machine.splicer.error.emptySerum.title=Нет сыворотки +genetics.machine.splicer.error.emptySerum=Пустая сыворотка +genetics.machine.splicer.error.invalidSerum.title=Некорректная сыворотка +genetics.machine.splicer.error.invalidSerum.0=Сыворотка не содержит каких-либо генов +genetics.machine.splicer.error.invalidSerum.1=Потерян тип сыворотки +genetics.machine.splicer.error.defunctSerum.title=Недействующая сыворотка +genetics.machine.splicer.error.defunctSerum=Образец уже имеет необходимые гены +genetics.machine.splicer.splicableIndividual=Образец +genetics.machine.splicer.serums=Сывороточные флаконы или массивы +genetics.machine.splicer.splicingIn.0=Соединения в %d/%d генах +genetics.machine.splicer.splicingIn.1=Соединения в %d/%d гене +genetics.machine.splicer.splicingIn.2=Соединения в %d генах +genetics.machine.splicer.splicingIn.3=Соединения в %d гене genetics.item.sequence=Сыворотка ДНК genetics.item.sequence.0=Очень слабо diff --git a/src/main/resources/assets/genetics/lang/zh_CN.lang b/src/main/resources/assets/genetics/lang/zh_CN.lang index 0b0d4e84..4b8b0ce4 100644 --- a/src/main/resources/assets/genetics/lang/zh_CN.lang +++ b/src/main/resources/assets/genetics/lang/zh_CN.lang @@ -1,6 +1,3 @@ -################################################## -## Machines - genetics.machine.machine.isolator=基因分离器 genetics.machine.machine.isolator.info=基因分离器将会从蜜蜂,树苗或者其它的独立个体中随机提取基因片段,并复制到一个空的序列瓶中.这需要乙醇作为溶剂,还需要酶来切断DNA.未序列化的血清可以在序列分析器中序列化,并在基因同化器中重新装填. @@ -16,7 +13,6 @@ genetics.machine.machine.inoculator.info=基因注射器使用特定血清向可 genetics.machine.labMachine.genepool=基因池 genetics.machine.labMachine.genepool.info=基因液体池使用酶和乙醇来破坏活体组织并将其转化为DNA液体.所有遗传信息都会丢失,DNA来源也会被破坏. - genetics.machine.labMachine.labMachine=实验台 genetics.machine.labMachine.analyser=分析仪 @@ -30,11 +26,7 @@ genetics.machine.labMachine.acclimatiser=气候改造器 genetics.machine.advMachine.splicer=Splicer genetics.machine.advMachine.splicer.info=Splicer是一台异常强大的机器,可将基因直接植入个体之中.虽然工作迅速,但它却是个电老虎. - - - genetics.item.sequence=DNA序列 - genetics.item.sequence.0=极弱 genetics.item.sequence.1=弱 genetics.item.sequence.2=略弱 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 7b321e5f..7c488d4f 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -72,4 +72,4 @@ "parent": "", "dependencies": [ "BinnieCore" ] } - ] +]