Skip to content

Commit 2dbc173

Browse files
RoelymoleRoelymole
committed
feat: adjusted some recipes and added provisional recipes for the moon cheese block/log
1 parent 050b38d commit 2dbc173

15 files changed

+131
-89
lines changed

‎src/main/generated/data/galacticraft/advancement/recipes/decorations/diagonal_light_panel_flipped.json ‎src/main/generated/data/galacticraft/advancement/recipes/building_blocks/moon_cheese_block.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{
22
"parent": "minecraft:recipes/root",
33
"criteria": {
4-
"has_compressed_steel": {
4+
"has_moon_cheese_curd": {
55
"conditions": {
66
"items": [
77
{
8-
"items": "galacticraft:compressed_steel"
8+
"items": "galacticraft:moon_cheese_curd"
99
}
1010
]
1111
},
1212
"trigger": "minecraft:inventory_changed"
1313
},
1414
"has_the_recipe": {
1515
"conditions": {
16-
"recipe": "galacticraft:diagonal_light_panel_flipped"
16+
"recipe": "galacticraft:moon_cheese_block"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
2020
},
2121
"requirements": [
2222
[
2323
"has_the_recipe",
24-
"has_compressed_steel"
24+
"has_moon_cheese_curd"
2525
]
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"galacticraft:diagonal_light_panel_flipped"
29+
"galacticraft:moon_cheese_block"
3030
]
3131
}
3232
}

‎src/main/generated/data/galacticraft/advancement/recipes/misc/carbon_fragments_from_charcoal.json ‎src/main/generated/data/galacticraft/advancement/recipes/food/moon_cheese_log.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{
22
"parent": "minecraft:recipes/root",
33
"criteria": {
4-
"has_charcoal": {
4+
"has_moon_cheese_wheel": {
55
"conditions": {
66
"items": [
77
{
8-
"items": "minecraft:charcoal"
8+
"items": "galacticraft:moon_cheese_wheel"
99
}
1010
]
1111
},
1212
"trigger": "minecraft:inventory_changed"
1313
},
1414
"has_the_recipe": {
1515
"conditions": {
16-
"recipe": "galacticraft:carbon_fragments_from_charcoal"
16+
"recipe": "galacticraft:moon_cheese_log"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
2020
},
2121
"requirements": [
2222
[
2323
"has_the_recipe",
24-
"has_charcoal"
24+
"has_moon_cheese_wheel"
2525
]
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"galacticraft:carbon_fragments_from_charcoal"
29+
"galacticraft:moon_cheese_log"
3030
]
3131
}
3232
}

‎src/main/generated/data/galacticraft/advancement/recipes/misc/carbon_fragments_from_coal.json ‎src/main/generated/data/galacticraft/advancement/recipes/misc/carbon_fragments.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"has_the_recipe": {
1515
"conditions": {
16-
"recipe": "galacticraft:carbon_fragments_from_coal"
16+
"recipe": "galacticraft:carbon_fragments"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
@@ -26,7 +26,7 @@
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"galacticraft:carbon_fragments_from_coal"
29+
"galacticraft:carbon_fragments"
3030
]
3131
}
3232
}

‎src/main/generated/data/galacticraft/advancement/recipes/misc/moon_cheese_curd_from_block.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_moon_cheese_block": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "galacticraft:moon_cheese_block"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "galacticraft:moon_cheese_curd_from_block"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_moon_cheese_block"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"galacticraft:moon_cheese_curd_from_block"
30+
]
31+
}
32+
}

‎src/main/generated/data/galacticraft/recipe/battery.json

+9-6
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
22
"type": "minecraft:crafting_shaped",
33
"category": "misc",
44
"key": {
5+
"A": {
6+
"item": "galacticraft:compressed_aluminum"
7+
},
58
"C": {
69
"tag": "c:coal"
710
},
11+
"P": {
12+
"item": "galacticraft:compressed_copper"
13+
},
814
"R": {
915
"tag": "c:dusts/redstone"
10-
},
11-
"T": {
12-
"item": "galacticraft:compressed_aluminum"
1316
}
1417
},
1518
"pattern": [
16-
" T ",
17-
"TRT",
18-
"TCT"
19+
" P ",
20+
"ARA",
21+
"ACA"
1922
],
2023
"result": {
2124
"count": 1,

‎src/main/generated/data/galacticraft/recipe/carbon_fragments_from_coal.json ‎src/main/generated/data/galacticraft/recipe/carbon_fragments.json

File renamed without changes.

‎src/main/generated/data/galacticraft/recipe/carbon_fragments_from_charcoal.json

-13
This file was deleted.

‎src/main/generated/data/galacticraft/recipe/diagonal_light_panel_flipped.json

-24
This file was deleted.

‎src/main/generated/data/galacticraft/recipe/moon_cheese_block.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "building",
4+
"key": {
5+
"#": {
6+
"item": "galacticraft:moon_cheese_curd"
7+
}
8+
},
9+
"pattern": [
10+
"###",
11+
"###",
12+
"###"
13+
],
14+
"result": {
15+
"count": 1,
16+
"id": "galacticraft:moon_cheese_block"
17+
}
18+
}

‎src/main/generated/data/galacticraft/recipe/moon_cheese_curd_from_block.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"category": "misc",
4+
"group": "moon_cheese_curd",
5+
"ingredients": [
6+
{
7+
"item": "galacticraft:moon_cheese_block"
8+
}
9+
],
10+
"result": {
11+
"count": 9,
12+
"id": "galacticraft:moon_cheese_curd"
13+
}
14+
}

‎src/main/generated/data/galacticraft/recipe/moon_cheese_log.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"C": {
6+
"item": "galacticraft:moon_cheese_wheel"
7+
}
8+
},
9+
"pattern": [
10+
"C",
11+
"C"
12+
],
13+
"result": {
14+
"count": 1,
15+
"id": "galacticraft:moon_cheese_log"
16+
}
17+
}

‎src/main/generated/data/galacticraft/recipe/moon_cheese_slice.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88
],
99
"result": {
10-
"count": 6,
10+
"count": 7,
1111
"id": "galacticraft:moon_cheese_slice"
1212
}
1313
}

‎src/main/java/dev/galacticraft/mod/data/recipes/GCDecorationRecipeProvider.java

-10
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,6 @@ public void buildRecipes(RecipeOutput output) {
113113
.unlockedBy(getHasName(GCItems.COMPRESSED_STEEL), has(GCItems.COMPRESSED_STEEL))
114114
.save(output);
115115

116-
ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.DIAGONAL_LIGHT_PANEL)
117-
.define('S', Items.GLASS_PANE)
118-
.define('G', GCItems.GLOWSTONE_TORCH)
119-
.define('T', GCItems.COMPRESSED_STEEL)
120-
.pattern(" S")
121-
.pattern("SG")
122-
.pattern(" T")
123-
.unlockedBy(getHasName(GCItems.COMPRESSED_STEEL), has(GCItems.COMPRESSED_STEEL))
124-
.save(output, BuiltInRegistries.ITEM.getKey(GCBlocks.DIAGONAL_LIGHT_PANEL.asItem()).withSuffix("_flipped"));
125-
126116
ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.SPOTLIGHT_LIGHT_PANEL)
127117
.define('S', Items.GLASS_PANE)
128118
.define('G', GCItems.GLOWSTONE_TORCH)

‎src/main/java/dev/galacticraft/mod/data/recipes/GCMiscRecipeProvider.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,7 @@ public void buildRecipes(RecipeOutput output) {
143143
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, GCItems.CARBON_FRAGMENTS, 3)
144144
.requires(ConventionalItemTags.COAL)
145145
.unlockedBy("has_coal", has(ConventionalItemTags.COAL))
146-
.save(output, BuiltInRegistries.ITEM.getKey(GCItems.CARBON_FRAGMENTS).withSuffix("_from_coal"));
147-
148-
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, GCItems.CARBON_FRAGMENTS, 3)
149-
.requires(Items.CHARCOAL)
150-
.unlockedBy(getHasName(Items.CHARCOAL), has(Items.CHARCOAL))
151-
.save(output, BuiltInRegistries.ITEM.getKey(GCItems.CARBON_FRAGMENTS).withSuffix("_from_charcoal"));
146+
.save(output);
152147

153148
SimpleCookingRecipeBuilder.generic(Ingredient.of(ItemTags.PLANKS), RecipeCategory.MISC, GCItems.CARBON_FRAGMENTS, 0.1f, 200, RecipeSerializer.SMELTING_RECIPE, SmeltingRecipe::new)
154149
.unlockedBy("has_planks", has(ItemTags.PLANKS))
@@ -231,12 +226,13 @@ public void buildRecipes(RecipeOutput output) {
231226
.save(output);
232227

233228
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, GCItems.BATTERY)
234-
.define('T', GCItems.COMPRESSED_ALUMINUM)
229+
.define('P', GCItems.COMPRESSED_COPPER)
230+
.define('A', GCItems.COMPRESSED_ALUMINUM)
235231
.define('R', ConventionalItemTags.REDSTONE_DUSTS)
236232
.define('C', ConventionalItemTags.COAL)
237-
.pattern(" T ")
238-
.pattern("TRT")
239-
.pattern("TCT")
233+
.pattern(" P ")
234+
.pattern("ARA")
235+
.pattern("ACA")
240236
.unlockedBy(getHasName(GCItems.COMPRESSED_ALUMINUM), has(GCItems.COMPRESSED_ALUMINUM))
241237
.save(output);
242238

@@ -394,7 +390,7 @@ public void buildRecipes(RecipeOutput output) {
394390
.unlockedBy(getHasName(GCItems.GROUND_BEEF), has(GCItems.GROUND_BEEF))
395391
.save(output);
396392

397-
ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, GCItems.MOON_CHEESE_SLICE, 6)
393+
ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, GCItems.MOON_CHEESE_SLICE, 7)
398394
.requires(GCBlocks.MOON_CHEESE_WHEEL)
399395
.unlockedBy(getHasName(GCBlocks.MOON_CHEESE_WHEEL), has(GCBlocks.MOON_CHEESE_WHEEL))
400396
.save(output);
@@ -408,6 +404,13 @@ public void buildRecipes(RecipeOutput output) {
408404
.unlockedBy(getHasName(GCItems.MOON_CHEESE_CURD), has(GCItems.MOON_CHEESE_CURD))
409405
.save(output);
410406

407+
ShapedRecipeBuilder.shaped(RecipeCategory.FOOD, GCBlocks.MOON_CHEESE_LOG)
408+
.define('C', GCItems.MOON_CHEESE_WHEEL)
409+
.pattern("C")
410+
.pattern("C")
411+
.unlockedBy(getHasName(GCItems.MOON_CHEESE_WHEEL), has(GCItems.MOON_CHEESE_WHEEL))
412+
.save(output);
413+
411414
ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, GCItems.CANNED_DEHYDRATED_APPLE)
412415
.requires(GCItems.TIN_CANISTER)
413416
.requires(Items.APPLE)

‎src/main/java/dev/galacticraft/mod/data/recipes/GCOreRecipeProvider.java

+14-12
Original file line numberDiff line numberDiff line change
@@ -67,29 +67,31 @@ public void buildRecipes(RecipeOutput output) {
6767

6868

6969
// Nuggets <-> Ingots
70+
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.TIN_NUGGET, RecipeCategory.MISC, GCItems.TIN_INGOT, "tin_ingot_from_nuggets", "tin_ingot");
71+
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.ALUMINUM_NUGGET, RecipeCategory.MISC, GCItems.ALUMINUM_INGOT, "aluminum_ingot_from_nuggets", "aluminum_ingot");
7072
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.METEORIC_IRON_NUGGET, RecipeCategory.MISC, GCItems.METEORIC_IRON_INGOT, "meteoric_iron_ingot_from_nuggets", "meteoric_iron_ingot");
7173
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.DESH_NUGGET, RecipeCategory.MISC, GCItems.DESH_INGOT, "desh_ingot_from_nuggets", "desh_ingot");
72-
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.LEAD_NUGGET, RecipeCategory.MISC, GCItems.LEAD_INGOT, "lead_ingot_from_nuggets", "lead_ingot");
73-
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.ALUMINUM_NUGGET, RecipeCategory.MISC, GCItems.ALUMINUM_INGOT, "aluminum_ingot_from_nuggets", "aluminum_ingot");
74-
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.TIN_NUGGET, RecipeCategory.MISC, GCItems.TIN_INGOT, "tin_ingot_from_nuggets", "tin_ingot");
7574
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.TITANIUM_NUGGET, RecipeCategory.MISC, GCItems.TITANIUM_INGOT, "titanium_ingot_from_nuggets", "titanium_ingot");
75+
nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.LEAD_NUGGET, RecipeCategory.MISC, GCItems.LEAD_INGOT, "lead_ingot_from_nuggets", "lead_ingot");
7676

7777
// Ingots <-> Blocks
78+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.SILICON, RecipeCategory.BUILDING_BLOCKS, GCBlocks.SILICON_BLOCK, "silicon_from_block", "silicon");
79+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.MOON_CHEESE_CURD, RecipeCategory.BUILDING_BLOCKS, GCBlocks.MOON_CHEESE_BLOCK, "moon_cheese_curd_from_block", "moon_cheese_curd");
80+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.LUNAR_SAPPHIRE, RecipeCategory.BUILDING_BLOCKS, GCBlocks.LUNAR_SAPPHIRE_BLOCK, "lunar_sapphire_from_block", "lunar_sapphire");
81+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.TIN_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.TIN_BLOCK, "tin_ingot_from_block", "tin_ingot");
82+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.ALUMINUM_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.ALUMINUM_BLOCK, "aluminum_ingot_from_block", "aluminum_ingot");
7883
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.METEORIC_IRON_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.METEORIC_IRON_BLOCK, "meteoric_iron_ingot_from_block", "meteoric_iron_ingot");
7984
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.DESH_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.DESH_BLOCK, "desh_ingot_from_block", "desh_ingot");
80-
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.LEAD_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.LEAD_BLOCK, "lead_ingot_from_block", "lead_ingot");
81-
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.ALUMINUM_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.ALUMINUM_BLOCK, "aluminum_ingot_from_block", "aluminum_ingot");
82-
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.TIN_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.TIN_BLOCK, "tin_ingot_from_block", "tin_ingot");
8385
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.TITANIUM_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.TITANIUM_BLOCK, "titanium_ingot_from_block", "titanium_ingot");
84-
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.LUNAR_SAPPHIRE, RecipeCategory.BUILDING_BLOCKS, GCBlocks.LUNAR_SAPPHIRE_BLOCK, "lunar_sapphire_from_block", "lunar_sapphire");
85-
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.SILICON, RecipeCategory.BUILDING_BLOCKS, GCBlocks.SILICON_BLOCK, "silicon_from_block", "silicon");
86-
crystalBlockStorageRecipe(output, GCItems.OLIVINE_SHARD, RecipeCategory.MISC, GCBlocks.OLIVINE_BLOCK, "olivine_block_from_shards", null);
86+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.LEAD_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.LEAD_BLOCK, "lead_ingot_from_block", "lead_ingot");
87+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_TIN, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_TIN_BLOCK, "raw_tin_from_block", "raw_tin");
88+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_ALUMINUM, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_ALUMINUM_BLOCK, "raw_aluminum_from_block", "raw_aluminum");
8789
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_METEORIC_IRON, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_METEORIC_IRON_BLOCK, "raw_meteoric_iron_from_block", "raw_meteoric_iron");
8890
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_DESH, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_DESH_BLOCK, "raw_desh_from_block", "raw_desh");
89-
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_LEAD, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_LEAD_BLOCK, "raw_lead_from_block", "raw_lead");
90-
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_ALUMINUM, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_ALUMINUM_BLOCK, "raw_aluminum_from_block", "raw_aluminum");
91-
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_TIN, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_TIN_BLOCK, "raw_tin_from_block", "raw_tin");
9291
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_TITANIUM, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_TITANIUM_BLOCK, "raw_titanium_from_block", "raw_titanium");
92+
nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_LEAD, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_LEAD_BLOCK, "raw_lead_from_block", "raw_lead");
93+
94+
crystalBlockStorageRecipe(output, GCItems.OLIVINE_SHARD, RecipeCategory.MISC, GCBlocks.OLIVINE_BLOCK, "olivine_block_from_shards", null);
9395
}
9496

9597
@Override

0 commit comments

Comments
 (0)