Skip to content

Commit 0c47b55

Browse files
RealAntEngineerRealAntEngineer
authored
Merge pull request #108 from KalWantsPizza/1.21.1-release-DataGen&FluidInit
REGISTRATE & Datagen Part 2
2 parents 72680bc + c7f8c59 commit 0c47b55

File tree

112 files changed

+708
-590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+708
-590
lines changed

‎gradle.properties‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ mod_license=MIT
3737
mod_version=1.21.1_1.7.10
3838

3939

40-
create_version = 6.0.6-97
41-
flywheel_version = 1.0.2
42-
ponder_version = 1.0.46
40+
create_version = 6.0.6-98
41+
flywheel_version = 1.0.4
42+
ponder_version = 1.0.56
43+
4344
registrate_version = MC1.21-1.3.0+62
4445
jei_version=19.10.0.126
4546

‎src/main/java/com/rae/creatingspace/content/datagen/CSDatagen.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import com.google.gson.JsonObject;
55
import com.rae.creatingspace.CreatingSpace;
66

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

4948
//CS Recipes
50-
generator.addProvider(true, new CSStandardRecipeGen(output, lookupProvider));
51-
generator.addProvider(true, new CSPressingRecipeGen(output, lookupProvider));
49+
//generator.addProvider(true, new CSStandardRecipeGen(output, lookupProvider));
50+
generator.addProvider(true, new CSPressingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
51+
generator.addProvider(true, new CSCrushingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
52+
generator.addProvider(true, new CSMixingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
53+
generator.addProvider(true, new CSWashingRecipeGen(output, lookupProvider, CreatingSpace.MODID));
5254

53-
event.getGenerator().addProvider(true, REGISTRATE.setDataProvider(new RegistrateDataProvider(REGISTRATE, CreatingSpace.MODID, event)));
55+
event.getGenerator().addProvider(true, new RegistrateDataProvider(REGISTRATE, CreatingSpace.MODID, event));
5456
}
5557
}
5658

‎src/main/java/com/rae/creatingspace/content/datagen/CSMetalSets.java‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCrushingRecipeGen.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package com.rae.creatingspace.content.datagen.recipe;
2+
3+
import com.rae.creatingspace.CreatingSpace;
4+
import com.rae.creatingspace.init.ingameobject.BlockInit;
5+
import com.rae.creatingspace.init.ingameobject.ItemInit;
6+
import com.simibubi.create.api.data.recipe.CrushingRecipeGen;
7+
import net.minecraft.core.HolderLookup;
8+
import net.minecraft.data.PackOutput;
9+
import net.minecraft.world.item.Items;
10+
11+
import java.util.concurrent.CompletableFuture;
12+
13+
import static com.simibubi.create.AllTags.commonItemTag;
14+
15+
@SuppressWarnings("unused")
16+
public class CSCrushingRecipeGen extends CrushingRecipeGen {
17+
public CSCrushingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, String defaultNamespace) {
18+
super(output, registries, CreatingSpace.MODID);
19+
}
20+
21+
GeneratedRecipe
22+
23+
COAL_DUST = create("coal_dust", b -> b
24+
.duration(400)
25+
.require(Items.COAL)
26+
.output(ItemInit.COAL_DUST, 2)),
27+
28+
NICKEL_DUST = create("nickel_dust", b -> b
29+
.duration(400)
30+
.require(commonItemTag("ingots/nickel"))
31+
.output(ItemInit.NICKEL_DUST, 2)
32+
.output(0.5F, ItemInit.NICKEL_DUST, 1)),
33+
34+
MOON_REGOLITH = create("moon_stone", b -> b
35+
.duration(400)
36+
.require(BlockInit.MOON_STONE)
37+
.output(BlockInit.MOON_REGOLITH, 1)),
38+
39+
MARS_REGOLITH = create("mars_stone", b -> b
40+
.duration(400)
41+
.require(BlockInit.MARS_STONE)
42+
.output(BlockInit.MARS_REGOLITH, 1)),
43+
44+
NICKEL_ORE = stoneOre(() -> BlockInit.NICKEL_ORE, ItemInit.CRUSHED_NICKEL_ORE::get, 1.75f, 400),
45+
DEEPSLATE_NICKEL_ORE = deepslateOre(() -> BlockInit.DEEPSLATE_NICKEL_ORE, ItemInit.CRUSHED_NICKEL_ORE::get, 2.25f, 400),
46+
ALUMINUM_ORE = ore(() -> BlockInit.MOON_STONE.asItem(), BlockInit.MOON_ALUMINUM_ORE::get, ItemInit.CRUSHED_ALUMINUM_ORE::get, 1.75f, 400),
47+
COBALT_ORE = ore(() -> BlockInit.MOON_STONE.asItem(), BlockInit.MOON_COBALT_ORE::get, ItemInit.CRUSHED_COBALT_ORE::get, 1.75f, 400),
48+
RAW_NICKEL_ORE = rawOre("nickel", () -> commonItemTag("raw_materials/nickel"), ItemInit.CRUSHED_NICKEL_ORE::get, 1),
49+
RAW_ALUMINUM_ORE = rawOre("aluminum", () -> commonItemTag("raw_materials/aluminum"), ItemInit.CRUSHED_ALUMINUM_ORE::get, 1),
50+
RAW_COBALT_ORE = rawOre("cobalt", () -> commonItemTag("raw_materials/cobalt"), ItemInit.CRUSHED_COBALT_ORE::get, 1),
51+
RAW_NICKEL_BLOCK = rawOreBlock("nickel", () -> commonItemTag("storage_blocks/raw_nickel"), ItemInit.CRUSHED_NICKEL_ORE::get, 1),
52+
RAW_ALUMINUM_BLOCK = rawOreBlock("aluminum", () -> commonItemTag("storage_blocks/raw_aluminum"), ItemInit.CRUSHED_ALUMINUM_ORE::get, 1),
53+
RAW_COBALT_BLOCK = rawOreBlock("cobalt", () -> commonItemTag("storage_blocks/raw_cobalt"), ItemInit.CRUSHED_COBALT_ORE::get, 1);
54+
}

‎src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCuttingRecipeGen.java‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package com.rae.creatingspace.content.datagen.recipe;
2+
3+
import com.rae.creatingspace.CreatingSpace;
4+
import com.simibubi.create.AllItems;
5+
import com.simibubi.create.AllRecipeTypes;
6+
import com.simibubi.create.api.data.recipe.CuttingRecipeGen;
7+
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
8+
import net.minecraft.core.HolderLookup;
9+
import net.minecraft.core.registries.BuiltInRegistries;
10+
import net.minecraft.data.PackOutput;
11+
import net.minecraft.data.recipes.RecipeOutput;
12+
import net.minecraft.world.item.ItemStack;
13+
import net.minecraft.world.item.Items;
14+
import net.minecraft.world.item.crafting.Ingredient;
15+
import net.minecraft.world.level.ItemLike;
16+
17+
import java.util.concurrent.CompletableFuture;
18+
import java.util.function.Supplier;
19+
20+
import static com.rae.creatingspace.CreatingSpace.resource;
21+
import static com.simibubi.create.AllTags.commonItemTag;
22+
23+
@SuppressWarnings("unused")
24+
public class CSCuttingRecipeGen extends CuttingRecipeGen {
25+
public CSCuttingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, String defaultNamespace) {
26+
super(output, registries, CreatingSpace.MODID);
27+
28+
GeneratedRecipe
29+
30+
ANDESITE_ENGINE_WALL = create(AllItems.ANDESITE_ALLOY::get, b -> b
31+
.duration(100)
32+
.output(BuiltInRegistries.ITEM.get(resource("andesite_engine_wall")))),
33+
COPPER_ENGINE_WALL = create(Items.COPPER_INGOT::asItem,b -> b
34+
.duration(100)
35+
.output(BuiltInRegistries.ITEM.get(resource("copper_engine_wall")))),
36+
IRON_ENGINE_WALL = create(Items.IRON_INGOT::asItem,b -> b
37+
.duration(100)
38+
.output(BuiltInRegistries.ITEM.get(resource("iron_engine_wall")))),
39+
BRASS_ENGINE_WALL = create(AllItems.BRASS_SHEET::get,b -> b
40+
.duration(100)
41+
.output(BuiltInRegistries.ITEM.get(resource("brass_engine_wall")))),
42+
REINFORCED_COPPER_ENGINE_WALL = create("reinforced_copper_sheet", b -> b
43+
.duration(100)
44+
.output(BuiltInRegistries.ITEM.get(resource("reinforced_copper_engine_wall")))),
45+
COPRONICKEL_ENGINE_WALL = create("copronickel_sheet", b -> b
46+
.duration(100)
47+
.output(BuiltInRegistries.ITEM.get(resource("copronickel_engine_wall")))),
48+
MONEL_ENGINE_WALL = create("monel_sheet", b -> b
49+
.duration(100)
50+
.output(BuiltInRegistries.ITEM.get(resource("monel_engine_wall")))),
51+
INCONEL_ENGINE_WALL = create("inconel_sheet", b -> b
52+
.duration(100)
53+
.output(BuiltInRegistries.ITEM.get(resource("inconel_engine_wall")))),
54+
HASTELLOY_ENGINE_WALL = create("hastelloy_sheet", b -> b
55+
.duration(100)
56+
.output(BuiltInRegistries.ITEM.get(resource("hastelloy_engine_wall"))));
57+
}
58+
}

‎src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMetalRecipeHelper.java‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMixingRecipeGen.java‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package com.rae.creatingspace.content.datagen.recipe;
2+
3+
import com.rae.creatingspace.CreatingSpace;
4+
import com.simibubi.create.api.data.recipe.MixingRecipeGen;
5+
import com.simibubi.create.content.processing.recipe.HeatCondition;
6+
import net.minecraft.core.HolderLookup;
7+
import net.minecraft.core.registries.BuiltInRegistries;
8+
import net.minecraft.data.PackOutput;
9+
import net.minecraft.world.item.Items;
10+
11+
import java.util.concurrent.CompletableFuture;
12+
13+
import static com.rae.creatingspace.CreatingSpace.resource;
14+
import static com.simibubi.create.AllTags.commonItemTag;
15+
16+
@SuppressWarnings("unused")
17+
public class CSMixingRecipeGen extends MixingRecipeGen {
18+
19+
GeneratedRecipe
20+
21+
COPRONICKEL_INGOT = create("copronickel_ingot", b -> b
22+
.require(Items.COPPER_INGOT)
23+
.require(Items.COPPER_INGOT)
24+
.require(commonItemTag("ingots/nickel"))
25+
.output(BuiltInRegistries.ITEM.get(resource("copronickel_ingot")), 2)
26+
.requiresHeat(HeatCondition.HEATED)),
27+
28+
HASTELLOY_INGOT = create("hastelloy_ingot", b -> b
29+
.require(Items.COPPER_INGOT)
30+
.require(Items.IRON_INGOT)
31+
.require(commonItemTag("ingots/nickel"))
32+
.require(commonItemTag("ingots/nickel"))
33+
.require(commonItemTag("ingots/cobalt"))
34+
.require(commonItemTag("ingots/cobalt"))
35+
.output(BuiltInRegistries.ITEM.get(resource("copronickel_ingot")), 1)
36+
.requiresHeat(HeatCondition.SUPERHEATED)),
37+
38+
INCONEL_INGOT = create("inconel_ingot", b -> b
39+
.require(Items.IRON_INGOT)
40+
.require(commonItemTag("ingots/nickel"))
41+
.require(commonItemTag("ingots/nickel"))
42+
.output(BuiltInRegistries.ITEM.get(resource("inconel_ingot")), 1)
43+
.requiresHeat(HeatCondition.SUPERHEATED)),
44+
45+
MONEL_INGOT = create("monel_ingot", b -> b
46+
.require(Items.COPPER_INGOT)
47+
.require(commonItemTag("ingots/nickel"))
48+
.require(commonItemTag("ingots/nickel"))
49+
.output(BuiltInRegistries.ITEM.get(resource("monel_ingot")), 1)
50+
.requiresHeat(HeatCondition.SUPERHEATED)),
51+
52+
REINFORCED_COPPER_INGOT = create("inconel_ingot", b -> b
53+
.require(Items.IRON_INGOT)
54+
.require(Items.COPPER_INGOT)
55+
.require(Items.COPPER_INGOT)
56+
.output(BuiltInRegistries.ITEM.get(resource("reinforced_copper_ingot")), 1)
57+
.requiresHeat(HeatCondition.HEATED));
58+
59+
public CSMixingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, String defaultNamespace) {
60+
super(output, registries, CreatingSpace.MODID);
61+
}
62+
63+
64+
}

0 commit comments

Comments
 (0)