mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-17 02:45:17 +00:00
Fix item and block localization. This is a world breaking change!
This commit is contained in:
1 parent
5fcc76a2fa
commit
83789ae8f7
78 files changed
+1119
-1120
No files matched your search
@@ -70,13 +70,11 @@ public class PluginEnergy extends NativePlugin {
|
||||
public void preInit() {
|
||||
super.preInit();
|
||||
|
||||
ForestryBlock.engine = new BlockBase(Material.iron, true);
|
||||
ForestryBlock.engine.setBlockName("for.engine");
|
||||
Proxies.common.registerBlock(ForestryBlock.engine, ItemForestryBlock.class);
|
||||
ForestryBlock.engine.registerBlock(new BlockBase(Material.iron, true), ItemForestryBlock.class, "engine");
|
||||
|
||||
definitionEngineTin = ForestryBlock.engine.addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINETIN_META, "forestry.EngineTin", EngineTin.class,
|
||||
definitionEngineTin = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINETIN_META, "forestry.EngineTin", EngineTin.class,
|
||||
PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_tin_"), ShapedRecipeCustom.createShapedRecipe(
|
||||
new ItemStack(ForestryBlock.engine, 1, Defaults.DEFINITION_ENGINETIN_META),
|
||||
ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINETIN_META),
|
||||
"###",
|
||||
" X ",
|
||||
"YVY",
|
||||
@@ -84,9 +82,9 @@ public class PluginEnergy extends NativePlugin {
|
||||
'X', Blocks.glass,
|
||||
'Y', "gearTin",
|
||||
'V', Blocks.piston)));
|
||||
definitionEngineCopper = ForestryBlock.engine.addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINECOPPER_META, "forestry.EngineCopper", EngineCopper.class,
|
||||
definitionEngineCopper = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINECOPPER_META, "forestry.EngineCopper", EngineCopper.class,
|
||||
PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_copper_"), ShapedRecipeCustom.createShapedRecipe(
|
||||
new ItemStack(ForestryBlock.engine, 1, Defaults.DEFINITION_ENGINECOPPER_META),
|
||||
ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINECOPPER_META),
|
||||
"###",
|
||||
" X ",
|
||||
"YVY",
|
||||
@@ -94,9 +92,9 @@ public class PluginEnergy extends NativePlugin {
|
||||
'X', Blocks.glass,
|
||||
'Y', "gearCopper",
|
||||
'V', Blocks.piston)));
|
||||
definitionEngineBronze = ForestryBlock.engine.addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINEBRONZE_META, "forestry.EngineBronze", EngineBronze.class,
|
||||
definitionEngineBronze = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINEBRONZE_META, "forestry.EngineBronze", EngineBronze.class,
|
||||
PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_bronze_"), ShapedRecipeCustom.createShapedRecipe(
|
||||
new ItemStack(ForestryBlock.engine, 1, Defaults.DEFINITION_ENGINEBRONZE_META),
|
||||
ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINEBRONZE_META),
|
||||
"###",
|
||||
" X ",
|
||||
"YVY",
|
||||
@@ -105,8 +103,9 @@ public class PluginEnergy extends NativePlugin {
|
||||
'Y', "gearBronze",
|
||||
'V', Blocks.piston)));
|
||||
|
||||
definitionGenerator = ForestryBlock.engine.addDefinition(new MachineDefinition(Defaults.DEFINITION_GENERATOR_META, "forestry.Generator", MachineGenerator.class,
|
||||
Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/generator_"), ShapedRecipeCustom.createShapedRecipe(new ItemStack(ForestryBlock.engine, 1, Defaults.DEFINITION_GENERATOR_META),
|
||||
definitionGenerator = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_GENERATOR_META, "forestry.Generator", MachineGenerator.class,
|
||||
Proxies.render.getRenderDefaultMachine(Defaults.TEXTURE_PATH_BLOCKS + "/generator_"), ShapedRecipeCustom.createShapedRecipe(
|
||||
ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_GENERATOR_META),
|
||||
"X#X",
|
||||
"XYX",
|
||||
"X#X",
|
||||
@@ -115,9 +114,9 @@ public class PluginEnergy extends NativePlugin {
|
||||
'Y', ForestryItem.sturdyCasing)));
|
||||
|
||||
ShapedRecipeCustom clockworkRecipe = null;
|
||||
if (GameMode.getGameMode().getBooleanSetting("energy.engine.clockwork")) {
|
||||
if (GameMode.getGameMode().getBooleanSetting("energy.engine.clockwork"))
|
||||
clockworkRecipe = ShapedRecipeCustom.createShapedRecipe(
|
||||
new ItemStack(ForestryBlock.engine, 1, Defaults.DEFINITION_ENGINECLOCKWORK_META),
|
||||
ForestryBlock.engine.getItemStack(1, Defaults.DEFINITION_ENGINECLOCKWORK_META),
|
||||
"###",
|
||||
" X ",
|
||||
"ZVY",
|
||||
@@ -126,9 +125,8 @@ public class PluginEnergy extends NativePlugin {
|
||||
'Y', Items.clock,
|
||||
'Z', ForestryItem.gearCopper,
|
||||
'V', Blocks.piston);
|
||||
}
|
||||
|
||||
definitionEngineClockwork = ForestryBlock.engine.addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINECLOCKWORK_META, "forestry.EngineClockwork", EngineClockwork.class,
|
||||
definitionEngineClockwork = ((BlockBase) ForestryBlock.engine.block()).addDefinition(new EngineDefinition(Defaults.DEFINITION_ENGINECLOCKWORK_META, "forestry.EngineClockwork", EngineClockwork.class,
|
||||
PluginEnergy.proxy.getRenderDefaultEngine(Defaults.TEXTURE_PATH_BLOCKS + "/engine_clock_"), clockworkRecipe));
|
||||
|
||||
ChipsetManager.circuitRegistry.registerLegacyMapping(CircuitId.ELECTRIC_CHOKE_I, "forestry.energyChoke1");
|
||||
@@ -156,10 +154,10 @@ public class PluginEnergy extends NativePlugin {
|
||||
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.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"});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user