Skip to content

Commit 111b1b6

Browse files
committed
Hydrator textures and recipe, kubejs integration
1 parent ad6b74f commit 111b1b6

24 files changed

Lines changed: 124 additions & 7 deletions
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// 1.20.1 2025-08-01T17:01:18.1953659 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-
1e70a2fcc137246a3ed4076adab6a3a9f6f6ede4 assets/refactorycore/lang/en_ud.json
3-
c81b3ac858ab789bacf9decde027bd70dec1a383 assets/refactorycore/lang/en_us.json
1+
// 1.20.1 2025-08-03T14:01:36.5678769 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+
ceecde576046fd115a0a981a11e356b6fde86837 assets/refactorycore/lang/en_ud.json
3+
652a3edc215824a37a6adf713f212b2a10d05b65 assets/refactorycore/lang/en_us.json

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,22 @@
22
"block.gtceu.advanced_primitive_blast_furnace": "ǝɔɐuɹnℲ ʇsɐןᗺ pǝɔuɐʌpⱯ",
33
"block.gtceu.bronze_multiblock_tank": "ʞuɐ⟘ ʞɔoןqıʇןnW ǝzuoɹᗺ",
44
"block.gtceu.bronze_tank_valve": "ǝʌןɐΛ ʞuɐ⟘ ǝzuoɹᗺ",
5-
"block.gtceu.hydrator": "ɹoʇɐɹpʎH",
5+
"block.gtceu.ev_hydrator": "III ɹoʇɐɹpʎH pǝɔuɐʌpⱯ",
6+
"block.gtceu.hv_hydrator": "II ɹoʇɐɹpʎH pǝɔuɐʌpⱯ",
7+
"block.gtceu.iv_hydrator": "ɹoʇɐɹpʎH ǝʇıןƎ",
8+
"block.gtceu.luv_hydrator": "II ɹoʇɐɹpʎH ǝʇıןƎ",
9+
"block.gtceu.lv_hydrator": "ɹoʇɐɹpʎH ɔısɐᗺ",
10+
"block.gtceu.mv_hydrator": "ɹoʇɐɹpʎH pǝɔuɐʌpⱯ",
11+
"block.gtceu.opv_hydrator": "ɹoʇɐɹpʎH ʎɹɐpuǝbǝꞀ",
612
"block.gtceu.steam_blender": "ɹǝpuǝןᗺ ɯɐǝʇS",
713
"block.gtceu.steam_borer": "ɹǝɹoᗺ ɯɐǝʇS",
814
"block.gtceu.steam_large_extractor": "ɹoʇɔɐɹʇxƎ ɯɐǝʇS ǝbɹɐꞀ",
15+
"block.gtceu.uev_hydrator": "II ɹoʇɐɹpʎH ɔıdƎ",
16+
"block.gtceu.uhv_hydrator": "ɹoʇɐɹpʎH ɔıdƎ",
17+
"block.gtceu.uiv_hydrator": "III ɹoʇɐɹpʎH ɔıdƎ",
18+
"block.gtceu.uv_hydrator": "ɹoʇɐɹpʎH ǝʇɐɯıʇן∩",
19+
"block.gtceu.uxv_hydrator": "ΛI ɹoʇɐɹpʎH ɔıdƎ",
20+
"block.gtceu.zpm_hydrator": "III ɹoʇɐɹpʎH ǝʇıןƎ",
921
"gtceu.advanced_primitive_blast_furnace": "buıʇsɐןᗺ pǝɔuɐʌpⱯ",
1022
"gtceu.hydrator": "buıʇɐɹpʎH",
1123
"gtceu.machine.ev_hydrator.tooltip": "suǝʇsıoɯ ʎןʍoןSㄥ§",

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,22 @@
22
"block.gtceu.advanced_primitive_blast_furnace": "Advanced Blast Furnace",
33
"block.gtceu.bronze_multiblock_tank": "Bronze Multiblock Tank",
44
"block.gtceu.bronze_tank_valve": "Bronze Tank Valve",
5-
"block.gtceu.hydrator": "Hydrator",
5+
"block.gtceu.ev_hydrator": "Advanced Hydrator III",
6+
"block.gtceu.hv_hydrator": "Advanced Hydrator II",
7+
"block.gtceu.iv_hydrator": "Elite Hydrator",
8+
"block.gtceu.luv_hydrator": "Elite Hydrator II",
9+
"block.gtceu.lv_hydrator": "Basic Hydrator",
10+
"block.gtceu.mv_hydrator": "Advanced Hydrator",
11+
"block.gtceu.opv_hydrator": "Legendary Hydrator",
612
"block.gtceu.steam_blender": "Steam Blender",
713
"block.gtceu.steam_borer": "Steam Borer",
814
"block.gtceu.steam_large_extractor": "Large Steam Extractor",
15+
"block.gtceu.uev_hydrator": "Epic Hydrator II",
16+
"block.gtceu.uhv_hydrator": "Epic Hydrator",
17+
"block.gtceu.uiv_hydrator": "Epic Hydrator III",
18+
"block.gtceu.uv_hydrator": "Ultimate Hydrator",
19+
"block.gtceu.uxv_hydrator": "Epic Hydrator IV",
20+
"block.gtceu.zpm_hydrator": "Elite Hydrator III",
921
"gtceu.advanced_primitive_blast_furnace": "Advanced Blasting",
1022
"gtceu.hydrator": "Hydrating",
1123
"gtceu.machine.ev_hydrator.tooltip": "§7Slowly moistens",

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,19 @@ public static void init(RegistrateLangProvider provider) {
1515
replace(provider, "block.gtceu.advanced_primitive_blast_furnace", "Advanced Blast Furnace");
1616
replace(provider, "block.gtceu.bronze_multiblock_tank", "Bronze Multiblock Tank");
1717
replace(provider, "block.gtceu.bronze_tank_valve", "Bronze Tank Valve");
18-
replace(provider, "block.gtceu.hydrator", "Hydrator");
18+
replace(provider, "block.gtceu.lv_hydrator", "Basic Hydrator");
19+
replace(provider, "block.gtceu.mv_hydrator", "Advanced Hydrator");
20+
replace(provider, "block.gtceu.hv_hydrator", "Advanced Hydrator II");
21+
replace(provider, "block.gtceu.ev_hydrator", "Advanced Hydrator III");
22+
replace(provider, "block.gtceu.iv_hydrator", "Elite Hydrator");
23+
replace(provider, "block.gtceu.luv_hydrator", "Elite Hydrator II");
24+
replace(provider, "block.gtceu.zpm_hydrator", "Elite Hydrator III");
25+
replace(provider, "block.gtceu.uv_hydrator", "Ultimate Hydrator");
26+
replace(provider, "block.gtceu.uhv_hydrator", "Epic Hydrator");
27+
replace(provider, "block.gtceu.uev_hydrator", "Epic Hydrator II");
28+
replace(provider, "block.gtceu.uiv_hydrator", "Epic Hydrator III");
29+
replace(provider, "block.gtceu.uxv_hydrator", "Epic Hydrator IV");
30+
replace(provider, "block.gtceu.opv_hydrator", "Legendary Hydrator");
1931

2032
// Recipes
2133
replace(provider, "gtceu.advanced_primitive_blast_furnace", "Advanced Blasting");
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.illuminatijoe.refactorycore.data.recipes;
2+
3+
import com.illuminatijoe.refactorycore.machines.ReFactoryMachines;
4+
5+
import com.gregtechceu.gtceu.data.recipe.misc.MetaTileEntityLoader;
6+
7+
import net.minecraft.data.recipes.FinishedRecipe;
8+
9+
import java.util.function.Consumer;
10+
11+
import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.*;
12+
13+
public class ReFactoryCoreMetaTileEntityLoader {
14+
15+
public static void init(Consumer<FinishedRecipe> provider) {
16+
MetaTileEntityLoader.registerMachineRecipe(provider, ReFactoryMachines.HYDRATOR, "GPG", "CHC", "MRM",
17+
'G', GLASS, 'P', PUMP, 'C', CIRCUIT, 'H', HULL, 'M', MOTOR, 'R', ROTOR);
18+
}
19+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ public class ReFactoryCoreRecipes {
1313
public static final int REDUCED_DURATION = (int) (20 * 0.75);
1414

1515
public static void init(Consumer<FinishedRecipe> provider) {
16+
ReFactoryCoreMetaTileEntityLoader.init(provider);
17+
1618
ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES.recipeBuilder("steel_from_coal_gem")
1719
.inputItems(ingot, Iron)
1820
.inputItems(gem, Coal, 2)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.illuminatijoe.refactorycore.forge;
2+
3+
import com.illuminatijoe.refactorycore.ReFactoryCore;
4+
5+
import net.minecraftforge.fml.common.Mod;
6+
7+
@Mod.EventBusSubscriber(modid = ReFactoryCore.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE)
8+
public class ForgeCommonEventListener {
9+
10+
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package com.illuminatijoe.refactorycore.integration.kubejs;
2+
3+
import com.illuminatijoe.refactorycore.ReFactoryCore;
4+
import com.illuminatijoe.refactorycore.data.recipes.ReFactoryCoreRecipeTypes;
5+
import com.illuminatijoe.refactorycore.machines.ReFactoryMachines;
6+
7+
import dev.latvian.mods.kubejs.KubeJSPlugin;
8+
import dev.latvian.mods.kubejs.script.BindingsEvent;
9+
import dev.latvian.mods.kubejs.script.ScriptType;
10+
import dev.latvian.mods.kubejs.util.ClassFilter;
11+
12+
public class ReFactoryCoreKubeJSPlugin extends KubeJSPlugin {
13+
14+
@Override
15+
public void initStartup() {
16+
super.initStartup();
17+
}
18+
19+
@Override
20+
public void init() {
21+
super.init();
22+
}
23+
24+
@Override
25+
public void registerClasses(ScriptType type, ClassFilter filter) {
26+
super.registerClasses(type, filter);
27+
filter.allow("com.illuminatijoe.refactorycore");
28+
}
29+
30+
@Override
31+
public void registerBindings(BindingsEvent event) {
32+
super.registerBindings(event);
33+
event.add("ReFactoryRecipeTypes", ReFactoryCoreRecipeTypes.class);
34+
event.add("ReFactoryMachines", ReFactoryMachines.class);
35+
36+
event.add("ReFactoryCore", ReFactoryCore.class);
37+
}
38+
}

src/main/java/com/illuminatijoe/refactorycore/machines/ReFactoryMachines.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils;
1919
import com.gregtechceu.gtceu.common.registry.GTRegistration;
2020

21-
import it.unimi.dsi.fastutil.Pair;
2221
import net.minecraft.network.chat.Component;
2322

2423
import static com.gregtechceu.gtceu.common.data.GTBlocks.*;
607 Bytes
Loading

0 commit comments

Comments
 (0)