Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-14 11:33:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Vector's Tweaks

Browse source 
- Item sprite edits
- Additional integration recipes and tags
This commit is contained in:
simibubi 2022-06-20 15:58:49 +02:00
parent 56ec2f127c
commit e0a8c7afd1
32 changed files with 208 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/generated/resources/.cache/cache
View file

@ -2304,7 +2304,6 @@ cbe6b6d0eb188a8c0600b54cee860116d305e905 data/create/advancements/recipes/buildi
34ceb3033f5f41a5fdffeea0a3adead36748f65a data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json
edb22e0bb018cf00e51f37d912939207c4bf5ac5 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json
f10041d864bfb1e6f017e442ae85ee9503b3f5a4 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json
60608f8fff394857b8b7d3b1478b847fd20160f4 data/create/advancements/recipes/create.base/andesite_ladder_from_andesite_alloy_stonecutting.json
ba80332510acab3f60f30d8b802ee2d450fd51b9 data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json
4bb60ef5e186f12a9d52e61319db8c78300c64ab data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_ore.json
00ff89f208cb9023d7a2657c43d267e21755fb2e data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_raw_ore.json
@ -2324,7 +2323,7 @@ f605ac221fbd565152f8e987beb7697299588da2 data/create/advancements/recipes/create
265a953eaac909fd2817c6dc3d1a08b376579a25 data/create/advancements/recipes/create.base/crafting/appliances/crafting_blueprint.json
29a77555e4d9eb1c8d4740f95b784fe0e53c72b1 data/create/advancements/recipes/create.base/crafting/appliances/diving_boots.json
638f93712e176fa3ef5cd6ecaf8dac4eebe1cd1e data/create/advancements/recipes/create.base/crafting/appliances/diving_helmet.json
e2d4add8b0a015ce8bc4b4c4e2143063d63404c6 data/create/advancements/recipes/create.base/crafting/appliances/dough.json
fa2e18298f7710465d9b0798a69288e846c646fd data/create/advancements/recipes/create.base/crafting/appliances/dough.json
a9b163744b1c494d07ec256d0367884f9601176d data/create/advancements/recipes/create.base/crafting/appliances/linked_controller.json
c4769d7ac9c537eb4409b02883e89d0930514a8b data/create/advancements/recipes/create.base/crafting/appliances/tree_fertilizer.json
9a3666ff51dc8bc84fc19a662cbe7a74ba2ea6e1 data/create/advancements/recipes/create.base/crafting/copper/waxed_copper_shingle_slab_from_honeycomb.json
@ -2356,6 +2355,7 @@ bb138bedd2aec741fa54b6b52be384fdbd741249 data/create/advancements/recipes/create
a8c72e7e02fd0843d33fa4c5d43de81f29bc3aa4 data/create/advancements/recipes/create.base/crafting/curiosities/peculiar_bell.json
5a6613ff9c493c02f70b54d6dd162948002d533b data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json
1eed818673d57a9e9c28e90a2d87b97c28f85784 data/create/advancements/recipes/create.base/crafting/kinetics/analog_lever.json
0c84fb9afd00efcdbfbee8fab7894742a723ef2b data/create/advancements/recipes/create.base/crafting/kinetics/andesite_ladder.json
3e9753006da898d4569bbeabf95997e8c90847c8 data/create/advancements/recipes/create.base/crafting/kinetics/attribute_filter.json
08b21b30437a1c6e7ba61b137f17aabb6c24acab data/create/advancements/recipes/create.base/crafting/kinetics/basin.json
de5160b4c1813b62ecc0c1955085da13f1c74d88 data/create/advancements/recipes/create.base/crafting/kinetics/belt_connector.json
@ -3333,6 +3333,7 @@ cce0482d2f60d11478bb73c778e157744899b7d3 data/create/advancements/recipes/create
d759d42813afa08afa27fdc6b986ad89b735be4a data/create/advancements/recipes/decorations/smelting/glass_pane_from_tiled_glass_pane.json
7da268d7218d56d829e2fdb9a23b42eb3c448a1a data/create/advancements/recipes/decorations/smelting/glass_pane_from_vertical_framed_glass_pane.json
086d805fcd6196d25d3a82383d857c2d0782a726 data/create/advancements/recipes/food/campfire_cooking/bread.json
80fe5293559824f72be963717c8c317004a28a47 data/create/advancements/recipes/food/crafting/curiosities/cake.json
94422ef3a72d5454732722d0d65ba74882bd2df7 data/create/advancements/recipes/food/smelting/bread.json
d40ef19fffb27cde542e0c6a5e8014a2662d211d data/create/advancements/recipes/food/smoking/bread.json
18d6171548bd5206f812e658f06e1d8835a5dd88 data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json
@ -3934,7 +3935,6 @@ efb30e3d24a700cf35b29406ee0b5d5021545d51 data/create/loot_tables/blocks/zinc_blo
d54859b2eb9c8c06aca8a8484bc65c8e4e0bb80a data/create/loot_tables/blocks/zinc_ore.json
b65bac8bc2fbfd476040c1aab1c0588b8bd59ebe data/create/recipes/acacia_window.json
35b4da9c14da60584c32e959efc2223f64bb3ec2 data/create/recipes/acacia_window_pane.json
388a7df4c6562e35ac0280bff786226e37f0ae45 data/create/recipes/andesite_ladder_from_andesite_alloy_stonecutting.json
dcdad7a04838ef202b42f84a15243e3d2472b14e data/create/recipes/andesite_pillar_from_andesite_stonecutting.json
b1f2f8a0f78bcd856e0352d88b6392ca6d5ed74f data/create/recipes/andesite_pillar_from_stone_types_andesite_stonecutting.json
a30aa616e2b62c848dd194e319a90bf7ba3db81b data/create/recipes/asurine_pillar_from_asurine_stonecutting.json
@ -3985,7 +3985,7 @@ eb18d5972484418fa5a768633e68688ad20d2bd7 data/create/recipes/crafting/appliances
c077375d16b4505e52548613fbc9356993556e6b data/create/recipes/crafting/appliances/crafting_blueprint.json
cba3566f09234b9cd17d8bc87dc87b2f779214e9 data/create/recipes/crafting/appliances/diving_boots.json
3e6bbbd6aa2b1373e9d6063d48560e4b547a5a5b data/create/recipes/crafting/appliances/diving_helmet.json
19526da3a59fc136654ff1bc93c0251581f397a9 data/create/recipes/crafting/appliances/dough.json
edf96556bb2357f54fd398fe573641afa15239b2 data/create/recipes/crafting/appliances/dough.json
75cdbd88973a8ca943ebe890153b01a344b96b01 data/create/recipes/crafting/appliances/linked_controller.json
7b5f863dda3d05a79cb85943a178eba0bd8a7dc7 data/create/recipes/crafting/appliances/slime_ball.json
b159ba84428eee6ef6e23df1766f2a18f2c8a63e data/create/recipes/crafting/appliances/tree_fertilizer.json
@ -4014,11 +4014,13 @@ a47812eae90abeccd459364cc2f05bdeafa57b82 data/create/recipes/crafting/copper/wax
b8c398ca1f483ce673b66af80c6f43902f51e2a6 data/create/recipes/crafting/copper/waxed_weathered_copper_tile_stairs_from_honeycomb.json
21bf282501c5fd1b53672df76ba99c5d8cd57023 data/create/recipes/crafting/copper/waxed_weathered_copper_tiles_from_honeycomb.json
4754ca20a7efdf382f32be150f38bdf4e8183fc4 data/create/recipes/crafting/curiosities/brown_toolbox.json
ab875f89a22504f3d3fd6ee2aa004d5f0082f169 data/create/recipes/crafting/curiosities/cake.json
660e92da2b1b6698b1c0df74bd74a56a25fb3eca data/create/recipes/crafting/curiosities/minecart_coupling.json
1f8f96ab57363166b7e132a1dd082001a5a0d5f0 data/create/recipes/crafting/curiosities/peculiar_bell.json
07b3ca3a3e44ee1f76c69132ffa6556e027e5b0e data/create/recipes/crafting/curiosities/toolbox_dyeing.json
4e9630bad12e6879ae7357ce7c8d455dddded9a4 data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json
88de51b451469698665b7319e5b9cfb9a87ae3e0 data/create/recipes/crafting/kinetics/analog_lever.json
8dc42e21f4d45dee83645b0cc96543bbe0ea4472 data/create/recipes/crafting/kinetics/andesite_ladder.json
cf1f3a6306d47025cebe153cf05949ef69ccbe5a data/create/recipes/crafting/kinetics/attribute_filter.json
059d12526529b2896ed583555373afa31839a0de data/create/recipes/crafting/kinetics/basin.json
dcf98e667d321fb4bd9fa6dfec7927a84cdbd5d6 data/create/recipes/crafting/kinetics/belt_connector.json
@ -5020,6 +5022,7 @@ e98ea64ba1a6780456e135628239251add737f2e data/create/recipes/deploying/waxed_wea
72110302ade0a3b7d82c5e778c63e0b457a2470b data/create/recipes/dripstone_pillar_from_dripstone_block_stonecutting.json
27d9bf05a610447e90314e658dbbcd191f378fc9 data/create/recipes/dripstone_pillar_from_stone_types_dripstone_stonecutting.json
d81ceba2946286d374801e698a4ca2116395cbad data/create/recipes/emptying/builders_tea.json
d12905d723363a6a053f7925af576c416a7b0aee data/create/recipes/emptying/compat/farmersdelight/milk_bottle.json
20b7c7c62fa2e33199e08188dd8836844a6d9cfd data/create/recipes/emptying/honey_bottle.json
dfc1bbb05a4eca31f47d1b25c5975866cb4b61f9 data/create/recipes/exposed_copper_shingle_slab.json
4e1cfc70d9089d90adbed4bef37b36e66751f5db data/create/recipes/exposed_copper_shingle_slab_from_exposed_copper_shingles_stonecutting.json
@ -5032,6 +5035,7 @@ c2f40d447fbac4b4975e578fe32635658b73ebf7 data/create/recipes/exposed_copper_tile
133e79f78a7f2c2f63ac7695d2be57d56e8955f4 data/create/recipes/filling/blaze_cake.json
642e96ce5dd2f31e7a33c6ef4060eecb0bf2aa86 data/create/recipes/filling/builders_tea.json
1367357fc36adc4b67467d90589ef91e657380a4 data/create/recipes/filling/chocolate_glazed_berries.json
efeb30ea6e9a7dca0d8fc388fd9c96ee70078537 data/create/recipes/filling/compat/farmersdelight/milk_bottle.json
5bec6c2068a3c1005810d18bd45ce916389b5423 data/create/recipes/filling/glowstone.json
5eb6227ccb6fa940b662d3ec029c3bd61fe61c8d data/create/recipes/filling/grass_block.json
244f27eadefefbc966ac384ac087c57d19484321 data/create/recipes/filling/gunpowder.json
@ -5157,7 +5161,7 @@ ce9dc7dacb85cb23a7187c19a115b40e597ad36b data/create/recipes/mixing/andesite_all
5a0ff7f1284d3c5e476552170cfee2e8164fb087 data/create/recipes/mixing/brass_ingot.json
ab602a53a5d8d057aad910dd1c5529cde2d587ab data/create/recipes/mixing/chocolate.json
d3bf74bb3826cf2dccaf7377b8b3e0fdaa38f1aa data/create/recipes/mixing/chocolate_melting.json
ec331b1de31bbe2795aec729e931726ec4f4534f data/create/recipes/mixing/dough_by_mixing.json
adb717169af550b6b89f119403b268e4f3f3dbbf data/create/recipes/mixing/dough_by_mixing.json
ffba306dbb52e4d7afeaec183b92821dbc402a7c data/create/recipes/mixing/honey.json
cd9a78454bce20cf3557f5c44febae77ebd43e54 data/create/recipes/mixing/lava_from_cobble.json
0f89b3f2d81585591513619b8d1e8694eb874316 data/create/recipes/mixing/tea.json
@ -5597,7 +5601,7 @@ c7a51fd1b730d48991cf6b4f1b56da4144537f1d data/create/recipes/splashing/stained_g
c4030e816d783bd195c56ae52a970c38593d178b data/create/recipes/splashing/thermal/crushed_nickel_ore.json
aa831e7fe830732b773d8ad144cb0d31ecffd489 data/create/recipes/splashing/thermal/crushed_silver_ore.json
df4276c923839620f284ac7c2d6a44bfd9ba356e data/create/recipes/splashing/thermal/crushed_tin_ore.json
39bd2780c1d3066e6b5b8d3b029f058f5ea63165 data/create/recipes/splashing/wheat_flour.json
0f68e57c82914c99082fe0e22da789a575df83ab data/create/recipes/splashing/wheat_flour.json
24cedf74a5a118fa03c7e91a3fdaae3e41f6ec40 data/create/recipes/splashing/white_concrete_powder.json
4ad9a4699a6e28c4406ab2aa453bbe50fcb34abc data/create/recipes/splashing/wool.json
e2c1774577aeb0756fb1d092245d9d77e40ba5f8 data/create/recipes/splashing/yellow_concrete_powder.json
@ -5682,6 +5686,10 @@ ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/b
d6a4e4fe1204b718010543a28a9b9ec4e0977bd7 data/forge/tags/fluids/tea.json
d9ffc62a496946fc4848934e7c0a6e917337f8be data/forge/tags/items/beacon_payment.json
5af3164b14c92d2d6e235b5d4eebd93cbee37c0a data/forge/tags/items/buckets/honey.json
2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough.json
2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough/wheat.json
25078dad07e8f75134a98c2dd0f0511c55146bd5 data/forge/tags/items/flour.json
25078dad07e8f75134a98c2dd0f0511c55146bd5 data/forge/tags/items/flour/wheat.json
16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/items/glass/colorless.json
81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/items/glass_panes.json
d9ffc62a496946fc4848934e7c0a6e917337f8be data/forge/tags/items/ingots.json

4
src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/dough.json
View file

@ -11,9 +11,7 @@
"conditions": {
"items": [
{
"items": [
"create:wheat_flour"
]
"tag": "forge:flour/wheat"
}
]
}

8
src/generated/resources/data/create/advancements/recipes/create.base/andesite_ladder_from_andesite_alloy_stonecutting.json → src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/andesite_ladder.json
View file

@ -2,11 +2,11 @@
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:andesite_ladder_from_andesite_alloy_stonecutting"
"create:crafting/kinetics/andesite_ladder"
]
},
"criteria": {
"has_andesite_alloy": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
@ -21,13 +21,13 @@
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:andesite_ladder_from_andesite_alloy_stonecutting"
"recipe": "create:crafting/kinetics/andesite_ladder"
}
}
},
"requirements": [
[
"has_andesite_alloy",
"has_item",
"has_the_recipe"
]
]

32
src/generated/resources/data/create/advancements/recipes/food/crafting/curiosities/cake.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:crafting/curiosities/cake"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:dough"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:crafting/curiosities/cake"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

8
src/generated/resources/data/create/recipes/andesite_ladder_from_andesite_alloy_stonecutting.json
View file

@ -1,8 +0,0 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "create:andesite_alloy"
},
"result": "create:andesite_ladder",
"count": 2
}

2
src/generated/resources/data/create/recipes/crafting/appliances/dough.json
View file

@ -2,7 +2,7 @@
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "create:wheat_flour"
"tag": "forge:flour/wheat"
},
{
"item": "minecraft:water_bucket"

25
src/generated/resources/data/create/recipes/crafting/curiosities/cake.json Normal file
View file

@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" M ",
"SES",
" P "
],
"key": {
"E": {
"tag": "forge:eggs"
},
"S": {
"item": "minecraft:sugar"
},
"P": {
"tag": "forge:dough"
},
"M": {
"item": "minecraft:milk_bucket"
}
},
"result": {
"item": "minecraft:cake"
}
}

17
src/generated/resources/data/create/recipes/crafting/kinetics/andesite_ladder.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"A A",
"AAA",
"A A"
],
"key": {
"A": {
"item": "create:andesite_alloy"
}
},
"result": {
"item": "create:andesite_ladder",
"count": 4
}
}

17
src/generated/resources/data/create/recipes/emptying/compat/farmersdelight/milk_bottle.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:emptying",
"ingredients": [
{
"item": "farmersdelight:milk_bottle"
}
],
"results": [
{
"item": "minecraft:glass_bottle"
},
{
"fluid": "minecraft:milk",
"amount": 250
}
]
}

17
src/generated/resources/data/create/recipes/filling/compat/farmersdelight/milk_bottle.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:glass_bottle"
},
{
"fluidTag": "forge:milk",
"amount": 250
}
],
"results": [
{
"item": "farmersdelight:milk_bottle"
}
]
}

2
src/generated/resources/data/create/recipes/mixing/dough_by_mixing.json
View file

@ -2,7 +2,7 @@
"type": "create:mixing",
"ingredients": [
{
"item": "create:wheat_flour"
"tag": "forge:flour/wheat"
},
{
"fluid": "minecraft:water",

2
src/generated/resources/data/create/recipes/splashing/wheat_flour.json
View file

@ -2,7 +2,7 @@
"type": "create:splashing",
"ingredients": [
{
"item": "create:wheat_flour"
"tag": "forge:flour/wheat"
}
],
"results": [

6
src/generated/resources/data/forge/tags/items/dough.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:dough"
]
}

6
src/generated/resources/data/forge/tags/items/dough/wheat.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:dough"
]
}

6
src/generated/resources/data/forge/tags/items/flour.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:wheat_flour"
]
}

6
src/generated/resources/data/forge/tags/items/flour/wheat.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"create:wheat_flour"
]
}

4
src/main/java/com/simibubi/create/AllItems.java
View file

@ -80,7 +80,9 @@ public class AllItems {
REGISTRATE.startSection(MATERIALS);
}
public static final ItemEntry<Item> WHEAT_FLOUR = ingredient("wheat_flour"), DOUGH = ingredient("dough"),
public static final ItemEntry<Item> WHEAT_FLOUR =
taggedIngredient("wheat_flour", forgeItemTag("flour/wheat"), forgeItemTag("flour")),
DOUGH = taggedIngredient("dough", forgeItemTag("dough"), forgeItemTag("dough/wheat")),
CINDER_FLOUR = ingredient("cinder_flour"), ROSE_QUARTZ = ingredient("rose_quartz"),
POLISHED_ROSE_QUARTZ = ingredient("polished_rose_quartz"), POWDERED_OBSIDIAN = ingredient("powdered_obsidian"),
STURDY_SHEET = taggedIngredient("sturdy_sheet", forgeItemTag("plates/obsidian")),

6
src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
View file

@ -201,7 +201,11 @@ public class BuilderTransformers {
.transform(pickaxeOnly())
.tag(BlockTags.CLIMBABLE)
.item()
.recipe((c, p) -> p.stonecutting(ingredient.get(), c::get, 2))
.recipe((c, p) -> {
if (name.equals("andesite"))
return;
p.stonecutting(ingredient.get(), c::get, 2);
})
.model((c, p) -> p.blockSprite(c::get, p.modLoc("block/ladder_" + name)))
.build();
}

4
src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java
View file

@ -147,6 +147,10 @@ public abstract class CreateRecipeProvider extends RecipeProvider {
static TagKey<Item> zincBlock() {
return AllTags.forgeItemTag("storage_blocks/zinc");
}
static TagKey<Item> wheatFlour() {
return AllTags.forgeItemTag("flour/wheat");
}
static ItemLike copper() {
return Items.COPPER_INGOT;

15
src/main/java/com/simibubi/create/foundation/data/recipe/EmptyingRecipeGen.java
View file

@ -6,6 +6,7 @@ import com.simibubi.create.AllRecipeTypes;
import net.minecraft.data.DataGenerator;
import net.minecraft.world.item.Items;
import net.minecraftforge.common.ForgeMod;
public class EmptyingRecipeGen extends ProcessingRecipeGen {
@ -15,14 +16,16 @@ public class EmptyingRecipeGen extends ProcessingRecipeGen {
GeneratedRecipe
HONEY_BOTTLE = create("honey_bottle", b -> b
.require(Items.HONEY_BOTTLE)
.output(AllFluids.HONEY.get(), 250)
HONEY_BOTTLE = create("honey_bottle", b -> b.require(Items.HONEY_BOTTLE)
.output(AllFluids.HONEY.get(), 250)
.output(Items.GLASS_BOTTLE)),
BUILDERS_TEA = create("builders_tea", b -> b.require(AllItems.BUILDERS_TEA.get())
.output(AllFluids.TEA.get(), 250)
.output(Items.GLASS_BOTTLE)),
BUILDERS_TEA = create("builders_tea", b -> b
.require(AllItems.BUILDERS_TEA.get())
.output(AllFluids.TEA.get(), 250)
FD_MILK = create(Mods.FD.recipeId("milk_bottle"), b -> b.require(Mods.FD, "milk_bottle")
.output(ForgeMod.MILK.get(), 250)
.output(Items.GLASS_BOTTLE))
;

4
src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java
View file

@ -23,6 +23,10 @@ public class FillingRecipeGen extends ProcessingRecipeGen {
BUILDERS_TEA = create("builders_tea", b -> b.require(AllFluids.TEA.get(), 250)
.require(Items.GLASS_BOTTLE)
.output(AllItems.BUILDERS_TEA.get())),
FD_MILK = create(Mods.FD.recipeId("milk_bottle"), b -> b.require(Tags.Fluids.MILK, 250)
.require(Items.GLASS_BOTTLE)
.output(1, Mods.FD, "milk_bottle", 1)),
BLAZE_CAKE = create("blaze_cake", b -> b.require(Fluids.LAVA, 250)
.require(AllItems.BLAZE_CAKE_BASE.get())

2
src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java
View file

@ -40,7 +40,7 @@ public class MixingRecipeGen extends ProcessingRecipeGen {
.output(AllFluids.HONEY.get(), 1000)
.requiresHeat(HeatCondition.HEATED)),
DOUGH = create("dough_by_mixing", b -> b.require(AllItems.WHEAT_FLOUR.get())
DOUGH = create("dough_by_mixing", b -> b.require(I.wheatFlour())
.require(Fluids.WATER, 1000)
.output(AllItems.DOUGH.get(), 1)),

5
src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java
View file

@ -10,6 +10,7 @@ public enum Mods {
TH("thermal"),
IE("immersiveengineering", b -> b.reverseMetalPrefix()),
FD("farmersdelight"),
ARS_N("ars_nouveau"),
BSK("blue_skies"),
BTN("botania", b -> b.omitWoodSuffix()),
@ -62,6 +63,10 @@ public enum Mods {
public ResourceLocation asResource(String id) {
return new ResourceLocation(this.id, id);
}
public String recipeId(String id) {
return "compat/" + this.id + "/" + id;
}
public String getId() {
return id;

26
src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
View file

@ -161,16 +161,32 @@ public class StandardRecipeGen extends CreateRecipeProvider {
.viaShaped(b -> b.define('I', I.brassBlock())
.define('P', I.brassSheet())
.pattern("I")
.pattern("P"))
.pattern("P")),
CAKE = create(() -> Items.CAKE).unlockedByTag(() -> AllTags.forgeItemTag("dough"))
.viaShaped(b -> b.define('E', Tags.Items.EGGS)
.define('S', Items.SUGAR)
.define('P', AllTags.forgeItemTag("dough"))
.define('M', () -> Items.MILK_BUCKET)
.pattern(" M ")
.pattern("SES")
.pattern(" P "))
;
private Marker KINETICS = enterSection(AllSections.KINETICS);
GeneratedRecipe BASIN = create(AllBlocks.BASIN).unlockedBy(I::andesite)
GeneratedRecipe ANDESITE_LADDER = create(AllBlocks.ANDESITE_LADDER).returns(4)
.unlockedBy(I::andesite)
.viaShaped(b -> b.define('A', I.andesite())
.pattern("A A")
.pattern("AAA")),
.pattern("AAA")
.pattern("A A")),
BASIN = create(AllBlocks.BASIN).unlockedBy(I::andesite)
.viaShaped(b -> b.define('A', I.andesite())
.pattern("A A")
.pattern("AAA")),
GOGGLES = create(AllItems.GOGGLES).unlockedBy(I::andesite)
.viaShaped(b -> b.define('G', Tags.Items.GLASS)
@ -967,8 +983,8 @@ public class StandardRecipeGen extends CreateRecipeProvider {
GeneratedRecipe
DOUGH = create(AllItems.DOUGH).unlockedBy(AllItems.WHEAT_FLOUR::get)
.viaShapeless(b -> b.requires(AllItems.WHEAT_FLOUR.get())
DOUGH = create(AllItems.DOUGH).unlockedByTag(I::wheatFlour)
.viaShapeless(b -> b.requires(I.wheatFlour())
.requires(Items.WATER_BUCKET)),
DIVING_HELMET = create(AllItems.DIVING_HELMET).unlockedBy(I::copper)

3
src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java
View file

@ -81,7 +81,8 @@ public class WashingRecipeGen extends ProcessingRecipeGen {
CYAN_CONCRETE = convert(Blocks.CYAN_CONCRETE_POWDER, Blocks.CYAN_CONCRETE),
BLACK_CONCRETE = convert(Blocks.BLACK_CONCRETE_POWDER, Blocks.BLACK_CONCRETE),
FLOUR = create(AllItems.WHEAT_FLOUR::get, b -> b.output(AllItems.DOUGH.get()))
FLOUR = create("wheat_flour", b -> b.require(I.wheatFlour())
.output(AllItems.DOUGH.get()))
;

BIN
src/main/resources/assets/create/textures/block/deepslate_zinc_ore.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 664 B

BIN
src/main/resources/assets/create/textures/block/raw_zinc_block.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 239 B

After

Width:  |  Height:  |  Size: 613 B

BIN
src/main/resources/assets/create/textures/block/zinc_ore.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 655 B

BIN
src/main/resources/assets/create/textures/item/dough.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 274 B

BIN
src/main/resources/assets/create/textures/item/raw_zinc.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 593 B

BIN
src/main/resources/assets/create/textures/item/schedule.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 269 B

BIN
src/main/resources/assets/create/textures/item/track.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 285 B