diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json index d4f2f00875..8728269bd9 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json @@ -117,7 +117,7 @@ ], "page": "gtceu:generation/stone", "position": [ - -100, + -200, 50 ], "pre_nodes": [ diff --git a/src/generated/resources/assets/gtceu/compass/nodes/materials/chainsaw_head.json b/src/generated/resources/assets/gtceu/compass/nodes/materials/chainsaw_head.json index 85a77e08aa..f0714fb296 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/materials/chainsaw_head.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/materials/chainsaw_head.json @@ -5,7 +5,7 @@ }, "page": "gtceu:materials/chainsaw_head", "position": [ - -350, + -300, 250 ], "section": "gtceu:materials" diff --git a/src/generated/resources/assets/gtceu/compass/nodes/materials/screwdriver_tip.json b/src/generated/resources/assets/gtceu/compass/nodes/materials/screwdriver_tip.json index 482dbce4f6..0e2be18919 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/materials/screwdriver_tip.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/materials/screwdriver_tip.json @@ -5,7 +5,7 @@ }, "page": "gtceu:materials/screwdriver_tip", "position": [ - -150, + -100, 100 ], "section": "gtceu:materials" diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 3fee504bce..3b67250bf0 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -3439,6 +3439,7 @@ "gtceu.recipe.cleanroom": "%s sǝɹınbǝᴚ", "gtceu.recipe.cleanroom.display_name": "ɯooɹuɐǝןƆ", "gtceu.recipe.cleanroom_sterile.display_name": "ɯooɹuɐǝןƆ ǝןıɹǝʇS", + "gtceu.recipe.coil.tier": "%s :ןıoƆ", "gtceu.recipe.computation_per_tick": "ʇ/∩MƆ %s :uoıʇɐʇndɯoƆ ˙uıW", "gtceu.recipe.dimensions": "%s :suoısuǝɯıᗡ", "gtceu.recipe.duration": "sɔǝs %s :uoıʇɐɹnᗡ", @@ -3450,8 +3451,7 @@ "gtceu.recipe.not_consumed": "ssǝɔoɹd ǝɥʇ uı pǝɯnsuoɔ ʇǝb ʇou sǝoᗡ", "gtceu.recipe.research": "ɥɔɹɐǝsǝᴚ sǝɹınbǝᴚ", "gtceu.recipe.scan_for_research": "ǝuıꞀ ʎןqɯǝssⱯ ɹoɟ uɐɔS", - "gtceu.recipe.temperature": "ʞ%s :ǝɹnʇɐɹǝdɯǝ⟘", - "gtceu.recipe.temperature_and_coil": ")%s( ʞ%s :˙dɯǝ⟘", + "gtceu.recipe.temperature": "ʞ%s :dɯǝ⟘", "gtceu.recipe.total": "∩Ǝ %s :ןɐʇo⟘", "gtceu.recipe_logic.condition_fails": "sןıɐℲ uoıʇıpuoƆ", "gtceu.recipe_logic.insufficient_fuel": "ןǝnℲ ʇuǝıɔıɟɟnsuI", @@ -4752,7 +4752,6 @@ "material.gtceu.dubnium": "ɯnıuqnᗡ", "material.gtceu.duranium": "ɯnıuɐɹnᗡ", "material.gtceu.dysprosium": "ɯnısoɹdsʎᗡ", - "material.gtceu.echo": "oɥɔƎ", "material.gtceu.einsteinium": "ɯnıuıǝʇsuıƎ", "material.gtceu.electrotine": "ǝuıʇoɹʇɔǝןƎ", "material.gtceu.electrum": "ɯnɹʇɔǝןƎ", @@ -4952,7 +4951,6 @@ "material.gtceu.nether_air": "ɹıⱯ ɹǝɥʇǝN", "material.gtceu.nether_quartz": "zʇɹɐnὉ ɹǝɥʇǝN", "material.gtceu.nether_star": "ɹɐʇS ɹǝɥʇǝN", - "material.gtceu.netherite": "ǝʇıɹǝɥʇǝN", "material.gtceu.netherrack": "ʞɔɐɹɹǝɥʇǝN", "material.gtceu.neutronium": "ɯnıuoɹʇnǝN", "material.gtceu.nichrome": "ǝɯoɹɥɔıN", @@ -5035,7 +5033,6 @@ "material.gtceu.pyrochlore": "ǝɹoןɥɔoɹʎԀ", "material.gtceu.pyrolusite": "ǝʇısnןoɹʎԀ", "material.gtceu.pyrope": "ǝdoɹʎԀ", - "material.gtceu.quantum_echo": "oɥɔƎ ɯnʇuɐnὉ", "material.gtceu.quartz_sand": "puɐS zʇɹɐnὉ", "material.gtceu.quartzite": "ǝʇızʇɹɐnὉ", "material.gtceu.quicklime": "ǝɯıןʞɔınὉ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 6a211c3b10..60dc33d260 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -3439,6 +3439,7 @@ "gtceu.recipe.cleanroom": "Requires %s", "gtceu.recipe.cleanroom.display_name": "Cleanroom", "gtceu.recipe.cleanroom_sterile.display_name": "Sterile Cleanroom", + "gtceu.recipe.coil.tier": "Coil: %s", "gtceu.recipe.computation_per_tick": "Min. Computation: %s CWU/t", "gtceu.recipe.dimensions": "Dimensions: %s", "gtceu.recipe.duration": "Duration: %s secs", @@ -3450,8 +3451,7 @@ "gtceu.recipe.not_consumed": "Does not get consumed in the process", "gtceu.recipe.research": "Requires Research", "gtceu.recipe.scan_for_research": "Scan for Assembly Line", - "gtceu.recipe.temperature": "Temperature: %sK", - "gtceu.recipe.temperature_and_coil": "Temp.: %sK (%s)", + "gtceu.recipe.temperature": "Temp: %sK", "gtceu.recipe.total": "Total: %s EU", "gtceu.recipe_logic.condition_fails": "Condition Fails", "gtceu.recipe_logic.insufficient_fuel": "Insufficient Fuel", @@ -4752,7 +4752,6 @@ "material.gtceu.dubnium": "Dubnium", "material.gtceu.duranium": "Duranium", "material.gtceu.dysprosium": "Dysprosium", - "material.gtceu.echo": "Echo", "material.gtceu.einsteinium": "Einsteinium", "material.gtceu.electrotine": "Electrotine", "material.gtceu.electrum": "Electrum", @@ -4952,7 +4951,6 @@ "material.gtceu.nether_air": "Nether Air", "material.gtceu.nether_quartz": "Nether Quartz", "material.gtceu.nether_star": "Nether Star", - "material.gtceu.netherite": "Netherite", "material.gtceu.netherrack": "Netherrack", "material.gtceu.neutronium": "Neutronium", "material.gtceu.nichrome": "Nichrome", @@ -5035,7 +5033,6 @@ "material.gtceu.pyrochlore": "Pyrochlore", "material.gtceu.pyrolusite": "Pyrolusite", "material.gtceu.pyrope": "Pyrope", - "material.gtceu.quantum_echo": "Quantum Echo", "material.gtceu.quartz_sand": "Quartz Sand", "material.gtceu.quartzite": "Quartzite", "material.gtceu.quicklime": "Quicklime", diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java index 38b8bc4512..d75568739c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java @@ -456,11 +456,21 @@ public class GTRecipeTypes { ICoilType requiredCoil = ICoilType.getMinRequiredType(temp); if (requiredCoil == null || requiredCoil.getMaterial() == null) { - return LocalizationUtils.format("gtceu.recipe.temperature", temp); + return LocalizationUtils.format("gtceu.recipe.temperature"); } else { - return LocalizationUtils.format("gtceu.recipe.temperature_and_coil", temp, I18n.get(requiredCoil.getMaterial().getUnlocalizedName())); + return LocalizationUtils.format("gtceu.recipe.temperature", temp); } }) + .addDataInfo(data -> { + int temp = data.getInt("ebf_temp"); + ICoilType requiredCoil = ICoilType.getMinRequiredType(temp); + + if (requiredCoil == null || requiredCoil.getMaterial() == null) { + return LocalizationUtils.format("gtceu.recipe.coil.tier"); + } else { + return LocalizationUtils.format("gtceu.recipe.coil.tier", I18n.get(requiredCoil.getMaterial().getUnlocalizedName())); + } + }) .setUiBuilder((recipe, widgetGroup) -> { int temp = recipe.data.getInt("ebf_temp"); List> items = new ArrayList<>(); diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java index 27b445fc2a..9dc9112ee4 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java @@ -775,8 +775,8 @@ public static void init(RegistrateLangProvider provider) { provider.add("gtceu.recipe.amperage", "Amperage: %s"); provider.add("gtceu.recipe.not_consumed", "Does not get consumed in the process"); provider.add("gtceu.recipe.chance", "Chance: %s +%s/tier"); - provider.add("gtceu.recipe.temperature", "Temperature: %sK"); - provider.add("gtceu.recipe.temperature_and_coil", "Temp.: %sK (%s)"); + provider.add("gtceu.recipe.temperature", "Temp: %sK"); + provider.add("gtceu.recipe.coil.tier", "Coil: %s"); provider.add("gtceu.recipe.explosive", "Explosive: %s"); provider.add("gtceu.recipe.eu_to_start", "Energy To Start: %sEU"); provider.add("gtceu.recipe.dimensions", "Dimensions: %s");