mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-02-10 12:25:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed wood cutting compat for HexCasting #5058

Browse source
This commit is contained in:
simibubi 2023-07-04 13:28:09 +02:00
parent 364ad6edf2
commit a6a4078356
10 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9
View file

@ -1,4 +1,4 @@
// 1.19.2 2023-07-03T14:12:56.5498328 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] // 1.19.2 2023-07-04T13:25:50.900324 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@ -4195,8 +4195,8 @@ f43cac8216e2a9347e48cf93a43de95dd810ca20 data/create/tags/items/contraption_cont
d371dfd35e49a7bef19f59c03e7f4ae20992f03d data/create/tags/items/create_ingots.json d371dfd35e49a7bef19f59c03e7f4ae20992f03d data/create/tags/items/create_ingots.json
910d0f5ccbc4c84b224eca1f1588b1695f41447b data/create/tags/items/crushed_raw_materials.json 910d0f5ccbc4c84b224eca1f1588b1695f41447b data/create/tags/items/crushed_raw_materials.json
0fa526e7e742573b603ad26b09526cf724efa1dc data/create/tags/items/deployable_drink.json 0fa526e7e742573b603ad26b09526cf724efa1dc data/create/tags/items/deployable_drink.json
29ca12609f7c419c5c06338a86c7f4ba1fc7390e data/create/tags/items/modded_stripped_logs.json 99d3f12c67bd4c1f14fa9e6cbc1de5ed209ef402 data/create/tags/items/modded_stripped_logs.json
ae63f7dc5d9221890ee593ff03cd2aff8cd6a356 data/create/tags/items/modded_stripped_wood.json b49ad07e47fbb4b12c1d95d72f752e6e6839a815 data/create/tags/items/modded_stripped_wood.json
695d75b352fd190b303c724d1aaee9bb786a903b data/create/tags/items/pressurized_air_sources.json 695d75b352fd190b303c724d1aaee9bb786a903b data/create/tags/items/pressurized_air_sources.json
2cd3adffd8b151354df137a990dcb97996a665bb data/create/tags/items/sandpaper.json 2cd3adffd8b151354df137a990dcb97996a665bb data/create/tags/items/sandpaper.json
79418bd729cef417b322cef9b491e7ae83317d61 data/create/tags/items/seats.json 79418bd729cef417b322cef9b491e7ae83317d61 data/create/tags/items/seats.json

10
src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
View file

@ -1,4 +1,4 @@
// 1.19.2 2023-05-21T22:23:35.981366 Create's Processing Recipes // 1.19.2 2023-07-04T13:25:50.9302443 Create's Processing Recipes
3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json
@ -329,10 +329,10 @@ e5c3b98a78aa3995654583f3ce1c70e7cf8c2130 data/create/recipes/cutting/compat/forb
4b2e710b98a3fd0a883cf5be9ec75835f8e4631b data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json 4b2e710b98a3fd0a883cf5be9ec75835f8e4631b data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json
a3035cdad141574294844b8aaa41b92ac76dac2e data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json a3035cdad141574294844b8aaa41b92ac76dac2e data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json
20e75208dcb1720de5bbf629911f52b95612227f data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json 20e75208dcb1720de5bbf629911f52b95612227f data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json
4bfafcc6fe8372535420dde28fcb3670cf171ad6 data/create/recipes/cutting/compat/hexcasting/akashic_log.json 3a9be23a966c2737c5059474c17a86566bc5505f data/create/recipes/cutting/compat/hexcasting/edified_log.json
ff7713c6899e7c4cd921f0e72d1cfc26f506ada5 data/create/recipes/cutting/compat/hexcasting/akashic_log_stripped.json 3f3879c426acb1753f2985ed19f0a905bdbd3797 data/create/recipes/cutting/compat/hexcasting/edified_wood.json
0bb9d6dd590881c9b8c4b7297694e78196cd9f85 data/create/recipes/cutting/compat/hexcasting/akashic_wood.json 68d80d00d15d6ad14100025eecbd76c1fa8e3a52 data/create/recipes/cutting/compat/hexcasting/stripped_edified_log.json
e01ed96c30daba091c4f435858795f1aa088f1be data/create/recipes/cutting/compat/hexcasting/akashic_wood_stripped.json 9e665be213a1eca08df0dcf38766d2ce3a76de8a data/create/recipes/cutting/compat/hexcasting/stripped_edified_wood.json
f87872a26b790bd29abfc036486474c5db8ee518 data/create/recipes/cutting/compat/integrateddynamics/menril_log.json f87872a26b790bd29abfc036486474c5db8ee518 data/create/recipes/cutting/compat/integrateddynamics/menril_log.json
cd568df5168a0cfccbdaaf767ec63d71871ba3ba data/create/recipes/cutting/compat/integrateddynamics/menril_log_stripped.json cd568df5168a0cfccbdaaf767ec63d71871ba3ba data/create/recipes/cutting/compat/integrateddynamics/menril_log_stripped.json
b5573785c73cbf3b2c2bd096bb0a12b054819b74 data/create/recipes/cutting/compat/integrateddynamics/menril_wood.json b5573785c73cbf3b2c2bd096bb0a12b054819b74 data/create/recipes/cutting/compat/integrateddynamics/menril_wood.json

4
src/generated/resources/data/create/recipes/cutting/compat/hexcasting/akashic_log.json → src/generated/resources/data/create/recipes/cutting/compat/hexcasting/edified_log.json
View file

@ -8,13 +8,13 @@
], ],
"ingredients": [ "ingredients": [
{ {
"item": "hexcasting:akashic_log" "item": "hexcasting:edified_log"
} }
], ],
"processingTime": 50, "processingTime": 50,
"results": [ "results": [
{ {
"item": "hexcasting:akashic_log_stripped" "item": "hexcasting:stripped_edified_log"
} }
] ]
} }

4
src/generated/resources/data/create/recipes/cutting/compat/hexcasting/akashic_wood.json → src/generated/resources/data/create/recipes/cutting/compat/hexcasting/edified_wood.json
View file

@ -8,13 +8,13 @@
], ],
"ingredients": [ "ingredients": [
{ {
"item": "hexcasting:akashic_wood" "item": "hexcasting:edified_wood"
} }
], ],
"processingTime": 50, "processingTime": 50,
"results": [ "results": [
{ {
"item": "hexcasting:akashic_wood_stripped" "item": "hexcasting:stripped_edified_wood"
} }
] ]
} }

4
src/generated/resources/data/create/recipes/cutting/compat/hexcasting/akashic_log_stripped.json → src/generated/resources/data/create/recipes/cutting/compat/hexcasting/stripped_edified_log.json
View file

@ -8,14 +8,14 @@
], ],
"ingredients": [ "ingredients": [
{ {
"item": "hexcasting:akashic_log_stripped" "item": "hexcasting:stripped_edified_log"
} }
], ],
"processingTime": 50, "processingTime": 50,
"results": [ "results": [
{ {
"count": 6, "count": 6,
"item": "hexcasting:akashic_planks" "item": "hexcasting:edified_planks"
} }
] ]
} }

4
src/generated/resources/data/create/recipes/cutting/compat/hexcasting/akashic_wood_stripped.json → src/generated/resources/data/create/recipes/cutting/compat/hexcasting/stripped_edified_wood.json
View file

@ -8,14 +8,14 @@
], ],
"ingredients": [ "ingredients": [
{ {
"item": "hexcasting:akashic_wood_stripped" "item": "hexcasting:stripped_edified_wood"
} }
], ],
"processingTime": 50, "processingTime": 50,
"results": [ "results": [
{ {
"count": 6, "count": 6,
"item": "hexcasting:akashic_planks" "item": "hexcasting:edified_planks"
} }
] ]
} }

2
src/generated/resources/data/create/tags/items/modded_stripped_logs.json
View file

@ -33,7 +33,7 @@
"required": false "required": false
}, },
{ {
"id": "hexcasting:akashic_log_stripped", "id": "hexcasting:stripped_akashic_log",
"required": false "required": false
}, },
{ {

2
src/generated/resources/data/create/tags/items/modded_stripped_wood.json
View file

@ -33,7 +33,7 @@
"required": false "required": false
}, },
{ {
"id": "hexcasting:akashic_wood_stripped", "id": "hexcasting:stripped_akashic_wood",
"required": false "required": false
}, },
{ {

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

@ -56,7 +56,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen {
FA = cuttingCompat(Mods.FA, "cherrywood", "mysterywood"), FA = cuttingCompat(Mods.FA, "cherrywood", "mysterywood"),
// Hexcasting (stripped is a suffix here) // Hexcasting (stripped is a suffix here)
HEX = cuttingCompat(Mods.HEX, "akashic"), HEX = cuttingCompat(Mods.HEX, "edified"),
// Integrated Dynamics (stripped is a suffix here also) // Integrated Dynamics (stripped is a suffix here also)
ID = cuttingCompat(Mods.ID, "menril"), ID = cuttingCompat(Mods.ID, "menril"),

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

@ -15,7 +15,7 @@ public enum Mods {
BSK("blue_skies"), BSK("blue_skies"),
BTN("botania", b -> b.omitWoodSuffix()), BTN("botania", b -> b.omitWoodSuffix()),
FA("forbidden_arcanus", b -> b.omitWoodSuffix()), FA("forbidden_arcanus", b -> b.omitWoodSuffix()),
HEX("hexcasting", b -> b.strippedWoodIsSuffix()), HEX("hexcasting"),
ID("integrateddynamics", b -> b.strippedWoodIsSuffix()), ID("integrateddynamics", b -> b.strippedWoodIsSuffix()),
BYG("byg"), BYG("byg"),
SG("silentgear"), SG("silentgear"),