Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COIL TIER is now listed on a new line in recipeviewers #1241

Merged
merged 3 commits into from
May 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
],
"page": "gtceu:generation/stone",
"position": [
-100,
-200,
50
],
"pre_nodes": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"page": "gtceu:materials/chainsaw_head",
"position": [
-350,
-300,
250
],
"section": "gtceu:materials"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"page": "gtceu:materials/screwdriver_tip",
"position": [
-150,
-100,
100
],
"section": "gtceu:materials"
Expand Down
7 changes: 2 additions & 5 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -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ᗡ",
Expand All @@ -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",
Expand Down Expand Up @@ -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ɹʇɔǝןƎ",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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Ὁ",
Expand Down
7 changes: 2 additions & 5 deletions src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Ghostipedia marked this conversation as resolved.
Show resolved Hide resolved
}
})
.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()));
Ghostipedia marked this conversation as resolved.
Show resolved Hide resolved
}
})
.setUiBuilder((recipe, widgetGroup) -> {
int temp = recipe.data.getInt("ebf_temp");
List<List<ItemStack>> items = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading