diff --git a/lang b/lang index 97a62b9cc..899e594a8 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 97a62b9cc7a67f9a77529e4bd40e5b13acf501c5 +Subproject commit 899e594a823957ce20cb37eaf86abddfe3b2add0 diff --git a/src/main/java/forestry/core/circuits/Circuit.java b/src/main/java/forestry/core/circuits/Circuit.java index dadff587a..313b37b21 100755 --- a/src/main/java/forestry/core/circuits/Circuit.java +++ b/src/main/java/forestry/core/circuits/Circuit.java @@ -21,14 +21,10 @@ public abstract class Circuit implements ICircuit { String uid; int limit = 1; boolean requiresDiscovery; - String name; - String[] descriptions; - public Circuit(String uid, boolean requiresDiscovery, String name, String[] descriptions) { + public Circuit(String uid, boolean requiresDiscovery) { this.uid = uid; this.requiresDiscovery = requiresDiscovery; - this.name = name; - this.descriptions = descriptions; ChipsetManager.circuitRegistry.registerCircuit(this); } @@ -54,14 +50,23 @@ public abstract class Circuit implements ICircuit { @Override public String getName() { - return "circuit." + this.name; + return "circuit." + this.uid; } @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addTooltip(List list) { - for (String description : descriptions) - list.add(" - " + StringUtil.localize(description)); + list.add(StringUtil.localize(getName())); + + int i = 1; + while (true) { + String unlocalizedDescription = getName() + ".description." + i; + String description = StringUtil.localize(unlocalizedDescription); + if (description.endsWith(unlocalizedDescription)) + break; + list.add(" - " + description); + i++; + } } public static ICircuit energyElectricChoke1; diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java b/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java index 649b6c698..acdad1149 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java @@ -12,8 +12,8 @@ package forestry.energy.circuits; public class CircuitElectricBoost extends CircuitElectricChange { - public CircuitElectricBoost(String uid, int limit, int eu, int mj, String name, String[] description) { - super(uid, false, name, description); + public CircuitElectricBoost(String uid, int limit, int eu, int mj) { + super(uid, false); this.setLimit(limit); this.configureChange(eu, mj); } diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java index 4440fc70e..a438271e0 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java @@ -20,8 +20,8 @@ public abstract class CircuitElectricChange extends Circuit { int euChange = 7; int mjChange = 2; - public CircuitElectricChange(String uid, boolean requiresDiscovery, String name, String[] descriptions) { - super(uid, requiresDiscovery, name, descriptions); + public CircuitElectricChange(String uid, boolean requiresDiscovery) { + super(uid, requiresDiscovery); } protected void configureChange(int euChange, int mjChange) { diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java b/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java index b68eca792..e385e9032 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java @@ -13,7 +13,7 @@ package forestry.energy.circuits; public class CircuitElectricChoke extends CircuitElectricChange { public CircuitElectricChoke(String uid) { - super(uid, false, "electric.choke.1", new String[] { "Reduces ouput by 1 MJ/t", "Reduces intake by 2 EU/t" }); + super(uid, false); this.configureChange(-2, -1); this.setLimit(1); } diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java b/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java index 3ebc2ce94..29b10cb49 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java @@ -13,7 +13,7 @@ package forestry.energy.circuits; public class CircuitElectricEfficiency extends CircuitElectricChange { public CircuitElectricEfficiency(String uid) { - super(uid, false, "electric.efficiency.1", new String[] { "Reduces intake by 1 EU/t" }); + super(uid, false); this.setLimit(1); this.configureChange(-1, 0); } diff --git a/src/main/java/forestry/energy/circuits/CircuitFireDampener.java b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java index ee78160d6..f8fe35a4e 100755 --- a/src/main/java/forestry/energy/circuits/CircuitFireDampener.java +++ b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java @@ -18,7 +18,7 @@ import forestry.energy.gadgets.EngineCopper; public class CircuitFireDampener extends Circuit { public CircuitFireDampener(String uid) { - super(uid, false, "dampener.1", new String[] { "Reduces maximum output to 1 MJ/t", "Preserves fuel output" }); + super(uid, false); } @Override diff --git a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java index 3a95355e6..d8beda9e9 100755 --- a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java +++ b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java @@ -23,8 +23,8 @@ public class CircuitFarmLogic extends Circuit { private Class logicClass; private boolean isManual = false; - public CircuitFarmLogic(String uid, Class logicClass, String[] descriptions) { - super(uid, false, uid, descriptions); + public CircuitFarmLogic(String uid, Class logicClass) { + super(uid, false); this.logicClass = logicClass; setLimit(4); } diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java index 5befe52ff..c25538fbd 100755 --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/plugins/PluginEnergy.java @@ -156,13 +156,11 @@ public class PluginEnergy extends NativePlugin { GeneratorFuel biomassFuel = new GeneratorFuel(biomass, (int) (8 * GameMode.getGameMode().getFloatSetting("fuel.biomass.generator")), 1); FuelManager.generatorFuel.put(biomass.getFluid(), biomassFuel); - Circuit.energyElectricChoke1 = new CircuitElectricChoke("energyChoke1"); - Circuit.energyFireDampener1 = new CircuitFireDampener("energyDampener1"); - Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("energyEfficiency1"); - Circuit.energyElectricBoost1 = new CircuitElectricBoost("energyBoost1", 2, 7, 2, "electric.boost.1", new String[]{"Increases output by 2 MJ/t", - "Increases intake by 7 EU/t"}); - Circuit.energyElectricBoost2 = new CircuitElectricBoost("energyBoost2", 2, 15, 4, "electric.boost.2", new String[]{"Increases output by 4 MJ/t", - "Increases intake by 15 EU/t"}); + Circuit.energyElectricChoke1 = new CircuitElectricChoke("electric.choke.1"); + Circuit.energyFireDampener1 = new CircuitFireDampener("dampener.1"); + Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("electric.efficiency.1"); + Circuit.energyElectricBoost1 = new CircuitElectricBoost("electric.boost.1", 2, 7, 2); + Circuit.energyElectricBoost2 = new CircuitElectricBoost("electric.boost.2", 2, 15, 4); } @Override diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 801cb5224..018f20a78 100755 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -171,24 +171,24 @@ public class PluginFarming extends NativePlugin { GameRegistry.registerTileEntity(TileValve.class, "forestry.FarmValve"); GameRegistry.registerTileEntity(TileControl.class, "forestry.FarmControl"); - Circuit.farmArborealManaged = new CircuitFarmLogic("managedArboreal", FarmLogicArboreal.class, new String[]{"Arboreal Plants"}); - Circuit.farmShroomManaged = new CircuitFarmLogic("managedShroom", FarmLogicShroom.class, new String[]{"Mushrooms"}); - Circuit.farmPeatManaged = new CircuitFarmLogic("managedPeat", FarmLogicPeat.class, new String[]{"Peat Bog"}); - Circuit.farmCerealManaged = new CircuitFarmLogic("managedCereal", FarmLogicCereal.class, new String[]{"Crops"}); - Circuit.farmVegetableManaged = new CircuitFarmLogic("managedVegetable", FarmLogicVegetable.class, new String[]{"Vegetables"}); - Circuit.farmInfernalManaged = new CircuitFarmLogic("managedInfernal", FarmLogicInfernal.class, new String[]{"Infernal Crops"}); + Circuit.farmArborealManaged = new CircuitFarmLogic("managedArboreal", FarmLogicArboreal.class); + Circuit.farmShroomManaged = new CircuitFarmLogic("managedShroom", FarmLogicShroom.class); + Circuit.farmPeatManaged = new CircuitFarmLogic("managedPeat", FarmLogicPeat.class); + Circuit.farmCerealManaged = new CircuitFarmLogic("managedCereal", FarmLogicCereal.class); + Circuit.farmVegetableManaged = new CircuitFarmLogic("managedVegetable", FarmLogicVegetable.class); + Circuit.farmInfernalManaged = new CircuitFarmLogic("managedInfernal", FarmLogicInfernal.class); - Circuit.farmPeatManual = new CircuitFarmLogic("manualPeat", FarmLogicPeat.class, new String[]{"Peat Bog"}).setManual(); - Circuit.farmShroomManual = new CircuitFarmLogic("manualShroom", FarmLogicShroom.class, new String[]{"Mushrooms"}).setManual(); - Circuit.farmCerealManual = new CircuitFarmLogic("manualCereal", FarmLogicCereal.class, new String[]{"Crops"}).setManual(); - Circuit.farmVegetableManual = new CircuitFarmLogic("manualVegetable", FarmLogicVegetable.class, new String[]{"Vegetables"}).setManual(); - Circuit.farmSucculentManual = new CircuitFarmLogic("manualSucculent", FarmLogicSucculent.class, new String[]{"Succulents"}).setManual(); - Circuit.farmPoalesManual = new CircuitFarmLogic("manualPoales", FarmLogicPoale.class, new String[]{"Reeds"}).setManual(); - Circuit.farmGourdManual = new CircuitFarmLogic("manualGourd", FarmLogicGourd.class, new String[]{"Gourds"}).setManual(); - Circuit.farmCocoaManual = new CircuitFarmLogic("manualCocoa", FarmLogicCocoa.class, new String[]{"Cocoa Plantation"}).setManual(); + Circuit.farmPeatManual = new CircuitFarmLogic("manualPeat", FarmLogicPeat.class).setManual(); + Circuit.farmShroomManual = new CircuitFarmLogic("manualShroom", FarmLogicShroom.class).setManual(); + Circuit.farmCerealManual = new CircuitFarmLogic("manualCereal", FarmLogicCereal.class).setManual(); + Circuit.farmVegetableManual = new CircuitFarmLogic("manualVegetable", FarmLogicVegetable.class).setManual(); + Circuit.farmSucculentManual = new CircuitFarmLogic("manualSucculent", FarmLogicSucculent.class).setManual(); + Circuit.farmPoalesManual = new CircuitFarmLogic("manualPoales", FarmLogicPoale.class).setManual(); + Circuit.farmGourdManual = new CircuitFarmLogic("manualGourd", FarmLogicGourd.class).setManual(); + Circuit.farmCocoaManual = new CircuitFarmLogic("manualCocoa", FarmLogicCocoa.class).setManual(); - Circuit.farmOrchardManual = new CircuitFarmLogic("manualOrchard", FarmLogicOrchard.class, new String[]{"Orchard"}); - Circuit.farmRubberManual = new CircuitFarmLogic("manualRubber", FarmLogicRubber.class, new String[]{"Rubber Plantation"}); + Circuit.farmOrchardManual = new CircuitFarmLogic("manualOrchard", FarmLogicOrchard.class); + Circuit.farmRubberManual = new CircuitFarmLogic("manualRubber", FarmLogicRubber.class); MinecraftForge.EVENT_BUS.register(new EventHandlerFarming()); }