Skip to content

Commit

Permalink
Merge pull request Anvil-Dev#927 from Gu-ZT/data
Browse files Browse the repository at this point in the history
修改数据生成
  • Loading branch information
Gugle2308 authored Jun 18, 2024
2 parents 73948a6 + a3a158e commit e8c082b
Show file tree
Hide file tree
Showing 22 changed files with 43 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
Expand All @@ -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");
Expand All @@ -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<Item, String> NEED_TOOLTIP_ITEM = Collections.unmodifiableMap(map);
Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -1670,8 +1670,6 @@ public class ModBlocks {
.loot(AbstractMultiplePartBlock::loot)
.properties(p -> p.noOcclusion().strength(4.0F).sound(SoundType.ANVIL).explosionResistance(1200))
.item(AbstractMultiplePartBlockItem<Cube3x3PartHalf>::new)
.model((ctx, provider) -> {
})
.build()
.blockstate((ctx, provider) -> {
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": "8 sǝɯnsuoɔ 'ǝʌoqɐ ʞɔoןq ǝɥʇ buıʇɐǝH",
"tooltip.anvilcraft.item.heater": " 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Ǝ",
Expand Down
18 changes: 9 additions & 9 deletions fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_lead"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_silver"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_tin"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_titanium"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_tungsten"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_uranium"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_zinc"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": "8 sǝɯnsuoɔ 'ǝʌoqɐ ʞɔoןq ǝɥʇ buıʇɐǝH",
"tooltip.anvilcraft.item.heater": " 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Ǝ",
Expand Down
18 changes: 9 additions & 9 deletions forge/src/generated/resources/assets/anvilcraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_lead"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_silver"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_tin"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_titanium"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_tungsten"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_uranium"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 1000,
"cookingtime": 100,
"experience": 1.0,
"ingredient": {
"item": "anvilcraft:raw_zinc"
Expand Down

0 comments on commit e8c082b

Please sign in to comment.