diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 357f4a8d..a7e0044c 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -133,7 +133,8 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac public boolean isLiquidValidForTank(FluidStack liquid, int tank) { TankSlot slot = getTankSlot(tank); return slot != null - && (slot.isValid(liquid) && !slot.isReadOnly()); + && slot.isValid(liquid) + && !slot.isReadOnly(); } @Override diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index 9d190dfe..f666a4d8 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -46,7 +46,7 @@ public enum GeneticLiquid implements IFluidType { @Override public String getName() { - return I18N.localise("fluid." + name); + return I18N.localise("fluid.binnie." + name); } @Override diff --git a/src/main/java/binnie/genetics/machine/genepool/Genepool.java b/src/main/java/binnie/genetics/machine/genepool/Genepool.java index f737152f..fd3fef8b 100644 --- a/src/main/java/binnie/genetics/machine/genepool/Genepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/Genepool.java @@ -10,4 +10,5 @@ public class Genepool { public static final int TIME_PERIOD = 400; public static final float ENZYME_PER_PROCESS = 0.25f; public static final float ETHANOL_PER_PROCESS = 50.0f; + public static final int POWER_CAPACITY = 1600; } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java index d80f61dd..dfa6eebb 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java @@ -53,7 +53,7 @@ public class GenepoolPackage extends PackageGeneticBase implements IMachineInfor ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); transfer.addRestock(Genepool.SLOT_RESERVE, Genepool.SLOT_BEE, 1); - new ComponentPowerReceptor(machine, 1600); + new ComponentPowerReceptor(machine, Genepool.POWER_CAPACITY); new GenepoolComponentLogic(machine); ComponentChargedSlots chargedSlots = new ComponentChargedSlots(machine); chargedSlots.addCharge(Genepool.SLOT_ENZYME); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java index 7bf20a61..9c65e087 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java @@ -13,6 +13,6 @@ class DnaValidator extends Validator { @Override public String getTooltip() { - return I18N.localise("fluid.rawDNA"); + return I18N.localise("fluid.binnie.dna.raw"); } } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java index 6e924b7d..23ad404d 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.bacteriaPoly"); + return I18N.localise("fluid.binnie.bacteriaPoly"); } } diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/src/main/resources/assets/extrabees/lang/en_US.lang index 5d646390..71af853f 100644 --- a/src/main/resources/assets/extrabees/lang/en_US.lang +++ b/src/main/resources/assets/extrabees/lang/en_US.lang @@ -182,7 +182,6 @@ extrabees.block.hive.3=Marble Hive extrabees.acid=Acid extrabees.poison=Poison extrabees.glacial=Liquid Nitrogen -fluid.dna.raw=Liquid DNA ################################################## diff --git a/src/main/resources/assets/extrabees/lang/ru_RU.lang b/src/main/resources/assets/extrabees/lang/ru_RU.lang index 5bc06508..6e56ee16 100644 --- a/src/main/resources/assets/extrabees/lang/ru_RU.lang +++ b/src/main/resources/assets/extrabees/lang/ru_RU.lang @@ -182,7 +182,6 @@ extrabees.block.hive.3=Мраморный улей extrabees.acid=Растворитель extrabees.poison=Яд extrabees.glacial=Нитроген -fluid.dna.raw=Сырая ДНК ################################################## diff --git a/src/main/resources/assets/extrabees/lang/zh_CN.lang b/src/main/resources/assets/extrabees/lang/zh_CN.lang index ec81df35..711fed69 100644 --- a/src/main/resources/assets/extrabees/lang/zh_CN.lang +++ b/src/main/resources/assets/extrabees/lang/zh_CN.lang @@ -178,7 +178,6 @@ extrabees.block.hive.3=大理石蜂巢 extrabees.acid=酸 extrabees.poison=毒液 extrabees.glacial=液氮 -fluid.dna.raw=液态DNA ################################################## diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 3c4b4e2f..dc6bcf96 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -1,8 +1,8 @@ -fluid.rawDNA=Raw DNA -fluid.bacteria=Bacteria -fluid.bacteriaPoly=Polymerizing Bacteria -fluid.growthMedium=Growth Medium -fluid.bacteriaVector=Bacteria Vector +fluid.binnie.dna.raw=Liquid DNA +fluid.binnie.bacteria=Bacteria +fluid.binnie.growthMedium=Growth Medium +fluid.binnie.bacteriaPoly=Polymerizing Bacteria +fluid.binnie.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 114112d0..9ba69444 100644 --- a/src/main/resources/assets/genetics/lang/ru_RU.lang +++ b/src/main/resources/assets/genetics/lang/ru_RU.lang @@ -1,8 +1,8 @@ -fluid.rawDNA=Сырая ДНК -fluid.bacteria=Бактерия -fluid.bacteriaPoly=Полимеризированная бактерия -fluid.growthMedium=Питательная среда -fluid.bacteriaVector=Бактерия Вектор +fluid.binnie.dna.raw=Сырая ДНК +fluid.binnie.bacteria=Бактерия +fluid.binnie.bacteriaPoly=Полимеризированная бактерия +fluid.binnie.growthMedium=Питательная среда +fluid.binnie.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 3606e8fa..5fcf4c85 100644 --- a/src/main/resources/assets/genetics/lang/zh_CN.lang +++ b/src/main/resources/assets/genetics/lang/zh_CN.lang @@ -1,4 +1,4 @@ -fluid.rawDNA=原生 DNA +fluid.binnie.dna.raw=原生 DNA genetics.item.casingIron.name=强化外壳 genetics.item.dnaDye.name=DNA Dye