From a3a158e4b0d41a6d0749f3f8423235a708476dad Mon Sep 17 00:00:00 2001 From: Gugle Date: Tue, 18 Jun 2024 22:41:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anvilcraft/config/AnvilCraftConfig.java | 2 +- .../data/generator/lang/JadeLang.java | 2 +- .../anvilcraft/event/TooltipEventListener.java | 14 +++++++------- .../dev/dubhe/anvilcraft/init/ModBlocks.java | 2 -- .../assets/anvilcraft/lang/en_ud.json | 2 +- .../assets/anvilcraft/lang/en_us.json | 18 +++++++++--------- .../recipes/lead_ingot_from_raw_lead.json | 2 +- .../recipes/silver_ingot_from_raw_silver.json | 2 +- .../recipes/tin_ingot_from_raw_tin.json | 2 +- .../titanium_ingot_from_raw_titanium.json | 2 +- .../tungsten_ingot_from_raw_tungsten.json | 2 +- .../uranium_ingot_from_raw_uranium.json | 2 +- .../recipes/zinc_ingot_from_raw_zinc.json | 2 +- .../assets/anvilcraft/lang/en_ud.json | 2 +- .../assets/anvilcraft/lang/en_us.json | 18 +++++++++--------- .../recipes/lead_ingot_from_raw_lead.json | 2 +- .../recipes/silver_ingot_from_raw_silver.json | 2 +- .../recipes/tin_ingot_from_raw_tin.json | 2 +- .../titanium_ingot_from_raw_titanium.json | 2 +- .../tungsten_ingot_from_raw_tungsten.json | 2 +- .../uranium_ingot_from_raw_uranium.json | 2 +- .../recipes/zinc_ingot_from_raw_zinc.json | 2 +- 22 files changed, 43 insertions(+), 45 deletions(-) diff --git a/common/src/main/java/dev/dubhe/anvilcraft/config/AnvilCraftConfig.java b/common/src/main/java/dev/dubhe/anvilcraft/config/AnvilCraftConfig.java index d929df988..8feef4fee 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/config/AnvilCraftConfig.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/config/AnvilCraftConfig.java @@ -118,7 +118,7 @@ public static class PowerConverter implements ConfigData { @ConfigEntry.BoundedDiscrete(min = 1, max = 60) public int powerConverterCountdown = 10; - @Comment("Energy efficiency of energy converters (1 KW => xx FE/t)") + @Comment("Energy efficiency of energy converters (1 kW => xx FE/t)") @ConfigEntry.Gui.Tooltip @ConfigEntry.BoundedDiscrete(min = 1, max = 1000) public int powerConverterEfficiency = 80; diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/lang/JadeLang.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/lang/JadeLang.java index fb9002b72..cc0daa198 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/lang/JadeLang.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/lang/JadeLang.java @@ -8,6 +8,6 @@ public class JadeLang { */ public static void init(RegistrateLangProvider provider) { provider.add("config.jade.plugin_anvilcraft.power_provider", "Anvil Craft Power"); - provider.add("tooltip.anvilcraft.jade.power_information", "Power Grid: %d/%d KW"); + provider.add("tooltip.anvilcraft.jade.power_information", "Power Grid: %d/%d kW"); } } diff --git a/common/src/main/java/dev/dubhe/anvilcraft/event/TooltipEventListener.java b/common/src/main/java/dev/dubhe/anvilcraft/event/TooltipEventListener.java index 902a57115..b64ed77d4 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/event/TooltipEventListener.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/event/TooltipEventListener.java @@ -34,12 +34,12 @@ public class TooltipEventListener { map.put(ModBlocks.ROYAL_ANVIL.asItem(), "Unbreakable and powerful compatibility"); map.put(ModBlocks.ROYAL_GRINDSTONE.asItem(), "Creeper proof, Eliminating Curses and Punishing"); map.put(ModBlocks.ROYAL_SMITHING_TABLE.asItem(), "Creeper proof, Saving your Smithing Template"); - map.put(ModBlocks.HEATER.asItem(), "Heating the block above, consumes 8 KW"); + map.put(ModBlocks.HEATER.asItem(), "Heating the block above, consumes 16 kW"); map.put(ModBlocks.TRANSMISSION_POLE.asItem(), "Build a power grid with a transmission distance of 8"); map.put(ModBlocks.CHARGE_COLLECTOR.asItem(), "Collecting charges to generate power"); - map.put(ModBlocks.POWER_CONVERTER_SMALL.asItem(), "Convert power into FE, consumes 1 KW"); - map.put(ModBlocks.POWER_CONVERTER_MIDDLE.asItem(), "Convert power into FE, consumes 3 KW"); - map.put(ModBlocks.POWER_CONVERTER_BIG.asItem(), "Convert power into FE, consumes 9 KW"); + map.put(ModBlocks.POWER_CONVERTER_SMALL.asItem(), "Convert power into FE, consumes 1 kW"); + map.put(ModBlocks.POWER_CONVERTER_MIDDLE.asItem(), "Convert power into FE, consumes 3 kW"); + map.put(ModBlocks.POWER_CONVERTER_BIG.asItem(), "Convert power into FE, consumes 9 kW"); map.put(ModBlocks.PIEZOELECTRIC_CRYSTAL.asItem(), "Charge generated by an anvil fall on it"); map.put(ModBlocks.MAGNET_BLOCK.asItem(), "Attracting the anvil below, when pushed and pulled by the piston, " @@ -48,7 +48,7 @@ public class TooltipEventListener { + "when pushed and pulled by the piston, causes adjacent copper blocks to generate charges"); map.put(ModBlocks.FERRITE_CORE_MAGNET_BLOCK.asItem(), "Attracting the anvil below, " + "when pushed and pulled by the piston, causes adjacent copper blocks to generate charges"); - map.put(ModBlocks.AUTO_CRAFTER.asItem(), "consumes 1 KW"); + map.put(ModBlocks.AUTO_CRAFTER.asItem(), "consumes 1 kW"); map.put(ModBlocks.ROYAL_STEEL_BLOCK.asItem(), "Creeper proof"); map.put(ModBlocks.SMOOTH_ROYAL_STEEL_BLOCK.asItem(), "Creeper proof"); map.put(ModBlocks.CUT_ROYAL_STEEL_BLOCK.asItem(), "Creeper proof"); @@ -66,10 +66,10 @@ public class TooltipEventListener { map.put(ModBlocks.HEAVY_IRON_PLATE.asItem(), "Explosion proof"); map.put(ModBlocks.HEAVY_IRON_COLUMN.asItem(), "Explosion proof"); map.put(ModBlocks.HEAVY_IRON_BEAM.asItem(), "Explosion proof"); - map.put(ModBlocks.INDUCTION_LIGHT.asItem(), "Catalyze crop growth, consumes 1 KW"); + map.put(ModBlocks.INDUCTION_LIGHT.asItem(), "Catalyze crop growth, consumes 1 kW"); map.put(ModBlocks.ITEM_COLLECTOR.asItem(), "Adjust power consumption based on range and cooling" - + ", from 30KW to 150KW"); + + ", from 30kW to 150kW"); } public static final Map NEED_TOOLTIP_ITEM = Collections.unmodifiableMap(map); diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java index 3961063d5..b602e4954 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java @@ -1670,8 +1670,6 @@ public class ModBlocks { .loot(AbstractMultiplePartBlock::loot) .properties(p -> p.noOcclusion().strength(4.0F).sound(SoundType.ANVIL).explosionResistance(1200)) .item(AbstractMultiplePartBlockItem::new) - .model((ctx, provider) -> { - }) .build() .blockstate((ctx, provider) -> { }) diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json index eea0e5dec..b56c63499 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -392,7 +392,7 @@ "tooltip.anvilcraft.item.cut_royal_steel_stairs": "ɟooɹd ɹǝdǝǝɹƆ", "tooltip.anvilcraft.item.ferrite_core_magnet_block": "sǝbɹɐɥɔ ǝʇɐɹǝuǝb oʇ sʞɔoןq ɹǝddoɔ ʇuǝɔɐظpɐ sǝsnɐɔ 'uoʇsıd ǝɥʇ ʎq pǝןןnd puɐ pǝɥsnd uǝɥʍ 'ʍoןǝq ןıʌuɐ ǝɥʇ buıʇɔɐɹʇʇⱯ", "tooltip.anvilcraft.item.geode": "ʇı buısn uǝɥʍ ǝpoǝ⅁ ʇsʎɥʇǝɯⱯ buıpunoɹɹns ǝɥʇ puıℲ", - "tooltip.anvilcraft.item.heater": "Mʞ 8 sǝɯnsuoɔ 'ǝʌoqɐ ʞɔoןq ǝɥʇ buıʇɐǝH", + "tooltip.anvilcraft.item.heater": "Mʞ 9Ɩ sǝɯnsuoɔ 'ǝʌoqɐ ʞɔoןq ǝɥʇ buıʇɐǝH", "tooltip.anvilcraft.item.heavy_iron_beam": "ɟooɹd uoısoןdxƎ", "tooltip.anvilcraft.item.heavy_iron_block": "ɟooɹd uoısoןdxƎ", "tooltip.anvilcraft.item.heavy_iron_column": "ɟooɹd uoısoןdxƎ", diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json index 1bbc7a040..9a3855b3e 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -351,7 +351,7 @@ "text.autoconfig.anvilcraft.option.powerConverter.powerConverterCountdown": "Power Converter Countdown", "text.autoconfig.anvilcraft.option.powerConverter.powerConverterCountdown.@Tooltip": "The working interval of power converters", "text.autoconfig.anvilcraft.option.powerConverter.powerConverterEfficiency": "Power Converter Efficiency", - "text.autoconfig.anvilcraft.option.powerConverter.powerConverterEfficiency.@Tooltip": "Energy efficiency of energy converters (1 KW => xx FE/t)", + "text.autoconfig.anvilcraft.option.powerConverter.powerConverterEfficiency.@Tooltip": "Energy efficiency of energy converters (1 kW => xx FE/t)", "text.autoconfig.anvilcraft.option.powerConverter.powerConverterLoss": "Power Converter Loss", "text.autoconfig.anvilcraft.option.powerConverter.powerConverterLoss.@Tooltip": "Power loss of energy converters", "text.autoconfig.anvilcraft.option.powerTransmitterRange": "Range of Power Transmitter", @@ -377,7 +377,7 @@ "tooltip.anvilcraft.grid_information.total_generated": " Total Generation: %d", "tooltip.anvilcraft.grid_information.utilization": " Power Utilization: %s", "tooltip.anvilcraft.item.anvil_hammer": "It's a hammer, an anvil, a wrench, goggles, and a mace", - "tooltip.anvilcraft.item.auto_crafter": "consumes 1 KW", + "tooltip.anvilcraft.item.auto_crafter": "consumes 1 kW", "tooltip.anvilcraft.item.charge_collector": "Collecting charges to generate power", "tooltip.anvilcraft.item.crab_claw": "Increase touch distance when holding", "tooltip.anvilcraft.item.crab_trap": "Placing it in the water to help you catch aquatic products", @@ -392,23 +392,23 @@ "tooltip.anvilcraft.item.cut_royal_steel_stairs": "Creeper proof", "tooltip.anvilcraft.item.ferrite_core_magnet_block": "Attracting the anvil below, when pushed and pulled by the piston, causes adjacent copper blocks to generate charges", "tooltip.anvilcraft.item.geode": "Find the surrounding Amethyst Geode when using it", - "tooltip.anvilcraft.item.heater": "Heating the block above, consumes 8 KW", + "tooltip.anvilcraft.item.heater": "Heating the block above, consumes 16 kW", "tooltip.anvilcraft.item.heavy_iron_beam": "Explosion proof", "tooltip.anvilcraft.item.heavy_iron_block": "Explosion proof", "tooltip.anvilcraft.item.heavy_iron_column": "Explosion proof", "tooltip.anvilcraft.item.heavy_iron_plate": "Explosion proof", "tooltip.anvilcraft.item.hollow_magnet_block": "Attracting the anvil below, when pushed and pulled by the piston, causes adjacent copper blocks to generate charges", - "tooltip.anvilcraft.item.induction_light": "Catalyze crop growth, consumes 1 KW", - "tooltip.anvilcraft.item.item_collector": "Adjust power consumption based on range and cooling, from 30KW to 150KW", + "tooltip.anvilcraft.item.induction_light": "Catalyze crop growth, consumes 1 kW", + "tooltip.anvilcraft.item.item_collector": "Adjust power consumption based on range and cooling, from 30kW to 150kW", "tooltip.anvilcraft.item.magnet": "Attract surrounding items when use", "tooltip.anvilcraft.item.magnet_block": "Attracting the anvil below, when pushed and pulled by the piston, causes adjacent copper blocks to generate charges", "tooltip.anvilcraft.item.piezoelectric_crystal": "Charge generated by an anvil fall on it", "tooltip.anvilcraft.item.polished_heavy_iron_block": "Explosion proof", "tooltip.anvilcraft.item.polished_heavy_iron_slab": "Explosion proof", "tooltip.anvilcraft.item.polished_heavy_iron_stairs": "Explosion proof", - "tooltip.anvilcraft.item.power_converter_big": "Convert power into FE, consumes 9 KW", - "tooltip.anvilcraft.item.power_converter_middle": "Convert power into FE, consumes 3 KW", - "tooltip.anvilcraft.item.power_converter_small": "Convert power into FE, consumes 1 KW", + "tooltip.anvilcraft.item.power_converter_big": "Convert power into FE, consumes 9 kW", + "tooltip.anvilcraft.item.power_converter_middle": "Convert power into FE, consumes 3 kW", + "tooltip.anvilcraft.item.power_converter_small": "Convert power into FE, consumes 1 kW", "tooltip.anvilcraft.item.reinforced_concrete": "Creeper proof", "tooltip.anvilcraft.item.remote_transmission_pole": "Build a power grid with a transmission distance of 8", "tooltip.anvilcraft.item.resin_block": "Use to capture friendly or weak hostile creatures LivingEntity", @@ -421,6 +421,6 @@ "tooltip.anvilcraft.item.tempering_glass": "Creeper proof, No tools required on collect", "tooltip.anvilcraft.item.topaz": "Containing the power of lightning", "tooltip.anvilcraft.item.transmission_pole": "Build a power grid with a transmission distance of 8", - "tooltip.anvilcraft.jade.power_information": "Power Grid: %d/%d KW", + "tooltip.anvilcraft.jade.power_information": "Power Grid: %d/%d kW", "tooltip.anvilcraft.ruby_prism.power": "Laser level: %d" } \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/lead_ingot_from_raw_lead.json b/fabric/src/generated/resources/data/anvilcraft/recipes/lead_ingot_from_raw_lead.json index 5a4983d3a..f5d8ad315 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/lead_ingot_from_raw_lead.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/lead_ingot_from_raw_lead.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_lead" diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/silver_ingot_from_raw_silver.json b/fabric/src/generated/resources/data/anvilcraft/recipes/silver_ingot_from_raw_silver.json index 6aa993754..8ef9a9de6 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/silver_ingot_from_raw_silver.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/silver_ingot_from_raw_silver.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_silver" diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/tin_ingot_from_raw_tin.json b/fabric/src/generated/resources/data/anvilcraft/recipes/tin_ingot_from_raw_tin.json index 2e22186a0..7d600753c 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/tin_ingot_from_raw_tin.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/tin_ingot_from_raw_tin.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_tin" diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/titanium_ingot_from_raw_titanium.json b/fabric/src/generated/resources/data/anvilcraft/recipes/titanium_ingot_from_raw_titanium.json index 222db9bb1..515c4325b 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/titanium_ingot_from_raw_titanium.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/titanium_ingot_from_raw_titanium.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_titanium" diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/tungsten_ingot_from_raw_tungsten.json b/fabric/src/generated/resources/data/anvilcraft/recipes/tungsten_ingot_from_raw_tungsten.json index df6638d99..d2dfd8a02 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/tungsten_ingot_from_raw_tungsten.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/tungsten_ingot_from_raw_tungsten.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_tungsten" diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/uranium_ingot_from_raw_uranium.json b/fabric/src/generated/resources/data/anvilcraft/recipes/uranium_ingot_from_raw_uranium.json index d13ae6dc0..053bdb00c 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/uranium_ingot_from_raw_uranium.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/uranium_ingot_from_raw_uranium.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_uranium" diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/zinc_ingot_from_raw_zinc.json b/fabric/src/generated/resources/data/anvilcraft/recipes/zinc_ingot_from_raw_zinc.json index 32fe79862..63adfbdee 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/zinc_ingot_from_raw_zinc.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/zinc_ingot_from_raw_zinc.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_zinc" diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json index eea0e5dec..b56c63499 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -392,7 +392,7 @@ "tooltip.anvilcraft.item.cut_royal_steel_stairs": "ɟooɹd ɹǝdǝǝɹƆ", "tooltip.anvilcraft.item.ferrite_core_magnet_block": "sǝbɹɐɥɔ ǝʇɐɹǝuǝb oʇ sʞɔoןq ɹǝddoɔ ʇuǝɔɐظpɐ sǝsnɐɔ 'uoʇsıd ǝɥʇ ʎq pǝןןnd puɐ pǝɥsnd uǝɥʍ 'ʍoןǝq ןıʌuɐ ǝɥʇ buıʇɔɐɹʇʇⱯ", "tooltip.anvilcraft.item.geode": "ʇı buısn uǝɥʍ ǝpoǝ⅁ ʇsʎɥʇǝɯⱯ buıpunoɹɹns ǝɥʇ puıℲ", - "tooltip.anvilcraft.item.heater": "Mʞ 8 sǝɯnsuoɔ 'ǝʌoqɐ ʞɔoןq ǝɥʇ buıʇɐǝH", + "tooltip.anvilcraft.item.heater": "Mʞ 9Ɩ sǝɯnsuoɔ 'ǝʌoqɐ ʞɔoןq ǝɥʇ buıʇɐǝH", "tooltip.anvilcraft.item.heavy_iron_beam": "ɟooɹd uoısoןdxƎ", "tooltip.anvilcraft.item.heavy_iron_block": "ɟooɹd uoısoןdxƎ", "tooltip.anvilcraft.item.heavy_iron_column": "ɟooɹd uoısoןdxƎ", diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json index 1bbc7a040..9a3855b3e 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -351,7 +351,7 @@ "text.autoconfig.anvilcraft.option.powerConverter.powerConverterCountdown": "Power Converter Countdown", "text.autoconfig.anvilcraft.option.powerConverter.powerConverterCountdown.@Tooltip": "The working interval of power converters", "text.autoconfig.anvilcraft.option.powerConverter.powerConverterEfficiency": "Power Converter Efficiency", - "text.autoconfig.anvilcraft.option.powerConverter.powerConverterEfficiency.@Tooltip": "Energy efficiency of energy converters (1 KW => xx FE/t)", + "text.autoconfig.anvilcraft.option.powerConverter.powerConverterEfficiency.@Tooltip": "Energy efficiency of energy converters (1 kW => xx FE/t)", "text.autoconfig.anvilcraft.option.powerConverter.powerConverterLoss": "Power Converter Loss", "text.autoconfig.anvilcraft.option.powerConverter.powerConverterLoss.@Tooltip": "Power loss of energy converters", "text.autoconfig.anvilcraft.option.powerTransmitterRange": "Range of Power Transmitter", @@ -377,7 +377,7 @@ "tooltip.anvilcraft.grid_information.total_generated": " Total Generation: %d", "tooltip.anvilcraft.grid_information.utilization": " Power Utilization: %s", "tooltip.anvilcraft.item.anvil_hammer": "It's a hammer, an anvil, a wrench, goggles, and a mace", - "tooltip.anvilcraft.item.auto_crafter": "consumes 1 KW", + "tooltip.anvilcraft.item.auto_crafter": "consumes 1 kW", "tooltip.anvilcraft.item.charge_collector": "Collecting charges to generate power", "tooltip.anvilcraft.item.crab_claw": "Increase touch distance when holding", "tooltip.anvilcraft.item.crab_trap": "Placing it in the water to help you catch aquatic products", @@ -392,23 +392,23 @@ "tooltip.anvilcraft.item.cut_royal_steel_stairs": "Creeper proof", "tooltip.anvilcraft.item.ferrite_core_magnet_block": "Attracting the anvil below, when pushed and pulled by the piston, causes adjacent copper blocks to generate charges", "tooltip.anvilcraft.item.geode": "Find the surrounding Amethyst Geode when using it", - "tooltip.anvilcraft.item.heater": "Heating the block above, consumes 8 KW", + "tooltip.anvilcraft.item.heater": "Heating the block above, consumes 16 kW", "tooltip.anvilcraft.item.heavy_iron_beam": "Explosion proof", "tooltip.anvilcraft.item.heavy_iron_block": "Explosion proof", "tooltip.anvilcraft.item.heavy_iron_column": "Explosion proof", "tooltip.anvilcraft.item.heavy_iron_plate": "Explosion proof", "tooltip.anvilcraft.item.hollow_magnet_block": "Attracting the anvil below, when pushed and pulled by the piston, causes adjacent copper blocks to generate charges", - "tooltip.anvilcraft.item.induction_light": "Catalyze crop growth, consumes 1 KW", - "tooltip.anvilcraft.item.item_collector": "Adjust power consumption based on range and cooling, from 30KW to 150KW", + "tooltip.anvilcraft.item.induction_light": "Catalyze crop growth, consumes 1 kW", + "tooltip.anvilcraft.item.item_collector": "Adjust power consumption based on range and cooling, from 30kW to 150kW", "tooltip.anvilcraft.item.magnet": "Attract surrounding items when use", "tooltip.anvilcraft.item.magnet_block": "Attracting the anvil below, when pushed and pulled by the piston, causes adjacent copper blocks to generate charges", "tooltip.anvilcraft.item.piezoelectric_crystal": "Charge generated by an anvil fall on it", "tooltip.anvilcraft.item.polished_heavy_iron_block": "Explosion proof", "tooltip.anvilcraft.item.polished_heavy_iron_slab": "Explosion proof", "tooltip.anvilcraft.item.polished_heavy_iron_stairs": "Explosion proof", - "tooltip.anvilcraft.item.power_converter_big": "Convert power into FE, consumes 9 KW", - "tooltip.anvilcraft.item.power_converter_middle": "Convert power into FE, consumes 3 KW", - "tooltip.anvilcraft.item.power_converter_small": "Convert power into FE, consumes 1 KW", + "tooltip.anvilcraft.item.power_converter_big": "Convert power into FE, consumes 9 kW", + "tooltip.anvilcraft.item.power_converter_middle": "Convert power into FE, consumes 3 kW", + "tooltip.anvilcraft.item.power_converter_small": "Convert power into FE, consumes 1 kW", "tooltip.anvilcraft.item.reinforced_concrete": "Creeper proof", "tooltip.anvilcraft.item.remote_transmission_pole": "Build a power grid with a transmission distance of 8", "tooltip.anvilcraft.item.resin_block": "Use to capture friendly or weak hostile creatures LivingEntity", @@ -421,6 +421,6 @@ "tooltip.anvilcraft.item.tempering_glass": "Creeper proof, No tools required on collect", "tooltip.anvilcraft.item.topaz": "Containing the power of lightning", "tooltip.anvilcraft.item.transmission_pole": "Build a power grid with a transmission distance of 8", - "tooltip.anvilcraft.jade.power_information": "Power Grid: %d/%d KW", + "tooltip.anvilcraft.jade.power_information": "Power Grid: %d/%d kW", "tooltip.anvilcraft.ruby_prism.power": "Laser level: %d" } \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/lead_ingot_from_raw_lead.json b/forge/src/generated/resources/data/anvilcraft/recipes/lead_ingot_from_raw_lead.json index 5a4983d3a..f5d8ad315 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/lead_ingot_from_raw_lead.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/lead_ingot_from_raw_lead.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_lead" diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/silver_ingot_from_raw_silver.json b/forge/src/generated/resources/data/anvilcraft/recipes/silver_ingot_from_raw_silver.json index 6aa993754..8ef9a9de6 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/silver_ingot_from_raw_silver.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/silver_ingot_from_raw_silver.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_silver" diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/tin_ingot_from_raw_tin.json b/forge/src/generated/resources/data/anvilcraft/recipes/tin_ingot_from_raw_tin.json index 2e22186a0..7d600753c 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/tin_ingot_from_raw_tin.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/tin_ingot_from_raw_tin.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_tin" diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/titanium_ingot_from_raw_titanium.json b/forge/src/generated/resources/data/anvilcraft/recipes/titanium_ingot_from_raw_titanium.json index 222db9bb1..515c4325b 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/titanium_ingot_from_raw_titanium.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/titanium_ingot_from_raw_titanium.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_titanium" diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/tungsten_ingot_from_raw_tungsten.json b/forge/src/generated/resources/data/anvilcraft/recipes/tungsten_ingot_from_raw_tungsten.json index df6638d99..d2dfd8a02 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/tungsten_ingot_from_raw_tungsten.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/tungsten_ingot_from_raw_tungsten.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_tungsten" diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/uranium_ingot_from_raw_uranium.json b/forge/src/generated/resources/data/anvilcraft/recipes/uranium_ingot_from_raw_uranium.json index d13ae6dc0..053bdb00c 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/uranium_ingot_from_raw_uranium.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/uranium_ingot_from_raw_uranium.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_uranium" diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/zinc_ingot_from_raw_zinc.json b/forge/src/generated/resources/data/anvilcraft/recipes/zinc_ingot_from_raw_zinc.json index 32fe79862..63adfbdee 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/zinc_ingot_from_raw_zinc.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/zinc_ingot_from_raw_zinc.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "cookingtime": 1000, + "cookingtime": 100, "experience": 1.0, "ingredient": { "item": "anvilcraft:raw_zinc"