Merge pull request #111 from KalWantsPizza/1.21.1-release-DataGen&FluidInit

RealAntEngineer · web-flow · commit 0404e6b534e6 · 2025-07-20T16:47:16.000+02:00
Datagen for Chemical Synthesis &amp; Electrolysis
diff --git a/src/generated/resources/data/creatingspace/recipe/chemical_synthesis/methane_synthesis.json b/src/generated/resources/data/creatingspace/recipe/chemical_synthesis/methane_synthesis.json
@@ -1,16 +1,19 @@
 {
   "type": "creatingspace:chemical_synthesis",
-  "heatRequirement": "heated",
+  "heat_requirement": "heated",
   "ingredients": [
     {
+      "type": "fluid_stack",
       "amount": 100,
       "fluid": "creatingspace:liquid_co2"
     },
     {
+      "type": "fluid_stack",
       "amount": 286,
       "fluid": "creatingspace:liquid_hydrogen"
     }
   ],
+  "processing_time": 200,
   "results": [
     {
       "amount": 80,
diff --git a/src/generated/resources/data/creatingspace/recipe/mechanical_electrolysis/water_electrolysis.json b/src/generated/resources/data/creatingspace/recipe/mechanical_electrolysis/water_electrolysis.json
@@ -2,18 +2,20 @@
   "type": "creatingspace:mechanical_electrolysis",
   "ingredients": [
     {
+      "type": "fluid_stack",
       "amount": 100,
       "fluid": "minecraft:water"
     }
   ],
+  "processing_time": 200,
   "results": [
-    {
-      "amount": 80,
-      "id": "creatingspace:liquid_oxygen"
-    },
     {
       "amount": 160,
       "id": "creatingspace:liquid_hydrogen"
+    },
+    {
+      "amount": 80,
+      "id": "creatingspace:liquid_oxygen"
     }
   ]
 }
diff --git a/src/main/java/com/rae/creatingspace/content/datagen/CSDatagen.java b/src/main/java/com/rae/creatingspace/content/datagen/CSDatagen.java
@@ -42,6 +42,8 @@ public static void gatherData(GatherDataEvent event) {
 			generator.addProvider(true, new CSMixingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
 			generator.addProvider(true, new CSWashingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
 			generator.addProvider(true, new CSAirLiquefyingRecipeGen(output, lookupProvider));
+			generator.addProvider(true, new CSChemicalSynthesisRecipeGen(output, lookupProvider));
+			generator.addProvider(true, new CSMechanicalElectrolysisRecipeGen(output, lookupProvider));
 
 			// event.getGenerator().addProvider(true, new RegistrateDataProvider(REGISTRATE, CreatingSpace.MODID, event));
 		}
diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSChemicalSynthesisRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSChemicalSynthesisRecipeGen.java
@@ -0,0 +1,49 @@
+package com.rae.creatingspace.content.datagen.recipe;
+
+import com.rae.creatingspace.CreatingSpace;
+import com.rae.creatingspace.content.recipes.chemical_synthesis.ChemicalSynthesisRecipe;
+import com.rae.creatingspace.init.ingameobject.FluidInit;
+import com.rae.creatingspace.init.RecipeInit;
+import com.simibubi.create.api.data.recipe.ProcessingRecipeGen;
+import com.simibubi.create.content.processing.recipe.HeatCondition;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.PackOutput;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.material.Fluids;
+
+import java.util.concurrent.CompletableFuture;
+
+@SuppressWarnings("unused")
+public class CSChemicalSynthesisRecipeGen extends ProcessingRecipeGen<
+        ProcessingRecipeParams,
+        ChemicalSynthesisRecipe,
+        ChemicalSynthesisRecipe.Builder<ChemicalSynthesisRecipe>
+        > {
+
+    public CSChemicalSynthesisRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> lookup) {
+        super(output, lookup, CreatingSpace.MODID);
+    }
+
+    @Override
+    protected IRecipeTypeInfo getRecipeType() {
+        return RecipeInit.CHEMICAL_SYNTHESIS;
+    }
+
+    @Override
+    protected ChemicalSynthesisRecipe.Builder<ChemicalSynthesisRecipe> getBuilder(ResourceLocation id) {
+        return new ChemicalSynthesisRecipe.Builder<>(ChemicalSynthesisRecipe::new, id);
+    }
+
+    {
+        GeneratedRecipe METHANE = create("methane_synthesis", b -> b
+                .require(FluidInit.LIQUID_CO2.get(), 100)
+                .require(FluidInit.LIQUID_HYDROGEN.get(), 286)
+                .output(FluidInit.LIQUID_METHANE.get(), 80)
+                .output(Fluids.WATER, 90)
+                .requiresHeat(HeatCondition.HEATED)
+                .duration(200)
+        );
+    }
+}
diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMechanicalElectrolysisRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMechanicalElectrolysisRecipeGen.java
@@ -0,0 +1,49 @@
+package com.rae.creatingspace.content.datagen.recipe;
+
+import com.rae.creatingspace.CreatingSpace;
+import com.rae.creatingspace.content.recipes.electrolysis.MechanicalElectrolysisRecipe;
+import com.rae.creatingspace.init.ingameobject.FluidInit;
+import com.rae.creatingspace.init.RecipeInit;
+import com.simibubi.create.api.data.recipe.ProcessingRecipeGen;
+import com.simibubi.create.content.processing.recipe.HeatCondition;
+import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;
+
+import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.PackOutput;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.material.Fluids;
+
+import java.util.concurrent.CompletableFuture;
+
+@SuppressWarnings("unused")
+public class CSMechanicalElectrolysisRecipeGen extends ProcessingRecipeGen<
+        ProcessingRecipeParams,
+        MechanicalElectrolysisRecipe,
+        MechanicalElectrolysisRecipe.Builder<MechanicalElectrolysisRecipe>
+        > {
+
+    public CSMechanicalElectrolysisRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> lookup) {
+        super(output, lookup, CreatingSpace.MODID);
+    }
+
+    @Override
+    protected IRecipeTypeInfo getRecipeType() {
+        return RecipeInit.MECHANICAL_ELECTROLYSIS;
+    }
+
+    @Override
+    protected MechanicalElectrolysisRecipe.Builder<MechanicalElectrolysisRecipe> getBuilder(ResourceLocation id) {
+        return new MechanicalElectrolysisRecipe.Builder<>(MechanicalElectrolysisRecipe::new, id);
+    }
+
+    {
+        GeneratedRecipe SPLIT_WATER = create("water_electrolysis", b -> b
+                .require(Fluids.WATER, 100)
+                .output(FluidInit.LIQUID_HYDROGEN.get(), 160)
+                .output(FluidInit.LIQUID_OXYGEN.get(), 80)
+                .requiresHeat(HeatCondition.NONE)
+                .duration(200)
+        );
+    }
+}
diff --git a/src/main/resources/data/creatingspace/recipe/fluids/co2.json b/src/main/resources/data/creatingspace/recipe/fluids/co2.json
diff --git a/src/main/resources/data/creatingspace/recipe/fluids/o2.json b/src/main/resources/data/creatingspace/recipe/fluids/o2.json

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,19 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "creatingspace:chemical_synthesis",`
`3`		`- "heatRequirement": "heated",`
	`3`	`+ "heat_requirement": "heated",`
`4`	`4`	`"ingredients": [`
`5`	`5`	`{`
	`6`	`+ "type": "fluid_stack",`
`6`	`7`	`"amount": 100,`
`7`	`8`	`"fluid": "creatingspace:liquid_co2"`
`8`	`9`	`},`
`9`	`10`	`{`
	`11`	`+ "type": "fluid_stack",`
`10`	`12`	`"amount": 286,`
`11`	`13`	`"fluid": "creatingspace:liquid_hydrogen"`
`12`	`14`	`}`
`13`	`15`	`],`
	`16`	`+ "processing_time": 200,`
`14`	`17`	`"results": [`
`15`	`18`	`{`
`16`	`19`	`"amount": 80,`
Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,20 @@`
`2`	`2`	`"type": "creatingspace:mechanical_electrolysis",`
`3`	`3`	`"ingredients": [`
`4`	`4`	`{`
	`5`	`+ "type": "fluid_stack",`
`5`	`6`	`"amount": 100,`
`6`	`7`	`"fluid": "minecraft:water"`
`7`	`8`	`}`
`8`	`9`	`],`
	`10`	`+ "processing_time": 200,`
`9`	`11`	`"results": [`
`10`		`- {`
`11`		`- "amount": 80,`
`12`		`- "id": "creatingspace:liquid_oxygen"`
`13`		`- },`
`14`	`12`	`{`
`15`	`13`	`"amount": 160,`
`16`	`14`	`"id": "creatingspace:liquid_hydrogen"`
	`15`	`+ },`
	`16`	`+ {`
	`17`	`+ "amount": 80,`
	`18`	`+ "id": "creatingspace:liquid_oxygen"`
`17`	`19`	`}`
`18`	`20`	`]`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ public static void gatherData(GatherDataEvent event) {`
`42`	`42`	`generator.addProvider(true, new CSMixingRecipeGen(output, lookupProvider, CreatingSpace.MODID));`
`43`	`43`	`generator.addProvider(true, new CSWashingRecipeGen(output, lookupProvider, CreatingSpace.MODID));`
`44`	`44`	`generator.addProvider(true, new CSAirLiquefyingRecipeGen(output, lookupProvider));`
	`45`	`+ generator.addProvider(true, new CSChemicalSynthesisRecipeGen(output, lookupProvider));`
	`46`	`+ generator.addProvider(true, new CSMechanicalElectrolysisRecipeGen(output, lookupProvider));`
`45`	`47`
`46`	`48`	`// event.getGenerator().addProvider(true, new RegistrateDataProvider(REGISTRATE, CreatingSpace.MODID, event));`
`47`	`49`	`}`