Skip to content

Commit f297d1f

Browse files
VeljkoBogdanVeljkoBogdan
committed
Fixed Advanced Primitive Blast Furnace recipe type lang and parallel amount
1 parent 165d793 commit f297d1f

6 files changed

Lines changed: 171 additions & 9 deletions

File tree

‎src/generated/resources/.cache/db205a33237d33346b5e77cb13e9d44444e87afe‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// 1.20.1 2025-05-08T14:02:29.1926336 Registrate Provider for refactorycore [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider]
2-
cc5bf06c285b515377fefbb6cda3b78796b59e78 assets/refactorycore/lang/en_ud.json
3-
0334c12e6c54013914d888e7e295a15b3dde0b93 assets/refactorycore/lang/en_us.json
1+
// 1.20.1 2025-05-08T14:52:43.8131575 Registrate Provider for refactorycore [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider]
2+
15055cd378f5e48ffbbd4ec27a3d5659c38f6558 assets/refactorycore/lang/en_ud.json
3+
a6b44c1b7632cec772869a367d2039f822f92fff assets/refactorycore/lang/en_us.json

‎src/generated/resources/assets/refactorycore/lang/en_ud.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
2-
"block.gtceu.advanced_primitive_blast_furnace": "ǝɔɐuɹnℲ ʇsɐןᗺ ǝʌıʇıɯıɹԀ pǝɔuɐʌpⱯ",
2+
"block.gtceu.advanced_primitive_blast_furnace": "ǝɔɐuɹnℲ ʇsɐןᗺ pǝɔuɐʌpⱯ",
33
"block.gtceu.steam_blender": "ɹǝpuǝןᗺ ɯɐǝʇS",
44
"block.gtceu.steam_borer": "ɹǝɹoᗺ ɯɐǝʇS",
55
"block.gtceu.steam_large_extractor": "ɹoʇɔɐɹʇxƎ ɯɐǝʇS ǝbɹɐꞀ",
6+
"gtceu.advanced_primitive_blast_furnace": "buıʇsɐןᗺ pǝɔuɐʌpⱯ",
67
"tooltip.gtceu.advanced_primitive_blast_furnace.0": "ǝɔɐuɹnℲ ʇsɐןᗺ ǝʌıʇıɯıɹԀ ǝɥʇ uɐɥʇ ɹǝʇsɐɟ ɥɔnWㄥ§",
78
"tooltip.gtceu.advanced_primitive_blast_furnace.1": "ןǝǝʇs ǝɔnpoɹd oʇ ןɐoɔɹɐɥɔ puɐ ןɐoɔ ɟo ǝsn sʍoןןⱯㄥ§",
89
"tooltip.gtceu.advanced_primitive_blast_furnace.2": "ןǝןןɐɹɐd uı sǝdıɔǝɹ ㄣ oʇ dn sǝssǝɔoɹԀㄥ§",

‎src/generated/resources/assets/refactorycore/lang/en_us.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
2-
"block.gtceu.advanced_primitive_blast_furnace": "Advanced Primitive Blast Furnace",
2+
"block.gtceu.advanced_primitive_blast_furnace": "Advanced Blast Furnace",
33
"block.gtceu.steam_blender": "Steam Blender",
44
"block.gtceu.steam_borer": "Steam Borer",
55
"block.gtceu.steam_large_extractor": "Large Steam Extractor",
6+
"gtceu.advanced_primitive_blast_furnace": "Advanced Blasting",
67
"tooltip.gtceu.advanced_primitive_blast_furnace.0": "§7Much faster than the Primitive Blast Furnace",
78
"tooltip.gtceu.advanced_primitive_blast_furnace.1": "§7Allows use of coal and charcoal to produce steel",
89
"tooltip.gtceu.advanced_primitive_blast_furnace.2": "§7Processes up to 4 recipes in parallel",

‎src/main/java/com/illuminatijoe/refactorycore/data/datagen/ReFactoryLangGen.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ public static void init(RegistrateLangProvider provider) {
1010
replace(provider, "block.gtceu.steam_blender", "Steam Blender");
1111
replace(provider, "block.gtceu.steam_borer", "Steam Borer");
1212
replace(provider, "block.gtceu.steam_large_extractor", "Large Steam Extractor");
13-
replace(provider, "block.gtceu.advanced_primitive_blast_furnace", "Advanced Primitive Blast Furnace");
13+
replace(provider, "block.gtceu.advanced_primitive_blast_furnace", "Advanced Blast Furnace");
14+
15+
replace(provider, "gtceu.advanced_primitive_blast_furnace", "Advanced Blasting");
1416

1517
replace(provider, "tooltip.gtceu.steam_blender.0", "Steam multiblock mixer");
1618
replace(provider, "tooltip.gtceu.steam_blender.1", "§7Processes up to 8 recipes in parallel");

‎src/main/java/com/illuminatijoe/refactorycore/data/recipes/ReFactoryCoreRecipes.java‎

Lines changed: 154 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,160 @@
44

55
import java.util.function.Consumer;
66

7+
import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*;
8+
import static com.gregtechceu.gtceu.common.data.GTMaterials.*;
9+
import static com.illuminatijoe.refactorycore.data.recipes.ReFactoryCoreRecipeTypes.ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES;
10+
711
public class ReFactoryCoreRecipes {
812

9-
public static void init(Consumer<FinishedRecipe> provider) {}
13+
public static final int REDUCED_DURATION = (int) (20 * 0.75);
14+
15+
public static void init(Consumer<FinishedRecipe> provider) {
16+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coal_gem")
17+
.inputItems(ingot, Iron)
18+
.inputItems(gem, Coal, 2)
19+
.outputItems(ingot, Steel)
20+
.outputItems(dustTiny, DarkAsh, 2)
21+
.duration(90 * REDUCED_DURATION)
22+
.save(provider);
23+
24+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coal_dust")
25+
.inputItems(ingot, Iron)
26+
.inputItems(dust, Coal, 2)
27+
.outputItems(ingot, Steel)
28+
.outputItems(dustTiny, DarkAsh, 2)
29+
.duration(90 * REDUCED_DURATION)
30+
.save(provider);
31+
32+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_charcoal_gem")
33+
.inputItems(ingot, Iron)
34+
.inputItems(gem, Charcoal, 2)
35+
.outputItems(ingot, Steel)
36+
.outputItems(dustTiny, DarkAsh, 2)
37+
.duration(90 * REDUCED_DURATION)
38+
.save(provider);
39+
40+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_charcoal_dust")
41+
.inputItems(ingot, Iron)
42+
.inputItems(dust, Charcoal, 2)
43+
.outputItems(ingot, Steel)
44+
.outputItems(dustTiny, DarkAsh, 2)
45+
.duration(120 * REDUCED_DURATION)
46+
.save(provider);
47+
48+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coke_gem")
49+
.inputItems(ingot, Iron)
50+
.inputItems(gem, Coke)
51+
.outputItems(ingot, Steel)
52+
.chancedOutput(dust, Ash, "1/9", 0)
53+
.duration(50 * REDUCED_DURATION)
54+
.save(provider);
55+
56+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coke_dust")
57+
.inputItems(ingot, Iron)
58+
.inputItems(dust, Coke)
59+
.outputItems(ingot, Steel)
60+
.chancedOutput(dust, Ash, "1/9", 0)
61+
.duration(50 * REDUCED_DURATION)
62+
.save(provider);
63+
64+
// Block variants
65+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coal_block")
66+
.inputItems(block, Iron)
67+
.inputItems(block, Coal, 2)
68+
.outputItems(block, Steel)
69+
.outputItems(dust, DarkAsh, 2)
70+
.duration(810 * REDUCED_DURATION)
71+
.save(provider);
72+
73+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_charcoal_block")
74+
.inputItems(block, Iron)
75+
.inputItems(block, Charcoal, 2)
76+
.outputItems(block, Steel)
77+
.outputItems(dust, DarkAsh, 2)
78+
.duration(810 * REDUCED_DURATION)
79+
.save(provider);
80+
81+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coke_block")
82+
.inputItems(block, Iron)
83+
.inputItems(block, Coke)
84+
.outputItems(block, Steel)
85+
.outputItems(dust, Ash)
86+
.duration(450 * REDUCED_DURATION)
87+
.save(provider);
88+
89+
// Wrought Iron variants
90+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coal_gem_wrought")
91+
.inputItems(ingot, WroughtIron)
92+
.inputItems(gem, Coal, 2)
93+
.outputItems(ingot, Steel)
94+
.outputItems(dustTiny, DarkAsh, 2)
95+
.duration(40 * REDUCED_DURATION)
96+
.save(provider);
97+
98+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coal_dust_wrought")
99+
.inputItems(ingot, WroughtIron)
100+
.inputItems(dust, Coal, 2)
101+
.outputItems(ingot, Steel)
102+
.outputItems(dustTiny, DarkAsh, 2)
103+
.duration(40 * REDUCED_DURATION)
104+
.save(provider);
105+
106+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_charcoal_gem_wrought")
107+
.inputItems(ingot, WroughtIron)
108+
.inputItems(gem, Charcoal, 2)
109+
.outputItems(ingot, Steel)
110+
.outputItems(dustTiny, DarkAsh, 2)
111+
.duration(40 * REDUCED_DURATION)
112+
.save(provider);
113+
114+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_charcoal_dust_wrought")
115+
.inputItems(ingot, WroughtIron)
116+
.inputItems(dust, Charcoal, 2)
117+
.outputItems(ingot, Steel)
118+
.outputItems(dustTiny, DarkAsh, 2)
119+
.duration(40 * REDUCED_DURATION)
120+
.save(provider);
121+
122+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coke_gem_wrought")
123+
.inputItems(ingot, WroughtIron)
124+
.inputItems(gem, Coke)
125+
.outputItems(ingot, Steel)
126+
.chancedOutput(dust, Ash, "1/9", 0)
127+
.duration(20 * REDUCED_DURATION)
128+
.save(provider);
129+
130+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coke_dust_wrought")
131+
.inputItems(ingot, WroughtIron)
132+
.inputItems(dust, Coke)
133+
.outputItems(ingot, Steel)
134+
.chancedOutput(dust, Ash, "1/9", 0)
135+
.duration(20 * REDUCED_DURATION)
136+
.save(provider);
137+
138+
// Wrought Iron block variants
139+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coal_block_wrought")
140+
.inputItems(block, WroughtIron)
141+
.inputItems(block, Coal, 2)
142+
.outputItems(block, Steel)
143+
.outputItems(dust, DarkAsh, 2)
144+
.duration(360 * REDUCED_DURATION)
145+
.save(provider);
146+
147+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_charcoal_block_wrought")
148+
.inputItems(block, WroughtIron)
149+
.inputItems(block, Charcoal, 2)
150+
.outputItems(block, Steel)
151+
.outputItems(dust, DarkAsh, 2)
152+
.duration(360 * REDUCED_DURATION)
153+
.save(provider);
154+
155+
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coke_block_wrought")
156+
.inputItems(block, WroughtIron)
157+
.inputItems(block, Coke)
158+
.outputItems(block, Steel)
159+
.outputItems(dust, Ash)
160+
.duration(180 * REDUCED_DURATION)
161+
.save(provider);
162+
}
10163
}

‎src/main/java/com/illuminatijoe/refactorycore/machines/multiblock/other/APBFMachine.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ public void addDisplayText(List<Component> textList) {
7272
textList.add(Component.translatable("gtceu.multiblock.running"));
7373
int currentProgress = (int) (recipeLogic.getProgressPercent() * 100);
7474
textList.add(Component.translatable("gtceu.multiblock.parallel", MAX_PARALLELS));
75-
textList.add(Component.translatable("gtceu.multiblock.progress", currentProgress));
75+
double currentInSec = recipeLogic.getProgress() / 20.0;
76+
double maxInSec = recipeLogic.getMaxProgress() / 20.0;
77+
textList.add(Component.translatable("gtceu.multiblock.progress",
78+
String.format("%.2f", (float) currentInSec),
79+
String.format("%.2f", (float) maxInSec),
80+
currentProgress));
7681
} else {
7782
textList.add(Component.translatable("gtceu.multiblock.idling"));
7883
}
@@ -120,7 +125,7 @@ public void clientTick() {
120125
public static ModifierFunction recipeModifier(@NotNull MetaMachine machine, @NotNull GTRecipe recipe) {
121126
if (RecipeHelper.getRecipeEUtTier(recipe) > GTValues.LV) return ModifierFunction.NULL;
122127
long euTick = RecipeHelper.getRecipeEUtTier(recipe);
123-
int parallel = ParallelLogic.getParallelAmount(machine, recipe, 8);
128+
int parallel = ParallelLogic.getParallelAmount(machine, recipe, MAX_PARALLELS);
124129
return ModifierFunction.builder()
125130
.inputModifier(ContentModifier.multiplier(parallel))
126131
.outputModifier(ContentModifier.multiplier(parallel))

0 commit comments

Comments
 (0)