mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-15 07:43:40 +01:00
Why are we still here, 1.16 Special
- Removed invalid compat recipe containing a removed item from the mod "Charm" - Added sawing recipes for Crimson and Warped stems - Adjusted crushing outputs of nether wart blocks - Fixed Deployers unable to break leaves and other specific translucent blocks - Saws and Deforesters can now take down Crimson and Warped fungus
This commit is contained in:
simibubi
parent
c100c4e823
commit
a1cac6d852
18 changed files with 184 additions and 122 deletions
|
|
@ -337,7 +337,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl
|
|||
d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json
|
||||
92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json
|
||||
61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json
|
||||
6fa36883e76e9e403bb429c8f86b8c0d3bba0cff assets/create/blockstates/radial_chassis.json
|
||||
8d7e653bfd9846e684a0d3725595714a19201017 assets/create/blockstates/radial_chassis.json
|
||||
45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json
|
||||
da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json
|
||||
722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json
|
||||
|
|
@ -1679,6 +1679,7 @@ bf68b12cf828b64f5bb407bba6cf6ced8578327c data/create/advancements/recipes/buildi
|
|||
fc07b75f81782fa06990c7eb7febc635621df91a data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json
|
||||
84963b1e8eb81dd20df6a9680028f8b76fef2bae data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json
|
||||
d8edb7b810ba30aa7b5d281e283ccfd4bcc8af4f data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json
|
||||
24c7db24ea02b66bac7de0cb508485488b755aea data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_eidolon.json
|
||||
744d8831fde05ee2598ccde10f9289512c45d55b data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_mysticalworld.json
|
||||
4ef0ac97acddee1c49a0deb402b43feb40af1dc6 data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_silents_mechanisms.json
|
||||
25c6e6736da3a529c4cfb384a2dba707f946ce22 data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json
|
||||
|
|
@ -1707,6 +1708,7 @@ d192714def52e54a58ae96f7592055e925d88bb8 data/create/advancements/recipes/buildi
|
|||
e922be59fa4cb031020041f54d06d361f090e6a8 data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json
|
||||
6f0b67b3f49da5c3102a48e68e6c4f834d08b0e2 data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json
|
||||
2c10ff7aea86bec54b5b84a8fa89e51aba9c771e data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json
|
||||
ab46ab7914bd3f35b242a987fa58c90cc22a0636 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_eidolon.json
|
||||
847dc1a0bd2275a11ff02624b98cf7fdf0d8f47b data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_mysticalworld.json
|
||||
79d5f852e9e48e9e8ff5cd42890fbc9ad29e9712 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_silents_mechanisms.json
|
||||
cdf4697b74e4a6add2ea41825733f4d9ff2b83e6 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json
|
||||
|
|
@ -2758,6 +2760,7 @@ d167828a4fe3a20d765831c1df433fc3c8efeab8 data/create/recipes/blasting/ingot_osmi
|
|||
ba7498521a1e07b9bd46ec230d952fb232eaaba0 data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json
|
||||
ee290750b334b7996ba856a8f66f4948346c99f6 data/create/recipes/blasting/ingot_uranium_compat_mekanism.json
|
||||
69cda0f54c47cd44c296608cc379db855602410f data/create/recipes/blasting/iron_ingot_from_crushed.json
|
||||
0fae477ff5d1852ed7c36d5a94aa25c96604da5d data/create/recipes/blasting/lead_ingot_compat_eidolon.json
|
||||
65a44735ffa0c3e471a1df30b987d8c3cf1764fc data/create/recipes/blasting/lead_ingot_compat_mysticalworld.json
|
||||
aeb345e5b4c266ac9e2ef6929b153cb535468d01 data/create/recipes/blasting/lead_ingot_compat_silents_mechanisms.json
|
||||
606b46f5af59d7bd71462807ceb95edebb09a07e data/create/recipes/blasting/lead_ingot_compat_thermal.json
|
||||
|
|
@ -2986,8 +2989,7 @@ a7c97582bae243ab04ff5ff9914b24af25d40d59 data/create/recipes/crushing/iron_horse
|
|||
62e2768ae8f0de8d2e50a0916d4961f7836b5f04 data/create/recipes/crushing/lead_ore.json
|
||||
e870d049abc5cd5f389f70414c67e76ddc14060d data/create/recipes/crushing/leather_horse_armor.json
|
||||
2bc66f89a751a440c93de5f1d28d54f9b5a0da77 data/create/recipes/crushing/nether_quartz_ore.json
|
||||
2b9b8e1ab81f47c4f7fb79a007aef214af12a342 data/create/recipes/crushing/nether_wart_block_no_quark.json
|
||||
70116a5a9d1f93ae377e1526ca99582190cf2e3e data/create/recipes/crushing/nether_wart_block_quark.json
|
||||
6e424d7e9f7d8b585384053a713db28f9d36448b data/create/recipes/crushing/nether_wart_block.json
|
||||
8003e7db3ee11066b365c251f04f84028820de94 data/create/recipes/crushing/netherrack.json
|
||||
7b4c7587374fb77088f226187771de520ada548b data/create/recipes/crushing/nickel_ore.json
|
||||
dd4b9e88a723f6c3f2456f36ef2354cd86d85433 data/create/recipes/crushing/obsidian.json
|
||||
|
|
@ -3008,6 +3010,8 @@ b6b97f139ee0a06a4ec1ed9f43e1f845b3c502d3 data/create/recipes/crushing/wool.json
|
|||
68687da80b9dc7ea69729b0e16d3e75efed8679a data/create/recipes/cutting/andesite_alloy.json
|
||||
08e2da1149421b9edffdd227f40f6023d7e8ff0e data/create/recipes/cutting/birch_log.json
|
||||
f3e6a435ccdfac3da0482e0eee825f75485370dd data/create/recipes/cutting/birch_wood.json
|
||||
7d9e56b0dc595052fbdcca6bad0375cf937146f6 data/create/recipes/cutting/crimson_hyphae.json
|
||||
0c877153c4e080cf1c9a07247e7f5b59e7cfc9a8 data/create/recipes/cutting/crimson_stem.json
|
||||
8d71bb2524538a0d8fd044427cf7134bc2b31d8b data/create/recipes/cutting/dark_oak_log.json
|
||||
bb4c6b1ef57e5aceeaf8c1840e880e671788256f data/create/recipes/cutting/dark_oak_wood.json
|
||||
f0eb32c6d9f7a5a78f08ee6ac3b97f70747c89f9 data/create/recipes/cutting/jungle_log.json
|
||||
|
|
@ -3020,6 +3024,8 @@ fd565e84aff897968be805c03623757c11ea57ed data/create/recipes/cutting/oak_log.jso
|
|||
c7f0e3b7a46676ede1ed775ec8aa8b969e1fe598 data/create/recipes/cutting/stripped_acacia_wood.json
|
||||
4c657d8ff753789853c8d705fb5ae01caeef5cc1 data/create/recipes/cutting/stripped_birch_log.json
|
||||
53f47375955f65844c077c8bb06a9eeb67e0b53f data/create/recipes/cutting/stripped_birch_wood.json
|
||||
c2d6c83bb3144c6013e169de8f54c5f380ad094f data/create/recipes/cutting/stripped_crimson_hyphae.json
|
||||
affb6d0e171d77a6a27fc83b1a916eb95ed89516 data/create/recipes/cutting/stripped_crimson_stem.json
|
||||
9cab5363d43559823d4679da0a64a0a603983cb6 data/create/recipes/cutting/stripped_dark_oak_log.json
|
||||
c63bc7d8a81b3499390de84fc49d726c9018896d data/create/recipes/cutting/stripped_dark_oak_wood.json
|
||||
e923bfbc5d9b02e020693378723b4d55fc60f79a data/create/recipes/cutting/stripped_jungle_log.json
|
||||
|
|
@ -3028,6 +3034,10 @@ ff68462a712267db1f1124d37a4877217edd5c85 data/create/recipes/cutting/stripped_oa
|
|||
84ffcff96d79f88012bceae0e346da6be4da9802 data/create/recipes/cutting/stripped_oak_wood.json
|
||||
2b5f34ba42521004f999140056c997b07acde4e9 data/create/recipes/cutting/stripped_spruce_log.json
|
||||
6c3776c4d4190dba4f70d1f6995715002b37b3a8 data/create/recipes/cutting/stripped_spruce_wood.json
|
||||
135e9d58965c5715eb6c34a637714f61b38714f7 data/create/recipes/cutting/stripped_warped_hyphae.json
|
||||
f3c2cd996214e92e95e452d0f6e86ada59e65c78 data/create/recipes/cutting/stripped_warped_stem.json
|
||||
a022f2d541f04a9e2bed6b72af4e74703076fcbe data/create/recipes/cutting/warped_hyphae.json
|
||||
1bd01df5540df7db06afde28a3f9ebe4d25e4001 data/create/recipes/cutting/warped_stem.json
|
||||
f2c317e03ac4d42fb631e1625607061e10c480fe data/create/recipes/dark_oak_window.json
|
||||
d9dbae6e237eb38e53a619a0f1b339fca7c59b4d data/create/recipes/dark_oak_window_pane.json
|
||||
55596a590962e3ddd40949917661f0bd94408274 data/create/recipes/dark_scoria_bricks_from_dark_scoria_stonecutting.json
|
||||
|
|
@ -3465,6 +3475,7 @@ d2ab440819e4534f717315b7a737bcc2883072ed data/create/recipes/smelting/ingot_tin_
|
|||
7ca0d75c667e171f2abc5faeb96ef17282b130ac data/create/recipes/smelting/ingot_uranium_compat_immersiveengineering.json
|
||||
6179556218ef8de57e7a7093498b5c810af9bd7f data/create/recipes/smelting/ingot_uranium_compat_mekanism.json
|
||||
fe3e4c244c34aa6948243fabd6b42f04f80d4992 data/create/recipes/smelting/iron_ingot_from_crushed.json
|
||||
e558e9ca1460f081972ad8f7fb98c148548cbb57 data/create/recipes/smelting/lead_ingot_compat_eidolon.json
|
||||
4a1e8041f44bb36d29ec624fc78bdfd0ac875953 data/create/recipes/smelting/lead_ingot_compat_mysticalworld.json
|
||||
76433e1605c03dec670d95e9541770c53f4a5aaf data/create/recipes/smelting/lead_ingot_compat_silents_mechanisms.json
|
||||
5247ec83241f698e363d676ad1f19070c736f150 data/create/recipes/smelting/lead_ingot_compat_thermal.json
|
||||
|
|
@ -3494,6 +3505,7 @@ a1112c785f4571c0a9900288081eb216c729a17b data/create/recipes/splashing/crushed_g
|
|||
f3b03dd4532086a785d6bbc9de081ab8adf58146 data/create/recipes/splashing/crushed_iron_ore.json
|
||||
d2d6137fd7a3155263cfffef45f760b99f26f26b data/create/recipes/splashing/crushed_zinc_ore.json
|
||||
42cee25fabf4f0f9fb4815a98134eaf38ae197d0 data/create/recipes/splashing/cyan_concrete_powder.json
|
||||
2705d04043f39e4604dd89d8a0ff34ed01548849 data/create/recipes/splashing/eidolon/crushed_lead_ore.json
|
||||
c4d680eed98791fe45fa93aeeae9e8dbd508d6f5 data/create/recipes/splashing/gravel.json
|
||||
7af4d9ae50af13da0d4fc814687f9586ff872798 data/create/recipes/splashing/gray_concrete_powder.json
|
||||
23fb61c0e4bcca58fa7241db9cbef07bf4bd9a9b data/create/recipes/splashing/green_concrete_powder.json
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@
|
|||
},
|
||||
{
|
||||
"when": {
|
||||
"axis": "x",
|
||||
"sticky_south": "true"
|
||||
"sticky_south": "true",
|
||||
"axis": "x"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/radial_chassis_side_x_sticky",
|
||||
|
|
@ -39,8 +39,8 @@
|
|||
},
|
||||
{
|
||||
"when": {
|
||||
"axis": "y",
|
||||
"sticky_south": "true"
|
||||
"sticky_south": "true",
|
||||
"axis": "y"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/radial_chassis_side_y_sticky"
|
||||
|
|
@ -48,8 +48,8 @@
|
|||
},
|
||||
{
|
||||
"when": {
|
||||
"axis": "z",
|
||||
"sticky_south": "true"
|
||||
"sticky_south": "true",
|
||||
"axis": "z"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/radial_chassis_side_x_sticky",
|
||||
|
|
@ -59,8 +59,8 @@
|
|||
},
|
||||
{
|
||||
"when": {
|
||||
"axis": "x",
|
||||
"sticky_south": "false"
|
||||
"sticky_south": "false",
|
||||
"axis": "x"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/radial_chassis_side_x",
|
||||
|
|
@ -69,8 +69,8 @@
|
|||
},
|
||||
{
|
||||
"when": {
|
||||
"axis": "y",
|
||||
"sticky_south": "false"
|
||||
"sticky_south": "false",
|
||||
"axis": "y"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/radial_chassis_side_y"
|
||||
|
|
@ -78,8 +78,8 @@
|
|||
},
|
||||
{
|
||||
"when": {
|
||||
"axis": "z",
|
||||
"sticky_south": "false"
|
||||
"sticky_south": "false",
|
||||
"axis": "z"
|
||||
},
|
||||
"apply": {
|
||||
"model": "create:block/radial_chassis_side_x",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "create:crushing",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:nether_wart_block"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:nether_wart",
|
||||
"chance": 0.25
|
||||
}
|
||||
],
|
||||
"processingTime": 150
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
{
|
||||
"type": "create:crushing",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:nether_wart_block"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:nether_wart",
|
||||
"count": 6
|
||||
},
|
||||
{
|
||||
"item": "minecraft:nether_wart",
|
||||
"count": 2,
|
||||
"chance": 0.5
|
||||
}
|
||||
],
|
||||
"processingTime": 150,
|
||||
"conditions": [
|
||||
{
|
||||
"value": {
|
||||
"modid": "quark",
|
||||
"type": "forge:mod_loaded"
|
||||
},
|
||||
"type": "forge:not"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{
|
||||
"type": "create:crushing",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:nether_wart_block"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:nether_wart",
|
||||
"count": 2
|
||||
},
|
||||
{
|
||||
"item": "minecraft:nether_wart",
|
||||
"count": 2,
|
||||
"chance": 0.5
|
||||
}
|
||||
],
|
||||
"processingTime": 150,
|
||||
"conditions": [
|
||||
{
|
||||
"modid": "quark",
|
||||
"type": "forge:mod_loaded"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"type": "create:cutting",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:crimson_hyphae"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:stripped_crimson_hyphae"
|
||||
}
|
||||
],
|
||||
"processingTime": 50
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"type": "create:cutting",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:crimson_stem"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:stripped_crimson_stem"
|
||||
}
|
||||
],
|
||||
"processingTime": 50
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "create:cutting",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:stripped_crimson_hyphae"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:crimson_planks",
|
||||
"count": 5
|
||||
}
|
||||
],
|
||||
"processingTime": 100
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "create:cutting",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:stripped_crimson_stem"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:crimson_planks",
|
||||
"count": 5
|
||||
}
|
||||
],
|
||||
"processingTime": 100
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "create:cutting",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:stripped_warped_hyphae"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:warped_planks",
|
||||
"count": 5
|
||||
}
|
||||
],
|
||||
"processingTime": 100
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "create:cutting",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:stripped_warped_stem"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:warped_planks",
|
||||
"count": 5
|
||||
}
|
||||
],
|
||||
"processingTime": 100
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"type": "create:cutting",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:warped_hyphae"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:stripped_warped_hyphae"
|
||||
}
|
||||
],
|
||||
"processingTime": 50
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"type": "create:cutting",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:warped_stem"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:stripped_warped_stem"
|
||||
}
|
||||
],
|
||||
"processingTime": 50
|
||||
}
|
||||
|
|
@ -195,7 +195,7 @@ public class DeployerHandler {
|
|||
if (mode == Mode.PUNCH) {
|
||||
if (!world.isBlockModifiable(player, clickedPos))
|
||||
return;
|
||||
if (clickedState.getRenderShape(world, clickedPos)
|
||||
if (clickedState.getShape(world, clickedPos)
|
||||
.isEmpty()) {
|
||||
player.blockBreakingProgress = null;
|
||||
return;
|
||||
|
|
@ -238,7 +238,7 @@ public class DeployerHandler {
|
|||
ItemUseContext itemusecontext = new ItemUseContext(player, hand, result);
|
||||
Event.Result useBlock = DEFAULT;
|
||||
Event.Result useItem = DEFAULT;
|
||||
if (!clickedState.getRenderShape(world, clickedPos)
|
||||
if (!clickedState.getShape(world, clickedPos)
|
||||
.isEmpty()) {
|
||||
RightClickBlock event = ForgeHooks.onRightClickBlock(player, hand, clickedPos, face);
|
||||
useBlock = event.getUseBlock();
|
||||
|
|
|
|||
|
|
@ -93,17 +93,9 @@ public class CrushingRecipeGen extends ProcessingRecipeGen {
|
|||
.output(.25f, Items.DIAMOND, 1)
|
||||
.output(.125f, Blocks.COBBLESTONE)),
|
||||
|
||||
NETHER_WART_NO_QUARK = create("nether_wart_block_no_quark", b -> b.duration(150)
|
||||
NETHER_WART = create("nether_wart_block", b -> b.duration(150)
|
||||
.require(Blocks.NETHER_WART_BLOCK)
|
||||
.output(Items.NETHER_WART, 6)
|
||||
.output(.5f, Items.NETHER_WART, 2)
|
||||
.whenModMissing("quark")),
|
||||
|
||||
NETHER_WART_QUARK = create("nether_wart_block_quark", b -> b.duration(150)
|
||||
.require(Blocks.NETHER_WART_BLOCK)
|
||||
.output(Items.NETHER_WART, 2)
|
||||
.output(.5f, Items.NETHER_WART, 2)
|
||||
.whenModLoaded("quark")),
|
||||
.output(.25f, Items.NETHER_WART, 1)),
|
||||
|
||||
GLOWSTONE = create(() -> Blocks.GLOWSTONE, b -> b.duration(150)
|
||||
.output(Items.GLOWSTONE_DUST, 3)
|
||||
|
|
|
|||
|
|
@ -20,13 +20,17 @@ public class CuttingRecipeGen extends ProcessingRecipeGen {
|
|||
JUNGLE_WOOD = stripAndMakePlanks(Blocks.JUNGLE_WOOD, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.JUNGLE_PLANKS),
|
||||
ACACIA_WOOD = stripAndMakePlanks(Blocks.ACACIA_WOOD, Blocks.STRIPPED_ACACIA_WOOD, Blocks.ACACIA_PLANKS),
|
||||
DARK_OAK_WOOD = stripAndMakePlanks(Blocks.DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.DARK_OAK_PLANKS),
|
||||
CRIMSON_WOOD = stripAndMakePlanks(Blocks.CRIMSON_HYPHAE, Blocks.STRIPPED_CRIMSON_HYPHAE, Blocks.CRIMSON_PLANKS),
|
||||
WARPED_WOOD = stripAndMakePlanks(Blocks.WARPED_HYPHAE, Blocks.STRIPPED_WARPED_HYPHAE, Blocks.WARPED_PLANKS),
|
||||
|
||||
OAK_LOG = stripAndMakePlanks(Blocks.OAK_LOG, Blocks.STRIPPED_OAK_LOG, Blocks.OAK_PLANKS),
|
||||
SPRUCE_LOG = stripAndMakePlanks(Blocks.SPRUCE_LOG, Blocks.STRIPPED_SPRUCE_LOG, Blocks.SPRUCE_PLANKS),
|
||||
BIRCH_LOG = stripAndMakePlanks(Blocks.BIRCH_LOG, Blocks.STRIPPED_BIRCH_LOG, Blocks.BIRCH_PLANKS),
|
||||
JUNGLE_LOG = stripAndMakePlanks(Blocks.JUNGLE_LOG, Blocks.STRIPPED_JUNGLE_LOG, Blocks.JUNGLE_PLANKS),
|
||||
ACACIA_LOG = stripAndMakePlanks(Blocks.ACACIA_LOG, Blocks.STRIPPED_ACACIA_LOG, Blocks.ACACIA_PLANKS),
|
||||
DARK_OAK_LOG = stripAndMakePlanks(Blocks.DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.DARK_OAK_PLANKS)
|
||||
DARK_OAK_LOG = stripAndMakePlanks(Blocks.DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.DARK_OAK_PLANKS),
|
||||
CRIMSON_LOG = stripAndMakePlanks(Blocks.CRIMSON_STEM, Blocks.STRIPPED_CRIMSON_STEM, Blocks.CRIMSON_PLANKS),
|
||||
WARPED_LOG = stripAndMakePlanks(Blocks.WARPED_STEM, Blocks.STRIPPED_WARPED_STEM, Blocks.WARPED_PLANKS)
|
||||
|
||||
;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import com.simibubi.create.AllTags;
|
|||
import net.minecraft.block.BambooBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.CactusBlock;
|
||||
import net.minecraft.block.ChorusFlowerBlock;
|
||||
import net.minecraft.block.ChorusPlantBlock;
|
||||
|
|
@ -89,7 +90,8 @@ public class TreeCutter {
|
|||
return null;
|
||||
|
||||
visited.add(pos);
|
||||
BlockPos.getAllInBox(pos.add(-1, 0, -1), pos.add(1, 1, 1)).forEach(p -> frontier.add(new BlockPos(p)));
|
||||
BlockPos.getAllInBox(pos.add(-1, 0, -1), pos.add(1, 1, 1))
|
||||
.forEach(p -> frontier.add(new BlockPos(p)));
|
||||
|
||||
// Find all logs
|
||||
while (!frontier.isEmpty()) {
|
||||
|
|
@ -118,19 +120,22 @@ public class TreeCutter {
|
|||
BlockState blockState = reader.getBlockState(currentPos);
|
||||
boolean isLog = isLog(blockState);
|
||||
boolean isLeaf = isLeaf(blockState);
|
||||
boolean isGenericLeaf = isLeaf || isNonDecayingLeaf(blockState);
|
||||
|
||||
if (!isLog && !isLeaf)
|
||||
if (!isLog && !isGenericLeaf)
|
||||
continue;
|
||||
if (isLeaf)
|
||||
if (isGenericLeaf)
|
||||
leaves.add(currentPos);
|
||||
|
||||
int distance = isLog ? 0 : blockState.get(LeavesBlock.DISTANCE);
|
||||
int distance = !isLeaf ? 0 : blockState.get(LeavesBlock.DISTANCE);
|
||||
for (Direction direction : Iterate.directions) {
|
||||
BlockPos offset = currentPos.offset(direction);
|
||||
if (visited.contains(offset))
|
||||
continue;
|
||||
BlockState state = reader.getBlockState(offset);
|
||||
if (isLeaf(state) && state.get(LeavesBlock.DISTANCE) > distance)
|
||||
BlockPos subtract = offset.subtract(pos);
|
||||
int horizontalDistance = Math.max(Math.abs(subtract.getX()), Math.abs(subtract.getZ()));
|
||||
if (isLeaf(state) && state.get(LeavesBlock.DISTANCE) > distance || isNonDecayingLeaf(state) && horizontalDistance < 4)
|
||||
frontier.add(offset);
|
||||
}
|
||||
|
||||
|
|
@ -200,14 +205,19 @@ public class TreeCutter {
|
|||
}
|
||||
|
||||
private static void addNeighbours(BlockPos pos, List<BlockPos> frontier, Set<BlockPos> visited) {
|
||||
BlockPos.getAllInBox(pos.add(-1, -1, -1), pos.add(1, 1, 1)).filter(Predicates.not(visited::contains))
|
||||
.forEach(p -> frontier.add(new BlockPos(p)));
|
||||
BlockPos.getAllInBox(pos.add(-1, -1, -1), pos.add(1, 1, 1))
|
||||
.filter(Predicates.not(visited::contains))
|
||||
.forEach(p -> frontier.add(new BlockPos(p)));
|
||||
}
|
||||
|
||||
private static boolean isLog(BlockState state) {
|
||||
return state.isIn(BlockTags.LOGS) || AllTags.AllBlockTags.SLIMY_LOGS.matches(state);
|
||||
}
|
||||
|
||||
private static boolean isNonDecayingLeaf(BlockState state) {
|
||||
return state.isIn(BlockTags.WART_BLOCKS) || state.getBlock() == Blocks.SHROOMLIGHT;
|
||||
}
|
||||
|
||||
private static boolean isLeaf(BlockState state) {
|
||||
return BlockHelper.hasBlockStateProperty(state, LeavesBlock.DISTANCE);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "charm"
|
||||
}
|
||||
],
|
||||
"type": "create:crushing",
|
||||
"group": "minecraft:misc",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "charm:nether_gold_deposit"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:gold_nugget",
|
||||
"count": 2
|
||||
},
|
||||
{
|
||||
"item": "minecraft:gold_nugget",
|
||||
"count": 4,
|
||||
"chance": 0.5
|
||||
},
|
||||
{
|
||||
"item": "minecraft:netherrack",
|
||||
"count": 1,
|
||||
"chance": 0.125
|
||||
}
|
||||
],
|
||||
"processingTime": 250
|
||||
}
|
||||
Loading…
Reference in a new issue