diff --git a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java index be55f28a..7c06cc03 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java @@ -44,12 +44,12 @@ public class WindowPolymeriser extends WindowMachine { new ControlIconDisplay(this, x + 18, y + 1, GUIIcon.ArrowRight.getIcon()); x += 34; 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 ControlSlot(this, x, y).assign(Polymeriser.SLOT_SERUM); + new ControlLiquidTank(this, x, y + 18 + 16, true).setTankID(Polymeriser.TANK_BACTERIA); + new ControlLiquidTank(this, x, y + 18 + 16 + 18 + 8, true).setTankID(Polymeriser.TANK_DNA); new ControlEnergyBar(this, x + 120, 96, 64, 16, Position.LEFT); x += 40; - new ControlSlot(this, x + 30, y + 18 + 8).assign(1); + new ControlSlot(this, x + 30, y + 18 + 8).assign(Polymeriser.SLOT_GOLD); 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); diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index 264ab0f0..e3499ae0 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -9,11 +9,11 @@ import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; public enum GeneticLiquid implements IFluidType { - GrowthMedium("Growth Medium", "growthMedium", 15460533), - Bacteria("Bacteria", "bacteria", 14203521), - BacteriaPoly("Polymerising Bacteria", "bacteriaPoly", 11443396), - RawDNA("Raw DNA", "dna.raw", 15089129), - BacteriaVector("Bacteria Vector", "bacteriaVector", 15960958); + GrowthMedium("growthMedium", 0xebe8b5), + Bacteria("bacteria", 0xd8ba81), + BacteriaPoly("bacteriaPoly", 0xae9cc4), + RawDNA("dna.raw", 0xe63de9), + BacteriaVector("bacteriaVector", 0xf38b7e); protected String name; protected String ident; @@ -21,9 +21,9 @@ public enum GeneticLiquid implements IFluidType { protected int color; protected float transparency; - GeneticLiquid(String name, String ident, int color) { + GeneticLiquid(String name, int color) { this.name = name; - this.ident = ident; + this.ident = name; this.color = color; transparency = 1.0f; } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java index 64856d21..6e924b7d 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java @@ -13,6 +13,6 @@ class PolymerisingBacteriaValidator extends Validator { @Override public String getTooltip() { - return I18N.localise("fluid.polymerisingBacteria"); + return I18N.localise("fluid.bacteriaPoly"); } } diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/src/main/resources/assets/binniecore/lang/en_US.lang index 14f30730..6f50761c 100644 --- a/src/main/resources/assets/binniecore/lang/en_US.lang +++ b/src/main/resources/assets/binniecore/lang/en_US.lang @@ -277,7 +277,7 @@ binniecore.gui.database.furtherMutations=Further Mutations binniecore.gui.database.resultantMutations=Resultant Mutations binniecore.gui.database.descriptor=%s Profile binniecore.gui.database.time.minute=1 minute -binniecore.gui.database.time.minute=%d minutes +binniecore.gui.database.time.minutes=%d minutes binniecore.gui.database.time.second=1 second binniecore.gui.database.time.seconds=%d seconds binniecore.gui.database.time.progress=Progress diff --git a/src/main/resources/assets/binniecore/lang/ru_RU.lang b/src/main/resources/assets/binniecore/lang/ru_RU.lang index 99d1da70..22513b6d 100644 --- a/src/main/resources/assets/binniecore/lang/ru_RU.lang +++ b/src/main/resources/assets/binniecore/lang/ru_RU.lang @@ -277,7 +277,7 @@ binniecore.gui.database.furtherMutations=Дальнейшие мутации binniecore.gui.database.resultantMutations=Результирующие мутации binniecore.gui.database.descriptor=%s binniecore.gui.database.time.minute=1 минута -binniecore.gui.database.time.minute=%d мин. +binniecore.gui.database.time.minutes=%d мин. binniecore.gui.database.time.second=1 секунда binniecore.gui.database.time.seconds=%d сек. binniecore.gui.database.time.progress=Прогресс @@ -285,8 +285,8 @@ binniecore.gui.database.time.notInProgress=Не в прогрессе binniecore.gui.database.time.inProgress=В прогрессе binniecore.gui.database.time.left=Осталось времени: %s binniecore.gui.database.time.total=Всего времени: %s -binniecore.gui.database.energyCost.0=Energy Cost: %d RF -binniecore.gui.database.energyCost.1=Energy Cost: %.2f RF / tick +binniecore.gui.database.energyCost.0=Энергопотребление: %d RF +binniecore.gui.database.energyCost.1=Энергопотребление: %.2f RF / tick binniecore.gui.temperature.short=Темп. binniecore.gui.humidity.short=Влаж. diff --git a/src/main/resources/assets/genetics/lang/en_GB.lang b/src/main/resources/assets/genetics/lang/en_GB.lang index 6a73a916..0b8a4b3e 100644 --- a/src/main/resources/assets/genetics/lang/en_GB.lang +++ b/src/main/resources/assets/genetics/lang/en_GB.lang @@ -1,3 +1,5 @@ +fluid.bacteriaPoly=Polymerising Bacteria + 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.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.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. diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index ea43689b..ec3a1bfc 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -1,5 +1,8 @@ -fluid.polymerisingBacteria=Polymerising Bacteria fluid.rawDNA=Raw DNA +fluid.bacteria=Bacteria +fluid.bacteriaPoly=Polymerizing Bacteria +fluid.growthMedium=Growth Medium +fluid.bacteriaVector=Bacteria Vector genetics.item.casingIron.name=Reinforced Casing genetics.item.dnaDye.name=DNA Dye diff --git a/src/main/resources/assets/genetics/lang/ru_RU.lang b/src/main/resources/assets/genetics/lang/ru_RU.lang index e85ceac6..59be1203 100644 --- a/src/main/resources/assets/genetics/lang/ru_RU.lang +++ b/src/main/resources/assets/genetics/lang/ru_RU.lang @@ -1,5 +1,8 @@ -fluid.polymerisingBacteria=Полимеризированная бактерия fluid.rawDNA=Сырая ДНК +fluid.bacteria=Бактерия +fluid.bacteriaPoly=Полимеризированная бактерия +fluid.growthMedium=Питательная среда +fluid.bacteriaVector=Бактерия Вектор genetics.item.casingIron.name=Укреплённый корпус genetics.item.dnaDye.name=Краситель ДНК diff --git a/src/main/resources/assets/genetics/lang/zh_CN.lang b/src/main/resources/assets/genetics/lang/zh_CN.lang index b51c998f..62c84f2d 100644 --- a/src/main/resources/assets/genetics/lang/zh_CN.lang +++ b/src/main/resources/assets/genetics/lang/zh_CN.lang @@ -1,4 +1,3 @@ -fluid.polymerisingBacteria=Polymerising Bacteria fluid.rawDNA=原生 DNA genetics.item.casingIron.name=强化外壳