diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index f48d2fec..f15f85ea 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -25,25 +25,13 @@ public class CircuitGarden extends BinnieCircuit { super(getName(moisture, ph, manual, fertilised), 4, getLayout(manual), recipe); this.isManual = manual; this.logic = new GardenLogic(moisture, ph, this.isManual, fertilised, icon, I18N.localise(this.getUnlocalizedName())); - StringBuilder info = new StringBuilder("Flowers (") - .append(TextFormatting.GRAY.toString()) - .append(I18N.localise("botany.moisture")) - .append(": ") - .append(moisture.getLocalisedName(true)); - - if (ph != null) { - info.append(TextFormatting.GRAY.toString()) - .append(", ") - .append(I18N.localise("botany.ph")) - .append(": ") - .append(ph.getLocalisedName(true)); + String info = I18N.localise("botany.moisture") + ": " + moisture.getLocalisedName(true); + if(ph != null){ + info+= TextFormatting.GRAY + ", " + I18N.localise("botany.ph") + ": " + moisture.getLocalisedName(true); } String fertilizedKey = fertilised ? "for.binnie.circuit.garden.fertilized" : "for.binnie.circuit.garden.unfertilized"; - info.append(TextFormatting.RESET.toString()) - .append(" ") - .append(I18N.localise(fertilizedKey)) - .append(")"); - this.addTooltipString(info.toString()); + info+= TextFormatting.GRAY + " " + I18N.localise(fertilizedKey); + this.addTooltipString(I18N.localise("for.binnie.circuit.garden.info", info)); } private static ICircuitLayout getLayout(boolean manual) { diff --git a/src/main/java/binnie/botany/flower/EnumTubeInsulate.java b/src/main/java/binnie/botany/flower/EnumTubeInsulate.java index d4d6f815..84823ef4 100644 --- a/src/main/java/binnie/botany/flower/EnumTubeInsulate.java +++ b/src/main/java/binnie/botany/flower/EnumTubeInsulate.java @@ -8,7 +8,7 @@ import binnie.core.util.I18N; enum EnumTubeInsulate { Clay(0xa1aacc, "clay"), Cobble(0x7b7b7b, "cobblestone"), - Sand(0xefeab5, "sand"), + Sand(0xefeab5, "sandstone"), HardenedClay(0x935c43, "hardened_clay"), Stone(0x6d6d6d, "stone"), Sandstone(0xc1b989, "sandstone"); diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index ae25407c..62f2bc67 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -159,6 +159,8 @@ botany.color.white=White botany.color.yellow=Yellow botany.color.yellowgreen=Yellow-Green +for.binnie.circuit.garden.info=Flowers (%s) + for.binnie.circuit.garden.fertilized=Fertilized for.binnie.circuit.garden.unfertilized=Unfertilized @@ -210,7 +212,6 @@ for.binnie.circuit.garden.damp=Garden (Damp) for.binnie.circuit.garden.damp.acid=Garden (Damp, Acidic) for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral) for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline) -for.binnie.circuit.garden.info=Flowers botany.gui.controls.color_mix_symbol.chance=Current Chance - %f%%