Skip to content

Commit

Permalink
Fix various recipe and item issues (#2077)
Browse files Browse the repository at this point in the history
Co-authored-by: YoungOnion <[email protected]>
  • Loading branch information
JuiceyBeans and YoungOnionMC authored Oct 12, 2024
1 parent 303602b commit b64bf38
Show file tree
Hide file tree
Showing 21 changed files with 470 additions and 478 deletions.
14 changes: 6 additions & 8 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"block.gtceu.blue_studs": "spnʇS ǝnןᗺ",
"block.gtceu.boss_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ssoᗺ",
"block.gtceu.brittle_charcoal": "ןɐoɔɹɐɥƆ ǝןʇʇıɹᗺ",
"block.gtceu.bronze_brick_casing": "buısɐƆ ʞɔıɹᗺ ǝzuoɹᗺ",
"block.gtceu.bronze_brick_casing": "buısɐƆ ǝzuoɹᗺ pǝʞɔıɹᗺ",
"block.gtceu.bronze_crate": "ǝʇɐɹƆ ǝzuoɹᗺ",
"block.gtceu.bronze_drum": "ɯnɹᗡ ǝzuoɹᗺ",
"block.gtceu.bronze_firebox_casing": "buısɐƆ xoqǝɹıℲ ǝzuoɹᗺ",
Expand All @@ -127,10 +127,8 @@
"block.gtceu.brown_large_metal_sheet": "ʇǝǝɥS ןɐʇǝW ǝbɹɐꞀ uʍoɹᗺ",
"block.gtceu.brown_metal_sheet": "ʇǝǝɥS ןɐʇǝW uʍoɹᗺ",
"block.gtceu.brown_studs": "spnʇS uʍoɹᗺ",
"block.gtceu.casing_bronze_bricks": "buısɐƆ ǝuıɥɔɐW ǝzuoɹᗺ",
"block.gtceu.casing_coke_bricks": "sʞɔıɹᗺ uǝʌO ǝʞoƆ",
"block.gtceu.casing_grate": "buısɐƆ ǝuıɥɔɐW ǝʇɐɹ⅁",
"block.gtceu.casing_primitive_bricks": "sʞɔıɹqǝɹıℲ",
"block.gtceu.causality_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ʎʇıןɐsnɐƆ",
"block.gtceu.charcoal_pile_igniter": "ɹǝʇıubI ǝןıԀ ןɐoɔɹɐɥƆ",
"block.gtceu.chiseled_dark_concrete": "ǝʇǝɹɔuoƆ ʞɹɐᗡ pǝןǝsıɥƆ",
Expand Down Expand Up @@ -1117,7 +1115,7 @@
"block.gtceu.steam_output_bus": ")ɯɐǝʇS( snᗺ ʇndʇnO",
"block.gtceu.steam_oven": "uǝʌO ɯɐǝʇS",
"block.gtceu.steam_solid_boiler.bronze": "ɹǝןıoᗺ pıןoS ɯɐǝʇS ןןɐɯS",
"block.gtceu.steel_brick_casing": "buısɐƆ ʞɔıɹᗺ ןǝǝʇS",
"block.gtceu.steel_brick_casing": "buısɐƆ uoɹI ʇɥbnoɹM pǝʞɔıɹᗺ",
"block.gtceu.steel_crate": "ǝʇɐɹƆ ןǝǝʇS",
"block.gtceu.steel_drum": "ɯnɹᗡ ןǝǝʇS",
"block.gtceu.steel_firebox_casing": "buısɐƆ xoqǝɹıℲ ןǝǝʇS",
Expand Down Expand Up @@ -4112,7 +4110,7 @@
"item.gtceu.basic_integrated_circuit.tooltip.0": "ןnɟɹǝʍod ǝɹoɯ puɐ ɹǝןןɐɯSㄥ§",
"item.gtceu.basic_integrated_circuit.tooltip.1": "ʇınɔɹıƆ ɹǝı⟘-ΛꞀ9§",
"item.gtceu.basic_tape": "ǝdɐ⟘",
"item.gtceu.basic_tape.tooltip": "sǝnssı ןɐɔıuɐɥɔǝɯ ɹoɟ ɥbnouǝ buoɹʇs ʇoN",
"item.gtceu.basic_tape.tooltip": "sɯǝʇı ɹıǝɥʇ buıddoɹp ʇnoɥʇıʍ sǝʇɐɹɔ dn ʞɔıd oʇ pǝsn ǝq uɐƆ\nsǝnssı ןɐɔıuɐɥɔǝɯ ɹoɟ ɥbnouǝ buoɹʇs ʇoNㄥ§",
"item.gtceu.battery.charge_detailed.0": ")ㄥ§buıuıɐɯǝɹ %s %s/%sɐ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sɐ§",
"item.gtceu.battery.charge_detailed.1": ")ㄥ§buıuıɐɯǝɹ %s %s/%sǝ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sǝ§",
"item.gtceu.battery.charge_detailed.2": ")ㄥ§buıuıɐɯǝɹ %s %s/%sɔ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sɔ§",
Expand Down Expand Up @@ -4189,7 +4187,6 @@
"item.gtceu.cpu_chip.tooltip": "ʇıu∩ buıssǝɔoɹԀ ןɐɹʇuǝƆㄥ§",
"item.gtceu.cpu_wafer": "ɹǝɟɐM ∩ԀƆ",
"item.gtceu.cpu_wafer.tooltip": "ʇıu∩ buıssǝɔoɹԀ ʍɐᴚㄥ§",
"item.gtceu.crafting_table_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ǝuıɥɔɐW ɐ uo ㄥ§ɥɔuǝqʞɹoM pǝɔuɐʌpⱯɟ§",
"item.gtceu.credit_casting_mold": ")ǝbɐuıoƆ( pןoW buıʇsɐƆ",
"item.gtceu.credit_casting_mold.tooltip": ")¡ʇı ǝsoן ʇ,uoᗡ( suıoƆ buıʞɐɯ ɹoɟ pןoW ǝɹnɔǝSㄥ§",
"item.gtceu.crushed_bentonite_ore": "ǝʇıuoʇuǝᗺ punoɹ⅁",
Expand Down Expand Up @@ -4277,7 +4274,8 @@
"item.gtceu.ev_voltage_coil.tooltip": "ןıoƆ ǝɯǝɹʇxƎ",
"item.gtceu.exquisite_glass_gem": "ןɐʇsʎɹƆ ssɐן⅁ ǝʇısınbxƎ",
"item.gtceu.facade_cover": "ǝpɐɔɐℲ ɹǝʌoƆ %s",
"item.gtceu.facade_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ ʇıɟʇnO ǝʌıʇɐɹoɔǝᗡㄥ§",
"item.gtceu.facade_cover.tooltip.0": "˙ㄥ§ɹǝʌoƆɟ§ ʇıɟʇnO ǝʌıʇɐɹoɔǝᗡㄥ§",
"item.gtceu.facade_cover.tooltip.1": "ʞɔoןq ʎuɐ puɐ sǝʇɐןԀ uoɹI Ɛ buısn pǝʇɟɐɹƆㄥ§",
"item.gtceu.face_mask": "ʞsɐW ǝɔɐℲ",
"item.gtceu.fertilizer": "ɹǝzıןıʇɹǝℲ",
"item.gtceu.fiber_reinforced_circuit_board": "pɹɐoᗺ ʇınɔɹıƆ pǝɔɹoɟuıǝᴚ-ɹǝqıℲ",
Expand Down Expand Up @@ -4819,7 +4817,7 @@
"item.gtceu.storage_cover": "ɹǝʌoƆ ǝbɐɹoʇS",
"item.gtceu.sugar_gem": "ǝqnƆ ɹɐbnS",
"item.gtceu.sus_record": "ɔsıᗡ ɔısnW",
"item.gtceu.sus_record.desc": "¡ʎssns",
"item.gtceu.sus_record.desc": "¡ʎssnsㄥ§",
"item.gtceu.sword_extruder_mold.tooltip": "spɹoʍS buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
"item.gtceu.talc_dust": "ɔןɐ⟘",
"item.gtceu.tantalum_capacitor": "ɹoʇıɔɐdɐƆ ɯnןɐʇuɐ⟘",
Expand Down
14 changes: 6 additions & 8 deletions src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"block.gtceu.blue_studs": "Blue Studs",
"block.gtceu.boss_hazard_sign_block": "Boss Hazard Sign Block",
"block.gtceu.brittle_charcoal": "Brittle Charcoal",
"block.gtceu.bronze_brick_casing": "Bronze Brick Casing",
"block.gtceu.bronze_brick_casing": "Bricked Bronze Casing",
"block.gtceu.bronze_crate": "Bronze Crate",
"block.gtceu.bronze_drum": "Bronze Drum",
"block.gtceu.bronze_firebox_casing": "Bronze Firebox Casing",
Expand All @@ -127,10 +127,8 @@
"block.gtceu.brown_large_metal_sheet": "Brown Large Metal Sheet",
"block.gtceu.brown_metal_sheet": "Brown Metal Sheet",
"block.gtceu.brown_studs": "Brown Studs",
"block.gtceu.casing_bronze_bricks": "Bronze Machine Casing",
"block.gtceu.casing_coke_bricks": "Coke Oven Bricks",
"block.gtceu.casing_grate": "Grate Machine Casing",
"block.gtceu.casing_primitive_bricks": "Firebricks",
"block.gtceu.causality_hazard_sign_block": "Causality Hazard Sign Block",
"block.gtceu.charcoal_pile_igniter": "Charcoal Pile Igniter",
"block.gtceu.chiseled_dark_concrete": "Chiseled Dark Concrete",
Expand Down Expand Up @@ -1117,7 +1115,7 @@
"block.gtceu.steam_output_bus": "Output Bus (Steam)",
"block.gtceu.steam_oven": "Steam Oven",
"block.gtceu.steam_solid_boiler.bronze": "Small Steam Solid Boiler",
"block.gtceu.steel_brick_casing": "Steel Brick Casing",
"block.gtceu.steel_brick_casing": "Bricked Wrought Iron Casing",
"block.gtceu.steel_crate": "Steel Crate",
"block.gtceu.steel_drum": "Steel Drum",
"block.gtceu.steel_firebox_casing": "Steel Firebox Casing",
Expand Down Expand Up @@ -4112,7 +4110,7 @@
"item.gtceu.basic_integrated_circuit.tooltip.0": "§7Smaller and more powerful",
"item.gtceu.basic_integrated_circuit.tooltip.1": "§6LV-Tier Circuit",
"item.gtceu.basic_tape": "Tape",
"item.gtceu.basic_tape.tooltip": "Not strong enough for mechanical issues",
"item.gtceu.basic_tape.tooltip": "§7Not strong enough for mechanical issues\nCan be used to pick up crates without dropping their items",
"item.gtceu.battery.charge_detailed.0": "§a%s/%s EU§7 - Tier %s §7(§a%s/%s %s remaining§7)",
"item.gtceu.battery.charge_detailed.1": "§e%s/%s EU§7 - Tier %s §7(§e%s/%s %s remaining§7)",
"item.gtceu.battery.charge_detailed.2": "§c%s/%s EU§7 - Tier %s §7(§c%s/%s %s remaining§7)",
Expand Down Expand Up @@ -4189,7 +4187,6 @@
"item.gtceu.cpu_chip.tooltip": "§7Central Processing Unit",
"item.gtceu.cpu_wafer": "CPU Wafer",
"item.gtceu.cpu_wafer.tooltip": "§7Raw Processing Unit",
"item.gtceu.crafting_table_cover.tooltip": "§fAdvanced Workbench§7 on a Machine as §fCover§7.",
"item.gtceu.credit_casting_mold": "Casting Mold (Coinage)",
"item.gtceu.credit_casting_mold.tooltip": "§7Secure Mold for making Coins (Don't lose it!)",
"item.gtceu.crushed_bentonite_ore": "Ground Bentonite",
Expand Down Expand Up @@ -4277,7 +4274,8 @@
"item.gtceu.ev_voltage_coil.tooltip": "Extreme Coil",
"item.gtceu.exquisite_glass_gem": "Exquisite Glass Crystal",
"item.gtceu.facade_cover": "%s Cover Facade",
"item.gtceu.facade_cover.tooltip": "§7Decorative Outfit §fCover§7.",
"item.gtceu.facade_cover.tooltip.0": "§7Decorative Outfit §fCover§7.",
"item.gtceu.facade_cover.tooltip.1": "§7Crafted using 3 Iron Plates and any block",
"item.gtceu.face_mask": "Face Mask",
"item.gtceu.fertilizer": "Fertilizer",
"item.gtceu.fiber_reinforced_circuit_board": "Fiber-Reinforced Circuit Board",
Expand Down Expand Up @@ -4819,7 +4817,7 @@
"item.gtceu.storage_cover": "Storage Cover",
"item.gtceu.sugar_gem": "Sugar Cube",
"item.gtceu.sus_record": "Music Disc",
"item.gtceu.sus_record.desc": "sussy!",
"item.gtceu.sus_record.desc": "§7sussy!",
"item.gtceu.sword_extruder_mold.tooltip": "§7Extruder Shape for making Swords",
"item.gtceu.talc_dust": "Talc",
"item.gtceu.tantalum_capacitor": "Tantalum Capacitor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"gtceu:treated_wood_wall_hanging_sign",
"gtceu:treated_wood_pressure_plate",
"gtceu:treated_wood_trapdoor",
"gtceu:treated_wood_stairs"
"gtceu:treated_wood_stairs",
"gtceu:wood_drum",
"gtceu:wood_crate"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ public static void init() {
rock.setIgnored(Deepslate, Blocks.DEEPSLATE);
rock.setIgnored(Basalt, Blocks.BASALT);
block.setIgnored(Sculk, Blocks.SCULK);
block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.LIGHT_CONCRETE.get()));
block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.DARK_CONCRETE.get()));
block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.LIGHT_CONCRETE.get()));

for (TagPrefix prefix : ORES.keySet()) {
TagPrefix.OreType oreType = ORES.get(prefix);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ private static void initCasingLang(RegistrateLangProvider provider) {
replace(provider, "block.gtceu.wire_coil.tooltip_energy_cracking", " §aEnergy Usage: §f%s%%");

// Casings
replace(provider, "block.gtceu.casing_bronze_bricks", "Bronze Machine Casing");
replace(provider, "block.gtceu.casing_primitive_bricks", "Firebricks");
replace(provider, "block.gtceu.bronze_brick_casing", "Bricked Bronze Casing");
replace(provider, "block.gtceu.steel_brick_casing", "Bricked Wrought Iron Casing");
replace(provider, "block.gtceu.heatproof_machine_casing", "Heat Proof Invar Machine Casing");
replace(provider, "block.gtceu.frostproof_machine_casing", "Frost Proof Aluminium Machine Casing");
replace(provider, "block.gtceu.steel_machine_casing", "Solid Steel Machine Casing");
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,9 @@ private static void initItemTooltips(RegistrateLangProvider provider) {
"§7Voids §fItems§7 as §fCover§7.\nActivate with §fSoft Mallet§7 after placement.");
multilineLang(provider, "item.gtceu.advanced_item_voiding_cover.tooltip",
"§7Voids §fItems§7 with amount control as §fCover§7.\nActivate with §fSoft Mallet§7 after placement.");
provider.add("item.gtceu.facade_cover.tooltip", "§7Decorative Outfit §fCover§7.");
multilineLang(provider, "item.gtceu.facade_cover.tooltip",
"§7Decorative Outfit §fCover§7.\n§7Crafted using 3 Iron Plates and any block");
provider.add("item.gtceu.computer_monitor_cover.tooltip", "§7Displays §fData§7 as §fCover§7.");
provider.add("item.gtceu.crafting_table_cover.tooltip", "§fAdvanced Workbench§7 on a Machine as §fCover§7.");
provider.add("item.gtceu.shutter_module_cover.tooltip",
"§fBlocks Transfer§7 through attached Side as §fCover§7.");
multilineLang(provider, "item.gtceu.solar_panel.tooltip",
Expand All @@ -343,8 +343,9 @@ private static void initItemTooltips(RegistrateLangProvider provider) {
multilineLang(provider, "item.gtceu.foam_sprayer.tooltip",
"§7Sprays Construction Foam\nUse on a frame to foam connected frames\nFoam can be colored");
provider.add("item.gtceu.firebrick.tooltip", "§7Heat resistant");
provider.add("item.gtceu.basic_tape.tooltip", "Not strong enough for mechanical issues");
provider.add("item.gtceu.basic_tape.tooltip",
"§7Not strong enough for mechanical issues\nCan be used to pick up crates without dropping their items");

provider.add("item.gtceu.sus_record.desc", "sussy!");
provider.add("item.gtceu.sus_record.desc", "§7sussy!");
}
}
Loading

0 comments on commit b64bf38

Please sign in to comment.