Skip to content

REGISTRATE & Datagen Part 2 #108

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.

Sign up for GitHub

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

Merged
RealAntEngineer merged 2 commits into from
Jul 3, 2025
Merged

REGISTRATE & Datagen Part 2 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
761266e
REGISTRATE & Datagen Part 2
KalWantsPizza Jul 1, 2025
c7f8c59
Merge branch '1.21.1-release' into 1.21.1-release-DataGen&FluidInit
RealAntEngineer Jul 3, 2025
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
7 changes: 4 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ mod_license=MIT
mod_version=1.21.1_1.7.10


create_version = 6.0.6-97
flywheel_version = 1.0.2
ponder_version = 1.0.46
create_version = 6.0.6-98
flywheel_version = 1.0.4
ponder_version = 1.0.56

registrate_version = MC1.21-1.3.0+62
jei_version=19.10.0.126

Expand Down
12 changes: 7 additions & 5 deletions src/main/java/com/rae/creatingspace/content/datagen/CSDatagen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
import com.google.gson.JsonObject;
import com.rae.creatingspace.CreatingSpace;

import com.rae.creatingspace.content.datagen.recipe.CSPressingRecipeGen;
import com.rae.creatingspace.content.datagen.recipe.CSStandardRecipeGen;
import com.rae.creatingspace.content.datagen.recipe.*;
import com.simibubi.create.foundation.utility.FilesHelper;
import com.tterrag.registrate.providers.ProviderType;
import com.tterrag.registrate.providers.RegistrateDataProvider;
Expand Down Expand Up @@ -47,10 +46,13 @@ public static void gatherData(GatherDataEvent event) {
// AllOreFeatureConfigEntries.gatherData(event);

//CS Recipes
generator.addProvider(true, new CSStandardRecipeGen(output, lookupProvider));
generator.addProvider(true, new CSPressingRecipeGen(output, lookupProvider));
//generator.addProvider(true, new CSStandardRecipeGen(output, lookupProvider));
generator.addProvider(true, new CSPressingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
generator.addProvider(true, new CSCrushingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
generator.addProvider(true, new CSMixingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
generator.addProvider(true, new CSWashingRecipeGen(output, lookupProvider, CreatingSpace.MODID));

event.getGenerator().addProvider(true, REGISTRATE.setDataProvider(new RegistrateDataProvider(REGISTRATE, CreatingSpace.MODID, event)));
event.getGenerator().addProvider(true, new RegistrateDataProvider(REGISTRATE, CreatingSpace.MODID, event));
}
}

Expand Down
64 changes: 0 additions & 64 deletions src/main/java/com/rae/creatingspace/content/datagen/CSMetalSets.java
View file
Open in desktop

This file was deleted.

54 changes: 54 additions & 0 deletions src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCrushingRecipeGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package com.rae.creatingspace.content.datagen.recipe;

import com.rae.creatingspace.CreatingSpace;
import com.rae.creatingspace.init.ingameobject.BlockInit;
import com.rae.creatingspace.init.ingameobject.ItemInit;
import com.simibubi.create.api.data.recipe.CrushingRecipeGen;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.world.item.Items;

import java.util.concurrent.CompletableFuture;

import static com.simibubi.create.AllTags.commonItemTag;

@SuppressWarnings("unused")
public class CSCrushingRecipeGen extends CrushingRecipeGen {
public CSCrushingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, String defaultNamespace) {
super(output, registries, CreatingSpace.MODID);
}

GeneratedRecipe

COAL_DUST = create("coal_dust", b -> b
.duration(400)
.require(Items.COAL)
.output(ItemInit.COAL_DUST, 2)),

NICKEL_DUST = create("nickel_dust", b -> b
.duration(400)
.require(commonItemTag("ingots/nickel"))
.output(ItemInit.NICKEL_DUST, 2)
.output(0.5F, ItemInit.NICKEL_DUST, 1)),

MOON_REGOLITH = create("moon_stone", b -> b
.duration(400)
.require(BlockInit.MOON_STONE)
.output(BlockInit.MOON_REGOLITH, 1)),

MARS_REGOLITH = create("mars_stone", b -> b
.duration(400)
.require(BlockInit.MARS_STONE)
.output(BlockInit.MARS_REGOLITH, 1)),

NICKEL_ORE = stoneOre(() -> BlockInit.NICKEL_ORE, ItemInit.CRUSHED_NICKEL_ORE::get, 1.75f, 400),
DEEPSLATE_NICKEL_ORE = deepslateOre(() -> BlockInit.DEEPSLATE_NICKEL_ORE, ItemInit.CRUSHED_NICKEL_ORE::get, 2.25f, 400),
ALUMINUM_ORE = ore(() -> BlockInit.MOON_STONE.asItem(), BlockInit.MOON_ALUMINUM_ORE::get, ItemInit.CRUSHED_ALUMINUM_ORE::get, 1.75f, 400),
COBALT_ORE = ore(() -> BlockInit.MOON_STONE.asItem(), BlockInit.MOON_COBALT_ORE::get, ItemInit.CRUSHED_COBALT_ORE::get, 1.75f, 400),
RAW_NICKEL_ORE = rawOre("nickel", () -> commonItemTag("raw_materials/nickel"), ItemInit.CRUSHED_NICKEL_ORE::get, 1),
RAW_ALUMINUM_ORE = rawOre("aluminum", () -> commonItemTag("raw_materials/aluminum"), ItemInit.CRUSHED_ALUMINUM_ORE::get, 1),
RAW_COBALT_ORE = rawOre("cobalt", () -> commonItemTag("raw_materials/cobalt"), ItemInit.CRUSHED_COBALT_ORE::get, 1),
RAW_NICKEL_BLOCK = rawOreBlock("nickel", () -> commonItemTag("storage_blocks/raw_nickel"), ItemInit.CRUSHED_NICKEL_ORE::get, 1),
RAW_ALUMINUM_BLOCK = rawOreBlock("aluminum", () -> commonItemTag("storage_blocks/raw_aluminum"), ItemInit.CRUSHED_ALUMINUM_ORE::get, 1),
RAW_COBALT_BLOCK = rawOreBlock("cobalt", () -> commonItemTag("storage_blocks/raw_cobalt"), ItemInit.CRUSHED_COBALT_ORE::get, 1);
}
58 changes: 58 additions & 0 deletions src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCuttingRecipeGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package com.rae.creatingspace.content.datagen.recipe;

import com.rae.creatingspace.CreatingSpace;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.api.data.recipe.CuttingRecipeGen;
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.data.PackOutput;
import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.ItemLike;

import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;

import static com.rae.creatingspace.CreatingSpace.resource;
import static com.simibubi.create.AllTags.commonItemTag;

@SuppressWarnings("unused")
public class CSCuttingRecipeGen extends CuttingRecipeGen {
public CSCuttingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, String defaultNamespace) {
super(output, registries, CreatingSpace.MODID);

GeneratedRecipe

ANDESITE_ENGINE_WALL = create(AllItems.ANDESITE_ALLOY::get, b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("andesite_engine_wall")))),
COPPER_ENGINE_WALL = create(Items.COPPER_INGOT::asItem,b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("copper_engine_wall")))),
IRON_ENGINE_WALL = create(Items.IRON_INGOT::asItem,b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("iron_engine_wall")))),
BRASS_ENGINE_WALL = create(AllItems.BRASS_SHEET::get,b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("brass_engine_wall")))),
REINFORCED_COPPER_ENGINE_WALL = create("reinforced_copper_sheet", b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("reinforced_copper_engine_wall")))),
COPRONICKEL_ENGINE_WALL = create("copronickel_sheet", b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("copronickel_engine_wall")))),
MONEL_ENGINE_WALL = create("monel_sheet", b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("monel_engine_wall")))),
INCONEL_ENGINE_WALL = create("inconel_sheet", b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("inconel_engine_wall")))),
HASTELLOY_ENGINE_WALL = create("hastelloy_sheet", b -> b
.duration(100)
.output(BuiltInRegistries.ITEM.get(resource("hastelloy_engine_wall"))));
}
}
103 changes: 0 additions & 103 deletions src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMetalRecipeHelper.java
View file
Open in desktop

This file was deleted.

64 changes: 64 additions & 0 deletions src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMixingRecipeGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package com.rae.creatingspace.content.datagen.recipe;

import com.rae.creatingspace.CreatingSpace;
import com.simibubi.create.api.data.recipe.MixingRecipeGen;
import com.simibubi.create.content.processing.recipe.HeatCondition;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.data.PackOutput;
import net.minecraft.world.item.Items;

import java.util.concurrent.CompletableFuture;

import static com.rae.creatingspace.CreatingSpace.resource;
import static com.simibubi.create.AllTags.commonItemTag;

@SuppressWarnings("unused")
public class CSMixingRecipeGen extends MixingRecipeGen {

GeneratedRecipe

COPRONICKEL_INGOT = create("copronickel_ingot", b -> b
.require(Items.COPPER_INGOT)
.require(Items.COPPER_INGOT)
.require(commonItemTag("ingots/nickel"))
.output(BuiltInRegistries.ITEM.get(resource("copronickel_ingot")), 2)
.requiresHeat(HeatCondition.HEATED)),

HASTELLOY_INGOT = create("hastelloy_ingot", b -> b
.require(Items.COPPER_INGOT)
.require(Items.IRON_INGOT)
.require(commonItemTag("ingots/nickel"))
.require(commonItemTag("ingots/nickel"))
.require(commonItemTag("ingots/cobalt"))
.require(commonItemTag("ingots/cobalt"))
.output(BuiltInRegistries.ITEM.get(resource("copronickel_ingot")), 1)
.requiresHeat(HeatCondition.SUPERHEATED)),

INCONEL_INGOT = create("inconel_ingot", b -> b
.require(Items.IRON_INGOT)
.require(commonItemTag("ingots/nickel"))
.require(commonItemTag("ingots/nickel"))
.output(BuiltInRegistries.ITEM.get(resource("inconel_ingot")), 1)
.requiresHeat(HeatCondition.SUPERHEATED)),

MONEL_INGOT = create("monel_ingot", b -> b
.require(Items.COPPER_INGOT)
.require(commonItemTag("ingots/nickel"))
.require(commonItemTag("ingots/nickel"))
.output(BuiltInRegistries.ITEM.get(resource("monel_ingot")), 1)
.requiresHeat(HeatCondition.SUPERHEATED)),

REINFORCED_COPPER_INGOT = create("inconel_ingot", b -> b
.require(Items.IRON_INGOT)
.require(Items.COPPER_INGOT)
.require(Items.COPPER_INGOT)
.output(BuiltInRegistries.ITEM.get(resource("reinforced_copper_ingot")), 1)
.requiresHeat(HeatCondition.HEATED));

public CSMixingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, String defaultNamespace) {
super(output, registries, CreatingSpace.MODID);
}


}
Loading
Loading