diff --git a/src/generated/resources/assets/create/blockstates/fluid_pipe.json b/src/generated/resources/assets/create/blockstates/fluid_pipe.json index 3b646b920..f6ea8ac45 100644 --- a/src/generated/resources/assets/create/blockstates/fluid_pipe.json +++ b/src/generated/resources/assets/create/blockstates/fluid_pipe.json @@ -422,4 +422,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/create/loot_tables/blocks/andesite_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/andesite_bricks_slab.json index b57366ee7..7c92048db 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/andesite_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/andesite_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:andesite_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:andesite_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/andesite_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/andesite_cobblestone_slab.json index 5ab6ed9ba..0aec7461f 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/andesite_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/andesite_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:andesite_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:andesite_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/dark_scoria_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/dark_scoria_bricks_slab.json index 700d94611..f0f16b380 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/dark_scoria_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/dark_scoria_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:dark_scoria_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:dark_scoria_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/dark_scoria_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/dark_scoria_cobblestone_slab.json index 343a0be1c..dbd40c1d8 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/dark_scoria_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/dark_scoria_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:dark_scoria_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:dark_scoria_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/diorite_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/diorite_bricks_slab.json index f6c4a1173..a84d5d8bc 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/diorite_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/diorite_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:diorite_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:diorite_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/diorite_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/diorite_cobblestone_slab.json index 2c0cdd9f7..2710268db 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/diorite_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/diorite_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:diorite_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:diorite_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/dolomite_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/dolomite_bricks_slab.json index 1bfc2a5d6..765c74325 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/dolomite_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/dolomite_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:dolomite_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:dolomite_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/dolomite_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/dolomite_cobblestone_slab.json index 140e30ea0..c67ff9cf4 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/dolomite_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/dolomite_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:dolomite_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:dolomite_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_andesite_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_andesite_bricks_slab.json index f322383f4..be6df56da 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_andesite_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_andesite_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_andesite_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_andesite_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_dark_scoria_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_dark_scoria_bricks_slab.json index cf96577a3..48f8d1071 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_dark_scoria_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_dark_scoria_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_dark_scoria_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_dark_scoria_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_diorite_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_diorite_bricks_slab.json index 3271835d2..32c8eacff 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_diorite_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_diorite_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_diorite_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_diorite_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_dolomite_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_dolomite_bricks_slab.json index a1d76bdc8..1a0ae4c1e 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_dolomite_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_dolomite_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_dolomite_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_dolomite_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_gabbro_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_gabbro_bricks_slab.json index 834658ac6..04f13f37d 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_gabbro_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_gabbro_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_gabbro_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_gabbro_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_granite_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_granite_bricks_slab.json index 9b132dd5b..21d67929e 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_granite_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_granite_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_granite_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_granite_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_limestone_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_limestone_bricks_slab.json index 9bd3023cb..c17e65ae5 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_limestone_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_limestone_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_limestone_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_limestone_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_scoria_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_scoria_bricks_slab.json index b5c559b81..e06e32527 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_scoria_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_scoria_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_scoria_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_scoria_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/fancy_weathered_limestone_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/fancy_weathered_limestone_bricks_slab.json index c6d9f07f0..e1478da60 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/fancy_weathered_limestone_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/fancy_weathered_limestone_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:fancy_weathered_limestone_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:fancy_weathered_limestone_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/gabbro_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/gabbro_bricks_slab.json index cccfc073c..e82ecd9f7 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/gabbro_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/gabbro_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:gabbro_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:gabbro_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/gabbro_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/gabbro_cobblestone_slab.json index 555b00140..b44ae9582 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/gabbro_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/gabbro_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:gabbro_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:gabbro_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/granite_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/granite_bricks_slab.json index 0722dedbc..27f807d03 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/granite_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/granite_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:granite_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:granite_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/granite_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/granite_cobblestone_slab.json index de0eb589b..9a892bef9 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/granite_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/granite_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:granite_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:granite_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/limestone_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/limestone_bricks_slab.json index 5a31ec086..85a6b61d8 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/limestone_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/limestone_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:limestone_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:limestone_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/limestone_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/limestone_cobblestone_slab.json index 755a31beb..16c170eaa 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/limestone_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/limestone_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:limestone_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:limestone_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_andesite_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_andesite_slab.json index 9a10aeb45..4b0381d02 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_andesite_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_andesite_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_andesite_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_andesite_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_dark_scoria_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_dark_scoria_slab.json index 385c438e2..3e725d598 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_dark_scoria_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_dark_scoria_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_dark_scoria_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_dark_scoria_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_diorite_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_diorite_slab.json index a231636a5..e2b8a7ae6 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_diorite_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_diorite_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_diorite_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_diorite_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_dolomite_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_dolomite_slab.json index 745f0f728..5e8fd34a8 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_dolomite_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_dolomite_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_dolomite_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_dolomite_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_gabbro_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_gabbro_slab.json index 7f48987e5..2dbc7b71d 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_gabbro_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_gabbro_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_gabbro_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_gabbro_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_granite_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_granite_slab.json index c789ab66d..b1579560c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_granite_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_granite_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_granite_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_granite_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_limestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_limestone_slab.json index edbf16f12..2b4a89c02 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_limestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_limestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_limestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_limestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_scoria_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_scoria_slab.json index 69526eb19..a692d4686 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_scoria_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_scoria_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_scoria_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_scoria_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/paved_weathered_limestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/paved_weathered_limestone_slab.json index 9a1ceb02b..903ee8173 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/paved_weathered_limestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/paved_weathered_limestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:paved_weathered_limestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:paved_weathered_limestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/polished_dark_scoria_slab.json b/src/generated/resources/data/create/loot_tables/blocks/polished_dark_scoria_slab.json index f214968c4..a4c1997d4 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/polished_dark_scoria_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/polished_dark_scoria_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:polished_dark_scoria_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:polished_dark_scoria_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/polished_dolomite_slab.json b/src/generated/resources/data/create/loot_tables/blocks/polished_dolomite_slab.json index e2ae14454..b3dfab548 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/polished_dolomite_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/polished_dolomite_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:polished_dolomite_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:polished_dolomite_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/polished_gabbro_slab.json b/src/generated/resources/data/create/loot_tables/blocks/polished_gabbro_slab.json index 15e1b069e..861eba888 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/polished_gabbro_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/polished_gabbro_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:polished_gabbro_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:polished_gabbro_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/polished_limestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/polished_limestone_slab.json index 7dc799d3d..ced385ee6 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/polished_limestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/polished_limestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:polished_limestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:polished_limestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/polished_scoria_slab.json b/src/generated/resources/data/create/loot_tables/blocks/polished_scoria_slab.json index 1ca9c374d..4f44b847b 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/polished_scoria_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/polished_scoria_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:polished_scoria_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:polished_scoria_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/polished_weathered_limestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/polished_weathered_limestone_slab.json index 32c1cb293..bb102c0eb 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/polished_weathered_limestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/polished_weathered_limestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:polished_weathered_limestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:polished_weathered_limestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/scoria_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/scoria_bricks_slab.json index 3b938efce..4c80923cb 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/scoria_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/scoria_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:scoria_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:scoria_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/scoria_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/scoria_cobblestone_slab.json index 2855f16f8..131be96bf 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/scoria_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/scoria_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:scoria_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:scoria_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/weathered_limestone_bricks_slab.json b/src/generated/resources/data/create/loot_tables/blocks/weathered_limestone_bricks_slab.json index 5db05be10..425fca698 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/weathered_limestone_bricks_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/weathered_limestone_bricks_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:weathered_limestone_bricks_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:weathered_limestone_bricks_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/loot_tables/blocks/weathered_limestone_cobblestone_slab.json b/src/generated/resources/data/create/loot_tables/blocks/weathered_limestone_cobblestone_slab.json index dc7bfac9b..7dc0be3bd 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/weathered_limestone_cobblestone_slab.json +++ b/src/generated/resources/data/create/loot_tables/blocks/weathered_limestone_cobblestone_slab.json @@ -6,13 +6,26 @@ "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:weathered_limestone_cobblestone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], "name": "create:weathered_limestone_cobblestone_slab" } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } ] } ] diff --git a/src/generated/resources/data/create/recipes/compacting/blaze_cake.json b/src/generated/resources/data/create/recipes/compacting/blaze_cake.json index b752a4a3a..e4008758a 100644 --- a/src/generated/resources/data/create/recipes/compacting/blaze_cake.json +++ b/src/generated/resources/data/create/recipes/compacting/blaze_cake.json @@ -17,8 +17,7 @@ ], "results": [ { - "item": "create:blaze_cake", - "count": 1 + "item": "create:blaze_cake" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/coal_ore.json b/src/generated/resources/data/create/recipes/crushing/coal_ore.json index a6b0e5e70..f1e417ec4 100644 --- a/src/generated/resources/data/create/recipes/crushing/coal_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/coal_ore.json @@ -17,7 +17,6 @@ }, { "item": "minecraft:cobblestone", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/copper_ore.json b/src/generated/resources/data/create/recipes/crushing/copper_ore.json index acbbd3485..8619d352d 100644 --- a/src/generated/resources/data/create/recipes/crushing/copper_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/copper_ore.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:crushed_copper_ore", - "count": 1 + "item": "create:crushed_copper_ore" }, { "item": "create:crushed_copper_ore", @@ -17,7 +16,6 @@ }, { "item": "minecraft:cobblestone", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/diamond_horse_armor.json b/src/generated/resources/data/create/recipes/crushing/diamond_horse_armor.json index b3c2ad2aa..fe6d74eea 100644 --- a/src/generated/resources/data/create/recipes/crushing/diamond_horse_armor.json +++ b/src/generated/resources/data/create/recipes/crushing/diamond_horse_armor.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:diamond", - "count": 1 + "item": "minecraft:diamond" }, { "item": "minecraft:leather", diff --git a/src/generated/resources/data/create/recipes/crushing/emerald_ore.json b/src/generated/resources/data/create/recipes/crushing/emerald_ore.json index 04dcd5959..b48aedf88 100644 --- a/src/generated/resources/data/create/recipes/crushing/emerald_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/emerald_ore.json @@ -12,12 +12,10 @@ }, { "item": "minecraft:emerald", - "count": 1, "chance": 0.25 }, { "item": "minecraft:cobblestone", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/glowstone.json b/src/generated/resources/data/create/recipes/crushing/glowstone.json index 025f79b19..31f04afbb 100644 --- a/src/generated/resources/data/create/recipes/crushing/glowstone.json +++ b/src/generated/resources/data/create/recipes/crushing/glowstone.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:glowstone_dust", - "count": 1, "chance": 0.5 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/gold_ore.json b/src/generated/resources/data/create/recipes/crushing/gold_ore.json index 2a11c9c9c..9e0cce547 100644 --- a/src/generated/resources/data/create/recipes/crushing/gold_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/gold_ore.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:crushed_gold_ore", - "count": 1 + "item": "create:crushed_gold_ore" }, { "item": "create:crushed_gold_ore", @@ -17,7 +16,6 @@ }, { "item": "minecraft:cobblestone", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/gravel.json b/src/generated/resources/data/create/recipes/crushing/gravel.json index d3fa20f0b..0050c0455 100644 --- a/src/generated/resources/data/create/recipes/crushing/gravel.json +++ b/src/generated/resources/data/create/recipes/crushing/gravel.json @@ -7,17 +7,14 @@ ], "results": [ { - "item": "minecraft:sand", - "count": 1 + "item": "minecraft:sand" }, { "item": "minecraft:flint", - "count": 1, "chance": 0.1 }, { "item": "minecraft:clay_ball", - "count": 1, "chance": 0.05 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/iron_horse_armor.json b/src/generated/resources/data/create/recipes/crushing/iron_horse_armor.json index c075b1c6b..090264ea7 100644 --- a/src/generated/resources/data/create/recipes/crushing/iron_horse_armor.json +++ b/src/generated/resources/data/create/recipes/crushing/iron_horse_armor.json @@ -12,12 +12,10 @@ }, { "item": "minecraft:leather", - "count": 1, "chance": 0.5 }, { "item": "minecraft:iron_ingot", - "count": 1, "chance": 0.5 }, { diff --git a/src/generated/resources/data/create/recipes/crushing/iron_ore.json b/src/generated/resources/data/create/recipes/crushing/iron_ore.json index 2cf448408..bdc80fc6e 100644 --- a/src/generated/resources/data/create/recipes/crushing/iron_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/iron_ore.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:crushed_iron_ore", - "count": 1 + "item": "create:crushed_iron_ore" }, { "item": "create:crushed_iron_ore", @@ -17,7 +16,6 @@ }, { "item": "minecraft:cobblestone", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/lapis_ore.json b/src/generated/resources/data/create/recipes/crushing/lapis_ore.json index 4e4411dea..a5aba4741 100644 --- a/src/generated/resources/data/create/recipes/crushing/lapis_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/lapis_ore.json @@ -17,7 +17,6 @@ }, { "item": "minecraft:cobblestone", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/nether_quartz_ore.json b/src/generated/resources/data/create/recipes/crushing/nether_quartz_ore.json index 382d7be3d..eb6ea8b3f 100644 --- a/src/generated/resources/data/create/recipes/crushing/nether_quartz_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/nether_quartz_ore.json @@ -17,7 +17,6 @@ }, { "item": "minecraft:netherrack", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/netherrack.json b/src/generated/resources/data/create/recipes/crushing/netherrack.json index e819a816d..ec9af51d6 100644 --- a/src/generated/resources/data/create/recipes/crushing/netherrack.json +++ b/src/generated/resources/data/create/recipes/crushing/netherrack.json @@ -7,12 +7,10 @@ ], "results": [ { - "item": "create:cinder_flour", - "count": 1 + "item": "create:cinder_flour" }, { "item": "create:cinder_flour", - "count": 1, "chance": 0.5 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/obsidian.json b/src/generated/resources/data/create/recipes/crushing/obsidian.json index 178795c78..aea00d484 100644 --- a/src/generated/resources/data/create/recipes/crushing/obsidian.json +++ b/src/generated/resources/data/create/recipes/crushing/obsidian.json @@ -7,12 +7,10 @@ ], "results": [ { - "item": "create:powdered_obsidian", - "count": 1 + "item": "create:powdered_obsidian" }, { "item": "minecraft:obsidian", - "count": 1, "chance": 0.75 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/redstone_ore.json b/src/generated/resources/data/create/recipes/crushing/redstone_ore.json index c84532867..55c3bccab 100644 --- a/src/generated/resources/data/create/recipes/crushing/redstone_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/redstone_ore.json @@ -17,7 +17,6 @@ }, { "item": "minecraft:cobblestone", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/sand.json b/src/generated/resources/data/create/recipes/crushing/sand.json index ac35f5312..9289982da 100644 --- a/src/generated/resources/data/create/recipes/crushing/sand.json +++ b/src/generated/resources/data/create/recipes/crushing/sand.json @@ -7,17 +7,14 @@ ], "results": [ { - "item": "create:limesand", - "count": 1 + "item": "create:limesand" }, { "item": "create:limesand", - "count": 1, "chance": 0.5 }, { "item": "minecraft:bone_meal", - "count": 1, "chance": 0.05 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/wool.json b/src/generated/resources/data/create/recipes/crushing/wool.json index 2c3145e2c..9b0dde1c2 100644 --- a/src/generated/resources/data/create/recipes/crushing/wool.json +++ b/src/generated/resources/data/create/recipes/crushing/wool.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:string", - "count": 1, "chance": 0.5 } ], diff --git a/src/generated/resources/data/create/recipes/crushing/zinc_ore.json b/src/generated/resources/data/create/recipes/crushing/zinc_ore.json index e38a2b1c2..9ae4fe46d 100644 --- a/src/generated/resources/data/create/recipes/crushing/zinc_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/zinc_ore.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:crushed_zinc_ore", - "count": 1 + "item": "create:crushed_zinc_ore" }, { "item": "create:crushed_zinc_ore", @@ -17,7 +16,6 @@ }, { "item": "minecraft:cobblestone", - "count": 1, "chance": 0.125 } ], diff --git a/src/generated/resources/data/create/recipes/cutting/acacia_log.json b/src/generated/resources/data/create/recipes/cutting/acacia_log.json index e97cddad1..c465f9ad0 100644 --- a/src/generated/resources/data/create/recipes/cutting/acacia_log.json +++ b/src/generated/resources/data/create/recipes/cutting/acacia_log.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_acacia_log", - "count": 1 + "item": "minecraft:stripped_acacia_log" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/acacia_wood.json b/src/generated/resources/data/create/recipes/cutting/acacia_wood.json index 2646da134..7eecca4d9 100644 --- a/src/generated/resources/data/create/recipes/cutting/acacia_wood.json +++ b/src/generated/resources/data/create/recipes/cutting/acacia_wood.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_acacia_wood", - "count": 1 + "item": "minecraft:stripped_acacia_wood" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/birch_log.json b/src/generated/resources/data/create/recipes/cutting/birch_log.json index 9d2e90d44..2d83dee9c 100644 --- a/src/generated/resources/data/create/recipes/cutting/birch_log.json +++ b/src/generated/resources/data/create/recipes/cutting/birch_log.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_birch_log", - "count": 1 + "item": "minecraft:stripped_birch_log" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/birch_wood.json b/src/generated/resources/data/create/recipes/cutting/birch_wood.json index b788eebb2..8f49a79dc 100644 --- a/src/generated/resources/data/create/recipes/cutting/birch_wood.json +++ b/src/generated/resources/data/create/recipes/cutting/birch_wood.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_birch_wood", - "count": 1 + "item": "minecraft:stripped_birch_wood" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/dark_oak_log.json b/src/generated/resources/data/create/recipes/cutting/dark_oak_log.json index 82dd4b22e..a89e0b0c6 100644 --- a/src/generated/resources/data/create/recipes/cutting/dark_oak_log.json +++ b/src/generated/resources/data/create/recipes/cutting/dark_oak_log.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_dark_oak_log", - "count": 1 + "item": "minecraft:stripped_dark_oak_log" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/dark_oak_wood.json b/src/generated/resources/data/create/recipes/cutting/dark_oak_wood.json index 8c56dcf76..6356479c0 100644 --- a/src/generated/resources/data/create/recipes/cutting/dark_oak_wood.json +++ b/src/generated/resources/data/create/recipes/cutting/dark_oak_wood.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_dark_oak_wood", - "count": 1 + "item": "minecraft:stripped_dark_oak_wood" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/jungle_log.json b/src/generated/resources/data/create/recipes/cutting/jungle_log.json index 06925a237..29c34508b 100644 --- a/src/generated/resources/data/create/recipes/cutting/jungle_log.json +++ b/src/generated/resources/data/create/recipes/cutting/jungle_log.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_jungle_log", - "count": 1 + "item": "minecraft:stripped_jungle_log" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/jungle_wood.json b/src/generated/resources/data/create/recipes/cutting/jungle_wood.json index ee2f67cb1..034b9b11f 100644 --- a/src/generated/resources/data/create/recipes/cutting/jungle_wood.json +++ b/src/generated/resources/data/create/recipes/cutting/jungle_wood.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_jungle_wood", - "count": 1 + "item": "minecraft:stripped_jungle_wood" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/oak_log.json b/src/generated/resources/data/create/recipes/cutting/oak_log.json index d699bbcb3..445a93914 100644 --- a/src/generated/resources/data/create/recipes/cutting/oak_log.json +++ b/src/generated/resources/data/create/recipes/cutting/oak_log.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_oak_log", - "count": 1 + "item": "minecraft:stripped_oak_log" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/oak_wood.json b/src/generated/resources/data/create/recipes/cutting/oak_wood.json index 275016a6d..837a32790 100644 --- a/src/generated/resources/data/create/recipes/cutting/oak_wood.json +++ b/src/generated/resources/data/create/recipes/cutting/oak_wood.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_oak_wood", - "count": 1 + "item": "minecraft:stripped_oak_wood" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/spruce_log.json b/src/generated/resources/data/create/recipes/cutting/spruce_log.json index bef24e667..e8db405d9 100644 --- a/src/generated/resources/data/create/recipes/cutting/spruce_log.json +++ b/src/generated/resources/data/create/recipes/cutting/spruce_log.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_spruce_log", - "count": 1 + "item": "minecraft:stripped_spruce_log" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/cutting/spruce_wood.json b/src/generated/resources/data/create/recipes/cutting/spruce_wood.json index 4a7469621..77e886e7e 100644 --- a/src/generated/resources/data/create/recipes/cutting/spruce_wood.json +++ b/src/generated/resources/data/create/recipes/cutting/spruce_wood.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:stripped_spruce_wood", - "count": 1 + "item": "minecraft:stripped_spruce_wood" } ], "processingTime": 50 diff --git a/src/generated/resources/data/create/recipes/milling/allium.json b/src/generated/resources/data/create/recipes/milling/allium.json index 9b2122fb5..b6e1a024f 100644 --- a/src/generated/resources/data/create/recipes/milling/allium.json +++ b/src/generated/resources/data/create/recipes/milling/allium.json @@ -17,7 +17,6 @@ }, { "item": "minecraft:pink_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/andesite.json b/src/generated/resources/data/create/recipes/milling/andesite.json index b6407650b..c5a278f33 100644 --- a/src/generated/resources/data/create/recipes/milling/andesite.json +++ b/src/generated/resources/data/create/recipes/milling/andesite.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:cobblestone", - "count": 1 + "item": "minecraft:cobblestone" } ], "processingTime": 200 diff --git a/src/generated/resources/data/create/recipes/milling/blue_orchid.json b/src/generated/resources/data/create/recipes/milling/blue_orchid.json index c6a74e299..3e54a7049 100644 --- a/src/generated/resources/data/create/recipes/milling/blue_orchid.json +++ b/src/generated/resources/data/create/recipes/milling/blue_orchid.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:light_gray_dye", - "count": 1, "chance": 0.05 } ], diff --git a/src/generated/resources/data/create/recipes/milling/bone.json b/src/generated/resources/data/create/recipes/milling/bone.json index 4749558c9..122a3c30c 100644 --- a/src/generated/resources/data/create/recipes/milling/bone.json +++ b/src/generated/resources/data/create/recipes/milling/bone.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:white_dye", - "count": 1, "chance": 0.25 }, { diff --git a/src/generated/resources/data/create/recipes/milling/bone_meal.json b/src/generated/resources/data/create/recipes/milling/bone_meal.json index ff4066c57..04a44f56d 100644 --- a/src/generated/resources/data/create/recipes/milling/bone_meal.json +++ b/src/generated/resources/data/create/recipes/milling/bone_meal.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:light_gray_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/cactus.json b/src/generated/resources/data/create/recipes/milling/cactus.json index 3f827b13f..eaed32b70 100644 --- a/src/generated/resources/data/create/recipes/milling/cactus.json +++ b/src/generated/resources/data/create/recipes/milling/cactus.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:green_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/charcoal.json b/src/generated/resources/data/create/recipes/milling/charcoal.json index e85668da1..e9e74f313 100644 --- a/src/generated/resources/data/create/recipes/milling/charcoal.json +++ b/src/generated/resources/data/create/recipes/milling/charcoal.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:black_dye", - "count": 1 + "item": "minecraft:black_dye" }, { "item": "minecraft:gray_dye", diff --git a/src/generated/resources/data/create/recipes/milling/clay.json b/src/generated/resources/data/create/recipes/milling/clay.json index fd2e6eb8e..0dda3c4e6 100644 --- a/src/generated/resources/data/create/recipes/milling/clay.json +++ b/src/generated/resources/data/create/recipes/milling/clay.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:clay_ball", - "count": 1, "chance": 0.5 } ], diff --git a/src/generated/resources/data/create/recipes/milling/coal.json b/src/generated/resources/data/create/recipes/milling/coal.json index 08fd5cba4..3935becba 100644 --- a/src/generated/resources/data/create/recipes/milling/coal.json +++ b/src/generated/resources/data/create/recipes/milling/coal.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:gray_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/cobblestone.json b/src/generated/resources/data/create/recipes/milling/cobblestone.json index 73bddb47e..0321b08fb 100644 --- a/src/generated/resources/data/create/recipes/milling/cobblestone.json +++ b/src/generated/resources/data/create/recipes/milling/cobblestone.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:gravel", - "count": 1 + "item": "minecraft:gravel" } ], "processingTime": 250 diff --git a/src/generated/resources/data/create/recipes/milling/cocoa_beans.json b/src/generated/resources/data/create/recipes/milling/cocoa_beans.json index 9bd6ff751..10e8f5685 100644 --- a/src/generated/resources/data/create/recipes/milling/cocoa_beans.json +++ b/src/generated/resources/data/create/recipes/milling/cocoa_beans.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:brown_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/copper_ore.json b/src/generated/resources/data/create/recipes/milling/copper_ore.json index 8dd6ac2d7..4d84da701 100644 --- a/src/generated/resources/data/create/recipes/milling/copper_ore.json +++ b/src/generated/resources/data/create/recipes/milling/copper_ore.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:crushed_copper_ore", - "count": 1 + "item": "create:crushed_copper_ore" } ], "processingTime": 350 diff --git a/src/generated/resources/data/create/recipes/milling/dandelion.json b/src/generated/resources/data/create/recipes/milling/dandelion.json index 7a075b62e..f65a7bb44 100644 --- a/src/generated/resources/data/create/recipes/milling/dandelion.json +++ b/src/generated/resources/data/create/recipes/milling/dandelion.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:yellow_dye", - "count": 1, "chance": 0.05 } ], diff --git a/src/generated/resources/data/create/recipes/milling/diorite.json b/src/generated/resources/data/create/recipes/milling/diorite.json index 03d738539..3d5c41325 100644 --- a/src/generated/resources/data/create/recipes/milling/diorite.json +++ b/src/generated/resources/data/create/recipes/milling/diorite.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:limesand", - "count": 1 + "item": "create:limesand" } ], "processingTime": 200 diff --git a/src/generated/resources/data/create/recipes/milling/fern.json b/src/generated/resources/data/create/recipes/milling/fern.json index 61c0647c6..cb1cf44ba 100644 --- a/src/generated/resources/data/create/recipes/milling/fern.json +++ b/src/generated/resources/data/create/recipes/milling/fern.json @@ -7,12 +7,10 @@ ], "results": [ { - "item": "minecraft:green_dye", - "count": 1 + "item": "minecraft:green_dye" }, { "item": "minecraft:wheat_seeds", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/gold_ore.json b/src/generated/resources/data/create/recipes/milling/gold_ore.json index c4268cfd5..35fe22b01 100644 --- a/src/generated/resources/data/create/recipes/milling/gold_ore.json +++ b/src/generated/resources/data/create/recipes/milling/gold_ore.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:crushed_gold_ore", - "count": 1 + "item": "create:crushed_gold_ore" } ], "processingTime": 300 diff --git a/src/generated/resources/data/create/recipes/milling/granite.json b/src/generated/resources/data/create/recipes/milling/granite.json index 4deb8938a..ed889ab04 100644 --- a/src/generated/resources/data/create/recipes/milling/granite.json +++ b/src/generated/resources/data/create/recipes/milling/granite.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:red_sand", - "count": 1 + "item": "minecraft:red_sand" } ], "processingTime": 200 diff --git a/src/generated/resources/data/create/recipes/milling/grass.json b/src/generated/resources/data/create/recipes/milling/grass.json index 4296a29a4..8752330f6 100644 --- a/src/generated/resources/data/create/recipes/milling/grass.json +++ b/src/generated/resources/data/create/recipes/milling/grass.json @@ -8,7 +8,6 @@ "results": [ { "item": "minecraft:wheat_seeds", - "count": 1, "chance": 0.25 } ], diff --git a/src/generated/resources/data/create/recipes/milling/gravel.json b/src/generated/resources/data/create/recipes/milling/gravel.json index 2f2936565..ed388d82e 100644 --- a/src/generated/resources/data/create/recipes/milling/gravel.json +++ b/src/generated/resources/data/create/recipes/milling/gravel.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:flint", - "count": 1 + "item": "minecraft:flint" } ], "processingTime": 250 diff --git a/src/generated/resources/data/create/recipes/milling/ink_sac.json b/src/generated/resources/data/create/recipes/milling/ink_sac.json index 80d8f92c4..eaf945d82 100644 --- a/src/generated/resources/data/create/recipes/milling/ink_sac.json +++ b/src/generated/resources/data/create/recipes/milling/ink_sac.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:gray_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/iron_ore.json b/src/generated/resources/data/create/recipes/milling/iron_ore.json index 6cedea49f..df42a64e6 100644 --- a/src/generated/resources/data/create/recipes/milling/iron_ore.json +++ b/src/generated/resources/data/create/recipes/milling/iron_ore.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:crushed_iron_ore", - "count": 1 + "item": "create:crushed_iron_ore" } ], "processingTime": 400 diff --git a/src/generated/resources/data/create/recipes/milling/lapis_lazuli.json b/src/generated/resources/data/create/recipes/milling/lapis_lazuli.json index 7e8dc7061..8a2d8a4c1 100644 --- a/src/generated/resources/data/create/recipes/milling/lapis_lazuli.json +++ b/src/generated/resources/data/create/recipes/milling/lapis_lazuli.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:blue_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/large_fern.json b/src/generated/resources/data/create/recipes/milling/large_fern.json index 820a2d3b4..3ec2fb126 100644 --- a/src/generated/resources/data/create/recipes/milling/large_fern.json +++ b/src/generated/resources/data/create/recipes/milling/large_fern.json @@ -12,12 +12,10 @@ }, { "item": "minecraft:green_dye", - "count": 1, "chance": 0.5 }, { "item": "minecraft:wheat_seeds", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/lilac.json b/src/generated/resources/data/create/recipes/milling/lilac.json index e996dab47..467fa0d3d 100644 --- a/src/generated/resources/data/create/recipes/milling/lilac.json +++ b/src/generated/resources/data/create/recipes/milling/lilac.json @@ -12,12 +12,10 @@ }, { "item": "minecraft:magenta_dye", - "count": 1, "chance": 0.25 }, { "item": "minecraft:purple_dye", - "count": 1, "chance": 0.25 } ], diff --git a/src/generated/resources/data/create/recipes/milling/lily_of_the_valley.json b/src/generated/resources/data/create/recipes/milling/lily_of_the_valley.json index 75f5061a8..789407824 100644 --- a/src/generated/resources/data/create/recipes/milling/lily_of_the_valley.json +++ b/src/generated/resources/data/create/recipes/milling/lily_of_the_valley.json @@ -12,12 +12,10 @@ }, { "item": "minecraft:lime_dye", - "count": 1, "chance": 0.1 }, { "item": "minecraft:white_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/orange_tulip.json b/src/generated/resources/data/create/recipes/milling/orange_tulip.json index 9bd63ec00..d44d7ee5f 100644 --- a/src/generated/resources/data/create/recipes/milling/orange_tulip.json +++ b/src/generated/resources/data/create/recipes/milling/orange_tulip.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:lime_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/oxeye_daisy.json b/src/generated/resources/data/create/recipes/milling/oxeye_daisy.json index b4bf83a33..350f969f2 100644 --- a/src/generated/resources/data/create/recipes/milling/oxeye_daisy.json +++ b/src/generated/resources/data/create/recipes/milling/oxeye_daisy.json @@ -12,12 +12,10 @@ }, { "item": "minecraft:white_dye", - "count": 1, "chance": 0.2 }, { "item": "minecraft:yellow_dye", - "count": 1, "chance": 0.05 } ], diff --git a/src/generated/resources/data/create/recipes/milling/peony.json b/src/generated/resources/data/create/recipes/milling/peony.json index 1c10dc7c1..64bbd8543 100644 --- a/src/generated/resources/data/create/recipes/milling/peony.json +++ b/src/generated/resources/data/create/recipes/milling/peony.json @@ -12,12 +12,10 @@ }, { "item": "minecraft:magenta_dye", - "count": 1, "chance": 0.25 }, { "item": "minecraft:pink_dye", - "count": 1, "chance": 0.25 } ], diff --git a/src/generated/resources/data/create/recipes/milling/pink_tulip.json b/src/generated/resources/data/create/recipes/milling/pink_tulip.json index 8503ef5b6..a13e6019b 100644 --- a/src/generated/resources/data/create/recipes/milling/pink_tulip.json +++ b/src/generated/resources/data/create/recipes/milling/pink_tulip.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:lime_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/poppy.json b/src/generated/resources/data/create/recipes/milling/poppy.json index 49e044999..f6e7ce581 100644 --- a/src/generated/resources/data/create/recipes/milling/poppy.json +++ b/src/generated/resources/data/create/recipes/milling/poppy.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:green_dye", - "count": 1, "chance": 0.05 } ], diff --git a/src/generated/resources/data/create/recipes/milling/red_tulip.json b/src/generated/resources/data/create/recipes/milling/red_tulip.json index 0bfeae5a4..a6690a32b 100644 --- a/src/generated/resources/data/create/recipes/milling/red_tulip.json +++ b/src/generated/resources/data/create/recipes/milling/red_tulip.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:lime_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/sand.json b/src/generated/resources/data/create/recipes/milling/sand.json index ed73b0f46..6fd344327 100644 --- a/src/generated/resources/data/create/recipes/milling/sand.json +++ b/src/generated/resources/data/create/recipes/milling/sand.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:limesand", - "count": 1 + "item": "create:limesand" } ], "processingTime": 150 diff --git a/src/generated/resources/data/create/recipes/milling/sugar_cane.json b/src/generated/resources/data/create/recipes/milling/sugar_cane.json index 6c6447858..43befa9f9 100644 --- a/src/generated/resources/data/create/recipes/milling/sugar_cane.json +++ b/src/generated/resources/data/create/recipes/milling/sugar_cane.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:sugar", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/sunflower.json b/src/generated/resources/data/create/recipes/milling/sunflower.json index 8152ef361..fb80872b4 100644 --- a/src/generated/resources/data/create/recipes/milling/sunflower.json +++ b/src/generated/resources/data/create/recipes/milling/sunflower.json @@ -12,12 +12,10 @@ }, { "item": "minecraft:orange_dye", - "count": 1, "chance": 0.25 }, { "item": "minecraft:yellow_dye", - "count": 1, "chance": 0.25 } ], diff --git a/src/generated/resources/data/create/recipes/milling/tall_grass.json b/src/generated/resources/data/create/recipes/milling/tall_grass.json index 0a424d6b2..f0ab1304f 100644 --- a/src/generated/resources/data/create/recipes/milling/tall_grass.json +++ b/src/generated/resources/data/create/recipes/milling/tall_grass.json @@ -8,7 +8,6 @@ "results": [ { "item": "minecraft:wheat_seeds", - "count": 1, "chance": 0.5 } ], diff --git a/src/generated/resources/data/create/recipes/milling/terracotta.json b/src/generated/resources/data/create/recipes/milling/terracotta.json index f6afd2d6c..9f7cbf58e 100644 --- a/src/generated/resources/data/create/recipes/milling/terracotta.json +++ b/src/generated/resources/data/create/recipes/milling/terracotta.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:red_sand", - "count": 1 + "item": "minecraft:red_sand" } ], "processingTime": 200 diff --git a/src/generated/resources/data/create/recipes/milling/wheat.json b/src/generated/resources/data/create/recipes/milling/wheat.json index 21a37e275..1ece092d6 100644 --- a/src/generated/resources/data/create/recipes/milling/wheat.json +++ b/src/generated/resources/data/create/recipes/milling/wheat.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:wheat_flour", - "count": 1 + "item": "create:wheat_flour" }, { "item": "create:wheat_flour", @@ -17,7 +16,6 @@ }, { "item": "minecraft:wheat_seeds", - "count": 1, "chance": 0.25 } ], diff --git a/src/generated/resources/data/create/recipes/milling/white_tulip.json b/src/generated/resources/data/create/recipes/milling/white_tulip.json index 6a8161037..cc96629e5 100644 --- a/src/generated/resources/data/create/recipes/milling/white_tulip.json +++ b/src/generated/resources/data/create/recipes/milling/white_tulip.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:lime_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/wither_rose.json b/src/generated/resources/data/create/recipes/milling/wither_rose.json index 36123474b..2564966e1 100644 --- a/src/generated/resources/data/create/recipes/milling/wither_rose.json +++ b/src/generated/resources/data/create/recipes/milling/wither_rose.json @@ -12,7 +12,6 @@ }, { "item": "minecraft:black_dye", - "count": 1, "chance": 0.1 } ], diff --git a/src/generated/resources/data/create/recipes/milling/wool.json b/src/generated/resources/data/create/recipes/milling/wool.json index 97a819e2b..2768e17ec 100644 --- a/src/generated/resources/data/create/recipes/milling/wool.json +++ b/src/generated/resources/data/create/recipes/milling/wool.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:string", - "count": 1 + "item": "minecraft:string" } ], "processingTime": 100 diff --git a/src/generated/resources/data/create/recipes/milling/zinc_ore.json b/src/generated/resources/data/create/recipes/milling/zinc_ore.json index ffb5b29bb..2b8242927 100644 --- a/src/generated/resources/data/create/recipes/milling/zinc_ore.json +++ b/src/generated/resources/data/create/recipes/milling/zinc_ore.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:crushed_zinc_ore", - "count": 1 + "item": "create:crushed_zinc_ore" } ], "processingTime": 350 diff --git a/src/generated/resources/data/create/recipes/mixing/andesite_alloy.json b/src/generated/resources/data/create/recipes/mixing/andesite_alloy.json index 8d1c20243..544783f51 100644 --- a/src/generated/resources/data/create/recipes/mixing/andesite_alloy.json +++ b/src/generated/resources/data/create/recipes/mixing/andesite_alloy.json @@ -10,8 +10,7 @@ ], "results": [ { - "item": "create:andesite_alloy", - "count": 1 + "item": "create:andesite_alloy" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/mixing/andesite_alloy_from_zinc.json b/src/generated/resources/data/create/recipes/mixing/andesite_alloy_from_zinc.json index dde956bfe..1f7b7d93e 100644 --- a/src/generated/resources/data/create/recipes/mixing/andesite_alloy_from_zinc.json +++ b/src/generated/resources/data/create/recipes/mixing/andesite_alloy_from_zinc.json @@ -10,8 +10,7 @@ ], "results": [ { - "item": "create:andesite_alloy", - "count": 1 + "item": "create:andesite_alloy" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/mixing/chromatic_compound.json b/src/generated/resources/data/create/recipes/mixing/chromatic_compound.json index a30ac51c3..ad36ad7cf 100644 --- a/src/generated/resources/data/create/recipes/mixing/chromatic_compound.json +++ b/src/generated/resources/data/create/recipes/mixing/chromatic_compound.json @@ -25,8 +25,7 @@ ], "results": [ { - "item": "create:chromatic_compound", - "count": 1 + "item": "create:chromatic_compound" } ], "heatRequirement": "superheated" diff --git a/src/generated/resources/data/create/recipes/mixing/temp_cobble.json b/src/generated/resources/data/create/recipes/mixing/temp_cobble.json index def4cc8c2..79e364c1d 100644 --- a/src/generated/resources/data/create/recipes/mixing/temp_cobble.json +++ b/src/generated/resources/data/create/recipes/mixing/temp_cobble.json @@ -14,8 +14,7 @@ ], "results": [ { - "item": "minecraft:cobblestone", - "count": 1 + "item": "minecraft:cobblestone" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/brass_ingot.json b/src/generated/resources/data/create/recipes/pressing/brass_ingot.json index 5c499ec8a..65e8c94f2 100644 --- a/src/generated/resources/data/create/recipes/pressing/brass_ingot.json +++ b/src/generated/resources/data/create/recipes/pressing/brass_ingot.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:brass_sheet", - "count": 1 + "item": "create:brass_sheet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/copper_ingot.json b/src/generated/resources/data/create/recipes/pressing/copper_ingot.json index 02aef9044..404bb276d 100644 --- a/src/generated/resources/data/create/recipes/pressing/copper_ingot.json +++ b/src/generated/resources/data/create/recipes/pressing/copper_ingot.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:copper_sheet", - "count": 1 + "item": "create:copper_sheet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/gold_ingot.json b/src/generated/resources/data/create/recipes/pressing/gold_ingot.json index 701617f27..ff5c48800 100644 --- a/src/generated/resources/data/create/recipes/pressing/gold_ingot.json +++ b/src/generated/resources/data/create/recipes/pressing/gold_ingot.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:golden_sheet", - "count": 1 + "item": "create:golden_sheet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/iron_ingot.json b/src/generated/resources/data/create/recipes/pressing/iron_ingot.json index fd85bea05..0bf57eb5f 100644 --- a/src/generated/resources/data/create/recipes/pressing/iron_ingot.json +++ b/src/generated/resources/data/create/recipes/pressing/iron_ingot.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:iron_sheet", - "count": 1 + "item": "create:iron_sheet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/lapis_block.json b/src/generated/resources/data/create/recipes/pressing/lapis_block.json index f68528d3f..7551fecd2 100644 --- a/src/generated/resources/data/create/recipes/pressing/lapis_block.json +++ b/src/generated/resources/data/create/recipes/pressing/lapis_block.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:lapis_sheet", - "count": 1 + "item": "create:lapis_sheet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/sugar_cane.json b/src/generated/resources/data/create/recipes/pressing/sugar_cane.json index 87a604c77..4dc282598 100644 --- a/src/generated/resources/data/create/recipes/pressing/sugar_cane.json +++ b/src/generated/resources/data/create/recipes/pressing/sugar_cane.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:paper", - "count": 1 + "item": "minecraft:paper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/sandpaper_polishing/rose_quartz.json b/src/generated/resources/data/create/recipes/sandpaper_polishing/rose_quartz.json index 2c25f2400..2b97eb1d7 100644 --- a/src/generated/resources/data/create/recipes/sandpaper_polishing/rose_quartz.json +++ b/src/generated/resources/data/create/recipes/sandpaper_polishing/rose_quartz.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:polished_rose_quartz", - "count": 1 + "item": "create:polished_rose_quartz" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/black_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/black_concrete_powder.json index be410a1b9..8d5f5ff48 100644 --- a/src/generated/resources/data/create/recipes/splashing/black_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/black_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:black_concrete", - "count": 1 + "item": "minecraft:black_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/blue_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/blue_concrete_powder.json index 80be1c465..99a659f47 100644 --- a/src/generated/resources/data/create/recipes/splashing/blue_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/blue_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:blue_concrete", - "count": 1 + "item": "minecraft:blue_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/brown_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/brown_concrete_powder.json index 63fadb792..c4e4c6d70 100644 --- a/src/generated/resources/data/create/recipes/splashing/brown_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/brown_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:brown_concrete", - "count": 1 + "item": "minecraft:brown_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/cyan_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/cyan_concrete_powder.json index f8815092e..e98f3d894 100644 --- a/src/generated/resources/data/create/recipes/splashing/cyan_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/cyan_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:cyan_concrete", - "count": 1 + "item": "minecraft:cyan_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/gravel.json b/src/generated/resources/data/create/recipes/splashing/gravel.json index 0df5f9371..602fbd3f6 100644 --- a/src/generated/resources/data/create/recipes/splashing/gravel.json +++ b/src/generated/resources/data/create/recipes/splashing/gravel.json @@ -8,12 +8,10 @@ "results": [ { "item": "minecraft:flint", - "count": 1, "chance": 0.25 }, { "item": "minecraft:iron_nugget", - "count": 1, "chance": 0.125 } ] diff --git a/src/generated/resources/data/create/recipes/splashing/gray_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/gray_concrete_powder.json index f57928364..0985ce78d 100644 --- a/src/generated/resources/data/create/recipes/splashing/gray_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/gray_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:gray_concrete", - "count": 1 + "item": "minecraft:gray_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/green_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/green_concrete_powder.json index a5bfc4a8c..a45b2eae7 100644 --- a/src/generated/resources/data/create/recipes/splashing/green_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/green_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:green_concrete", - "count": 1 + "item": "minecraft:green_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/ice.json b/src/generated/resources/data/create/recipes/splashing/ice.json index d5002d565..52d0b4a39 100644 --- a/src/generated/resources/data/create/recipes/splashing/ice.json +++ b/src/generated/resources/data/create/recipes/splashing/ice.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:packed_ice", - "count": 1 + "item": "minecraft:packed_ice" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/light_blue_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/light_blue_concrete_powder.json index cc226489d..12399826b 100644 --- a/src/generated/resources/data/create/recipes/splashing/light_blue_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/light_blue_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:light_blue_concrete", - "count": 1 + "item": "minecraft:light_blue_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/light_gray_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/light_gray_concrete_powder.json index b99c4337a..91e6a801a 100644 --- a/src/generated/resources/data/create/recipes/splashing/light_gray_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/light_gray_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:light_gray_concrete", - "count": 1 + "item": "minecraft:light_gray_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/lime_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/lime_concrete_powder.json index 21439c2d7..6e3ec7eb5 100644 --- a/src/generated/resources/data/create/recipes/splashing/lime_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/lime_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:lime_concrete", - "count": 1 + "item": "minecraft:lime_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/limestone.json b/src/generated/resources/data/create/recipes/splashing/limestone.json index c9ba671c0..07219c334 100644 --- a/src/generated/resources/data/create/recipes/splashing/limestone.json +++ b/src/generated/resources/data/create/recipes/splashing/limestone.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:weathered_limestone", - "count": 1 + "item": "create:weathered_limestone" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/magenta_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/magenta_concrete_powder.json index 2fffbbde1..942a187e9 100644 --- a/src/generated/resources/data/create/recipes/splashing/magenta_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/magenta_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:magenta_concrete", - "count": 1 + "item": "minecraft:magenta_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/magma_block.json b/src/generated/resources/data/create/recipes/splashing/magma_block.json index 42ea897a9..94ed7270a 100644 --- a/src/generated/resources/data/create/recipes/splashing/magma_block.json +++ b/src/generated/resources/data/create/recipes/splashing/magma_block.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:obsidian", - "count": 1 + "item": "minecraft:obsidian" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/orange_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/orange_concrete_powder.json index 3ecbb2ca2..b297de66b 100644 --- a/src/generated/resources/data/create/recipes/splashing/orange_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/orange_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:orange_concrete", - "count": 1 + "item": "minecraft:orange_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/pink_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/pink_concrete_powder.json index 095ad54c8..068f82a40 100644 --- a/src/generated/resources/data/create/recipes/splashing/pink_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/pink_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:pink_concrete", - "count": 1 + "item": "minecraft:pink_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/purple_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/purple_concrete_powder.json index 09bd18055..cbfdfda1e 100644 --- a/src/generated/resources/data/create/recipes/splashing/purple_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/purple_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:purple_concrete", - "count": 1 + "item": "minecraft:purple_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/red_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/red_concrete_powder.json index d5ca0f3d8..e9564f59f 100644 --- a/src/generated/resources/data/create/recipes/splashing/red_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/red_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:red_concrete", - "count": 1 + "item": "minecraft:red_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/red_sand.json b/src/generated/resources/data/create/recipes/splashing/red_sand.json index 644d6b492..33cf956da 100644 --- a/src/generated/resources/data/create/recipes/splashing/red_sand.json +++ b/src/generated/resources/data/create/recipes/splashing/red_sand.json @@ -13,7 +13,6 @@ }, { "item": "minecraft:dead_bush", - "count": 1, "chance": 0.05 } ] diff --git a/src/generated/resources/data/create/recipes/splashing/sand.json b/src/generated/resources/data/create/recipes/splashing/sand.json index 32360453e..6869d9d25 100644 --- a/src/generated/resources/data/create/recipes/splashing/sand.json +++ b/src/generated/resources/data/create/recipes/splashing/sand.json @@ -8,7 +8,6 @@ "results": [ { "item": "minecraft:clay_ball", - "count": 1, "chance": 0.25 } ] diff --git a/src/generated/resources/data/create/recipes/splashing/soul_sand.json b/src/generated/resources/data/create/recipes/splashing/soul_sand.json index 2e1fa5c37..21b7a45a6 100644 --- a/src/generated/resources/data/create/recipes/splashing/soul_sand.json +++ b/src/generated/resources/data/create/recipes/splashing/soul_sand.json @@ -13,7 +13,6 @@ }, { "item": "minecraft:gold_nugget", - "count": 1, "chance": 0.02 } ] diff --git a/src/generated/resources/data/create/recipes/splashing/stained_glass.json b/src/generated/resources/data/create/recipes/splashing/stained_glass.json index b2a019444..8adea4a15 100644 --- a/src/generated/resources/data/create/recipes/splashing/stained_glass.json +++ b/src/generated/resources/data/create/recipes/splashing/stained_glass.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:glass", - "count": 1 + "item": "minecraft:glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/stained_glass_pane.json b/src/generated/resources/data/create/recipes/splashing/stained_glass_pane.json index 8ced73dc7..456d1df38 100644 --- a/src/generated/resources/data/create/recipes/splashing/stained_glass_pane.json +++ b/src/generated/resources/data/create/recipes/splashing/stained_glass_pane.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:glass_pane", - "count": 1 + "item": "minecraft:glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/wheat_flour.json b/src/generated/resources/data/create/recipes/splashing/wheat_flour.json index d7bd89482..3c9a2baa3 100644 --- a/src/generated/resources/data/create/recipes/splashing/wheat_flour.json +++ b/src/generated/resources/data/create/recipes/splashing/wheat_flour.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "create:dough", - "count": 1 + "item": "create:dough" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/white_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/white_concrete_powder.json index cdec48afa..eef7261c7 100644 --- a/src/generated/resources/data/create/recipes/splashing/white_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/white_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:white_concrete", - "count": 1 + "item": "minecraft:white_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/wool.json b/src/generated/resources/data/create/recipes/splashing/wool.json index 2f50ff88f..9d859392f 100644 --- a/src/generated/resources/data/create/recipes/splashing/wool.json +++ b/src/generated/resources/data/create/recipes/splashing/wool.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:white_wool", - "count": 1 + "item": "minecraft:white_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/yellow_concrete_powder.json b/src/generated/resources/data/create/recipes/splashing/yellow_concrete_powder.json index f7f60ad05..2e319a600 100644 --- a/src/generated/resources/data/create/recipes/splashing/yellow_concrete_powder.json +++ b/src/generated/resources/data/create/recipes/splashing/yellow_concrete_powder.json @@ -7,8 +7,7 @@ ], "results": [ { - "item": "minecraft:yellow_concrete", - "count": 1 + "item": "minecraft:yellow_concrete" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/impermeable.json b/src/generated/resources/data/minecraft/tags/blocks/impermeable.json new file mode 100644 index 000000000..4c49ba81a --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/impermeable.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "create:tiled_glass", + "create:framed_glass", + "create:horizontal_framed_glass", + "create:vertical_framed_glass", + "create:oak_window", + "create:spruce_window", + "create:birch_window", + "create:jungle_window", + "create:acacia_window", + "create:dark_oak_window", + "create:ornate_iron_window" + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java index 5dfceef48..796400fc7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java @@ -26,7 +26,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.EquipmentSlotType; @@ -294,7 +293,10 @@ public class DeployerHandler { itemUseWorld = new ItemUseWorld(world, face, pos); ActionResult onItemRightClick = item.onItemRightClick(itemUseWorld, player, hand); - player.setHeldItem(hand, onItemRightClick.getResult()); + ItemStack resultStack = onItemRightClick.getResult(); + if (resultStack != stack || resultStack.getCount() != stack.getCount() || resultStack.getUseDuration() > 0 || resultStack.getDamage() != stack.getDamage()) { + player.setHeldItem(hand, onItemRightClick.getResult()); + } CompoundNBT tag = stack.getTag(); if (tag != null && stack.getItem() instanceof SandPaperItem && tag.contains("Polishing")) @@ -349,7 +351,7 @@ public class DeployerHandler { interactionManager.world.updateComparatorOutputLevel(clickedPos, state.getBlock()); } - CriteriaTriggers.BEE_NEST_DESTROYED.test((ServerPlayerEntity) interactionManager.player, + CriteriaTriggers.BEE_NEST_DESTROYED.test(interactionManager.player, state.getBlock(), heldItem, beehivetileentity.getBeeCount()); } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java index ba638028b..54f1df414 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java @@ -47,8 +47,6 @@ public class SuperGlueHandler { if (entity == null || world == null || pos == null) return; - if (event.isCanceled()) - return; if (world.isRemote()) return; @@ -79,7 +77,7 @@ public class SuperGlueHandler { new RayTraceContext(start, end, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, placer)); Direction face = ray.getFace(); - if (ray == null || face == null || ray.getType() == Type.MISS) + if (face == null || ray.getType() == Type.MISS) return; if (!ray.getPos() diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java index b0c1d85b1..cd3ef48eb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java @@ -54,7 +54,9 @@ public class ProcessingOutput { json.addProperty("item", stack.getItem() .getRegistryName() .toString()); - json.addProperty("count", stack.getCount()); + if (stack.getCount() != 1) { + json.addProperty("count", stack.getCount()); + } if (stack.hasTag()) json.add("nbt", new JsonParser().parse(stack.getTag().toString())); if (chance != 1) @@ -68,7 +70,7 @@ public class ProcessingOutput { JsonObject json = je.getAsJsonObject(); String itemId = JSONUtils.getString(json, "item"); - int count = JSONUtils.getInt(json, "count"); + int count = JSONUtils.getInt(json, "count", 1); float chance = JSONUtils.hasField(json, "chance") ? JSONUtils.getFloat(json, "chance") : 1; ItemStack itemstack = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemId)), count); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java index 32b9e61d9..cd070dcbb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java @@ -392,7 +392,7 @@ public class BeltInventory { float movementSpeed = Math.max(Math.abs(belt.getBeltMovementSpeed()), 1 / 8f); Vec3d outMotion = new Vec3d(belt.getBeltChainDirection()).scale(movementSpeed) .add(0, 1 / 8f, 0); - outPos.add(outMotion.normalize()); + outPos = outPos.add(outMotion.normalize().scale(0.001)); ItemEntity entity = new ItemEntity(belt.getWorld(), outPos.x, outPos.y + 6 / 16f, outPos.z, ejected); entity.setMotion(outMotion); entity.setDefaultPickupDelay(); diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java index 727e78ef0..5a72085bc 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java @@ -20,16 +20,15 @@ import net.minecraft.entity.projectile.ProjectileHelper; import net.minecraft.item.Item; import net.minecraft.item.Rarity; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult.Type; import net.minecraft.util.math.Vec3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.InputEvent.ClickInputEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.event.entity.living.LivingKnockBackEvent; import net.minecraftforge.event.entity.player.AttackEntityEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -64,8 +63,6 @@ public class ExtendoGripItem extends Item { public static void holdingExtendoGripIncreasesRange(LivingUpdateEvent event) { if (!(event.getEntity() instanceof PlayerEntity)) return; - if (event.isCanceled()) - return; PlayerEntity player = (PlayerEntity) event.getEntityLiving(); String marker = "createExtendo"; @@ -149,23 +146,14 @@ public class ExtendoGripItem extends Item { } @SubscribeEvent - public static void attacksByExtendoGripHaveMoreKnockback(AttackEntityEvent event) { - Entity entity = event.getEntity(); + public static void attacksByExtendoGripHaveMoreKnockback(LivingKnockBackEvent event) { + Entity entity = event.getAttacker(); if (!(entity instanceof PlayerEntity)) return; PlayerEntity player = (PlayerEntity) entity; if (!isHoldingExtendoGrip(player)) return; - Entity target = event.getTarget(); - if (target instanceof ItemFrameEntity || !target.attackEntityFrom(DamageSource.causePlayerDamage(player), 0)) - return; - int strength = 2; - float yaw = entity.rotationYaw * ((float) Math.PI / 180F); - if (target instanceof LivingEntity) { - ((LivingEntity) target).knockBack(entity, strength, MathHelper.sin(yaw), -MathHelper.cos(yaw)); - return; - } - target.addVelocity(-MathHelper.sin(yaw) * strength, 0.1D, MathHelper.cos(yaw) * strength); + event.setStrength(event.getStrength() + 2); } private static boolean isUncaughtClientInteraction(Entity entity, Entity target) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java index 1093c1be4..fe428b05d 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java @@ -141,8 +141,6 @@ public class ZapperRenderHandler { ItemStack heldItem = event.getItemStack(); if (!(heldItem.getItem() instanceof ZapperItem)) return; - if (event.isCanceled()) - return; Minecraft mc = Minecraft.getInstance(); boolean rightHand = event.getHand() == Hand.MAIN_HAND ^ mc.player.getPrimaryHand() == HandSide.LEFT; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmPlacementPacket.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmPlacementPacket.java index dcc51b7f7..7ed4f378e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmPlacementPacket.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmPlacementPacket.java @@ -53,10 +53,10 @@ public class ArmPlacementPacket extends SimplePacketBase { if (player == null) return; World world = player.world; - if (world == null) + if (world == null || !world.isBlockPresent(pos)) return; TileEntity tileEntity = world.getTileEntity(pos); - if (tileEntity == null || !(tileEntity instanceof ArmTileEntity)) + if (!(tileEntity instanceof ArmTileEntity)) return; ArmTileEntity arm = (ArmTileEntity) tileEntity; diff --git a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java index 538c715b7..2ad7578b0 100644 --- a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java +++ b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java @@ -29,6 +29,7 @@ import net.minecraft.block.GlassBlock; import net.minecraft.block.SandBlock; import net.minecraft.block.WoodType; import net.minecraft.client.renderer.RenderType; +import net.minecraft.tags.BlockTags; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; @@ -45,7 +46,7 @@ public class AllPaletteBlocks { .addLayer(() -> RenderType::getCutoutMipped) .recipe((c, p) -> p.stonecutting(DataIngredient.tag(Tags.Items.GLASS_COLORLESS), c::get)) .blockstate(palettesCubeAll()) - .tag(Tags.Blocks.GLASS_COLORLESS) + .tag(Tags.Blocks.GLASS_COLORLESS, BlockTags.IMPERMEABLE) .item() .tag(Tags.Items.GLASS_COLORLESS) .build() diff --git a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java index 7d37253bb..cf25eaa11 100644 --- a/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java @@ -2,7 +2,10 @@ package com.simibubi.create.content.palettes; import net.minecraft.block.BlockState; import net.minecraft.block.GlassBlock; +import net.minecraft.fluid.IFluidState; import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ILightReader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -19,4 +22,9 @@ public class ConnectedGlassBlock extends GlassBlock { : super.isSideInvisible(state, adjacentBlockState, side); } + @Override + public boolean shouldDisplayFluidOverlay(BlockState state, ILightReader world, BlockPos pos, IFluidState fluidState) { + return true; + } + } diff --git a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java index 04658f84b..8aa9546ca 100644 --- a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java +++ b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java @@ -181,6 +181,14 @@ public abstract class PaletteBlockPartial { p.slab(source, result, c.getName(), true); } + @Override + protected BlockBuilder transformBlock( + BlockBuilder builder, + String variantName, PaletteBlockPatterns pattern) { + builder.loot((lt, block) -> lt.registerLootTable(block, lt.droppingSlab(block))); + return super.transformBlock(builder, variantName, pattern); + } + } private static class Wall extends PaletteBlockPartial { diff --git a/src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java b/src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java index 0cb77977b..4aa3cdbe4 100644 --- a/src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java +++ b/src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java @@ -87,8 +87,10 @@ public class SchematicWorld extends WrappedWorld { BlockState blockState = getBlockState(pos); if (blockState.hasTileEntity()) { TileEntity tileEntity = blockState.createTileEntity(this); - tileEntity.setLocation(this, pos); - tileEntities.put(pos, tileEntity); + if (tileEntity != null) { + tileEntity.setLocation(this, pos); + tileEntities.put(pos, tileEntity); + } return tileEntity; } return null; diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java index 2ac1b6b8d..5e69e7abd 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java @@ -12,9 +12,9 @@ import com.simibubi.create.content.schematics.SchematicWorld; import com.simibubi.create.content.schematics.client.tools.Tools; import com.simibubi.create.content.schematics.item.SchematicItem; import com.simibubi.create.content.schematics.packet.SchematicPlacePacket; +import com.simibubi.create.content.schematics.packet.SchematicSyncPacket; import com.simibubi.create.foundation.gui.ToolSelectionScreen; import com.simibubi.create.foundation.networking.AllPackets; -import com.simibubi.create.foundation.networking.NbtPacket; import com.simibubi.create.foundation.renderState.SuperRenderTypeBuffer; import com.simibubi.create.foundation.utility.outliner.AABBOutline; @@ -272,17 +272,7 @@ public class SchematicHandler { public void sync() { if (activeSchematicItem == null) return; - - PlacementSettings settings = transformation.toSettings(); - CompoundNBT tag = activeSchematicItem.getTag(); - tag.putBoolean("Deployed", deployed); - tag.put("Anchor", NBTUtil.writeBlockPos(transformation.getAnchor())); - tag.putString("Rotation", settings.getRotation() - .name()); - tag.putString("Mirror", settings.getMirror() - .name()); - - AllPackets.channel.sendToServer(new NbtPacket(activeSchematicItem, activeHotbarSlot)); + AllPackets.channel.sendToServer(new SchematicSyncPacket(activeHotbarSlot, transformation.toSettings(), transformation.getAnchor(), deployed)); } public void equip(Tools tool) { diff --git a/src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java b/src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java index c69f1f822..4a5984e77 100644 --- a/src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java +++ b/src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java @@ -52,7 +52,7 @@ public class ConfigureSchematicannonPacket extends SimplePacketBase { if (player == null) return; World world = player.world; - if (world == null) + if (world == null || !world.isBlockPresent(pos)) return; TileEntity tileEntity = world.getTileEntity(pos); diff --git a/src/main/java/com/simibubi/create/content/schematics/packet/SchematicSyncPacket.java b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicSyncPacket.java new file mode 100644 index 000000000..1e7c6f861 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicSyncPacket.java @@ -0,0 +1,77 @@ +package com.simibubi.create.content.schematics.packet; + +import java.util.function.Supplier; + +import com.simibubi.create.AllItems; +import com.simibubi.create.foundation.networking.SimplePacketBase; + +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.gen.feature.template.PlacementSettings; +import net.minecraftforge.fml.network.NetworkEvent.Context; + +public class SchematicSyncPacket extends SimplePacketBase { + + public int slot; + public boolean deployed; + public BlockPos anchor; + public Rotation rotation; + public Mirror mirror; + + public SchematicSyncPacket(int slot, PlacementSettings settings, + BlockPos anchor, boolean deployed) { + this.slot = slot; + this.deployed = deployed; + this.anchor = anchor; + this.rotation = settings.getRotation(); + this.mirror = settings.getMirror(); + } + + public SchematicSyncPacket(PacketBuffer buffer) { + slot = buffer.readVarInt(); + deployed = buffer.readBoolean(); + anchor = buffer.readBlockPos(); + rotation = buffer.readEnumValue(Rotation.class); + mirror = buffer.readEnumValue(Mirror.class); + } + + @Override + public void write(PacketBuffer buffer) { + buffer.writeVarInt(slot); + buffer.writeBoolean(deployed); + buffer.writeBlockPos(anchor); + buffer.writeEnumValue(rotation); + buffer.writeEnumValue(mirror); + } + + @Override + public void handle(Supplier context) { + context.get().enqueueWork(() -> { + ServerPlayerEntity player = context.get().getSender(); + if (player == null) + return; + ItemStack stack = ItemStack.EMPTY; + if (slot == -1) { + stack = player.getHeldItemMainhand(); + } else { + stack = player.inventory.getStackInSlot(slot); + } + if (!AllItems.SCHEMATIC.isIn(stack)) { + return; + } + CompoundNBT tag = stack.getOrCreateTag(); + tag.putBoolean("Deployed", deployed); + tag.put("Anchor", NBTUtil.writeBlockPos(anchor)); + tag.putString("Rotation", rotation.name()); + tag.putString("Mirror", mirror.name()); + }); + context.get().setPacketHandled(true); + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/data/WindowGen.java b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java index 5409a8f36..68a20a423 100644 --- a/src/main/java/com/simibubi/create/foundation/data/WindowGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java @@ -29,6 +29,7 @@ import net.minecraft.block.Blocks; import net.minecraft.block.WoodType; import net.minecraft.client.renderer.RenderType; import net.minecraft.data.ShapedRecipeBuilder; +import net.minecraft.tags.BlockTags; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ModelFile; @@ -77,6 +78,7 @@ public class WindowGen { .loot((t, g) -> t.registerSilkTouch(g)) .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() .cubeColumn(c.getName(), sideTexture.apply(c.getName()), endTexture.apply(c.getName())))) + .tag(BlockTags.IMPERMEABLE) .simpleItem() .register(); } @@ -89,7 +91,7 @@ public class WindowGen { .loot((t, g) -> t.registerSilkTouch(g)) .recipe((c, p) -> p.stonecutting(DataIngredient.tag(Tags.Items.GLASS_COLORLESS), c::get)) .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/", "framed_glass")) - .tag(Tags.Blocks.GLASS_COLORLESS) + .tag(Tags.Blocks.GLASS_COLORLESS, BlockTags.IMPERMEABLE) .item() .tag(Tags.Items.GLASS_COLORLESS) .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc(palettesDir() + c.getName()), diff --git a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java index 8b856cf94..34a0d6eb2 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java +++ b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java @@ -32,7 +32,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IItemProvider; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.fluids.FluidStack; public class GuiGameElement { @@ -173,7 +172,8 @@ public class GuiGameElement { protected void renderModel(BlockRendererDispatcher blockRenderer, IRenderTypeBuffer.Impl buffer, RenderType renderType, IVertexBuilder vb, MatrixStack ms) { - Vec3d rgb = ColorHelper.getRGB(color); + int color = Minecraft.getInstance().getBlockColors().getColor(blockState, null, null, 0); + Vec3d rgb = ColorHelper.getRGB(color == -1 ? this.color : color); blockRenderer.getBlockModelRenderer() .renderModel(ms.peek(), vb, blockState, blockmodel, (float) rgb.x, (float) rgb.y, (float) rgb.z, 0xF000F0, OverlayTexture.DEFAULT_UV, VirtualEmptyModelData.INSTANCE); diff --git a/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java b/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java index da3a40a23..22a225e60 100644 --- a/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java @@ -108,7 +108,7 @@ public class ItemHelper { .increment(); continue Ingredients; } - if (!ItemStack.areItemsEqual(stacks1[i], stacks2[i])) + if (!ItemStack.areItemStacksEqual(stacks1[i], stacks2[i])) break; } } diff --git a/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java b/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java index f1dad8e0e..8feb79656 100644 --- a/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java +++ b/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java @@ -26,6 +26,7 @@ import com.simibubi.create.content.schematics.packet.ConfigureSchematicannonPack import com.simibubi.create.content.schematics.packet.InstantSchematicPacket; import com.simibubi.create.content.schematics.packet.SchematicPlacePacket; import com.simibubi.create.content.schematics.packet.SchematicUploadPacket; +import com.simibubi.create.content.schematics.packet.SchematicSyncPacket; import com.simibubi.create.foundation.command.ConfigureConfigPacket; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringCountUpdatePacket; import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueUpdatePacket; @@ -60,6 +61,7 @@ public enum AllPackets { PLACE_ARM(ArmPlacementPacket.class, ArmPlacementPacket::new), MINECART_COUPLING_CREATION(CouplingCreationPacket.class, CouplingCreationPacket::new), INSTANT_SCHEMATIC(InstantSchematicPacket.class, InstantSchematicPacket::new), + SYNC_SCHEMATIC(SchematicSyncPacket.class, SchematicSyncPacket::new), // Server to Client SYMMETRY_EFFECT(SymmetryEffectPacket.class, SymmetryEffectPacket::new), diff --git a/src/main/java/com/simibubi/create/foundation/networking/NbtPacket.java b/src/main/java/com/simibubi/create/foundation/networking/NbtPacket.java index 2ea47f60a..27e60d111 100644 --- a/src/main/java/com/simibubi/create/foundation/networking/NbtPacket.java +++ b/src/main/java/com/simibubi/create/foundation/networking/NbtPacket.java @@ -2,12 +2,16 @@ package com.simibubi.create.foundation.networking; import java.util.function.Supplier; +import com.simibubi.create.content.curiosities.symmetry.SymmetryWandItem; +import com.simibubi.create.content.curiosities.zapper.ZapperItem; + import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.util.Hand; import net.minecraftforge.fml.network.NetworkEvent.Context; +@Deprecated public class NbtPacket extends SimplePacketBase { public ItemStack stack; @@ -42,7 +46,10 @@ public class NbtPacket extends SimplePacketBase { ServerPlayerEntity player = context.get().getSender(); if (player == null) return; - + if (!(stack.getItem() instanceof SymmetryWandItem || stack.getItem() instanceof ZapperItem)) { + return; + } + stack.removeChildTag("AttributeModifiers"); if (slot == -1) { ItemStack heldItem = player.getHeldItem(hand); if (heldItem.getItem() == stack.getItem()) { diff --git a/src/main/java/com/simibubi/create/foundation/networking/TileEntityConfigurationPacket.java b/src/main/java/com/simibubi/create/foundation/networking/TileEntityConfigurationPacket.java index ba3bd1f3b..8260a5821 100644 --- a/src/main/java/com/simibubi/create/foundation/networking/TileEntityConfigurationPacket.java +++ b/src/main/java/com/simibubi/create/foundation/networking/TileEntityConfigurationPacket.java @@ -39,7 +39,7 @@ public abstract class TileEntityConfigurationPacket return; World world = player.world; - if (world == null || world.getTileEntity(pos) == null) + if (world == null || !world.isBlockPresent(pos)) return; TileEntity tileEntity = world.getTileEntity(pos); if (tileEntity instanceof SyncedTileEntity) { diff --git a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java index c5fd57453..6f3eaa605 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java @@ -87,6 +87,12 @@ public class BlockHelper { return blockState.with(BlockStateProperties.HATCH_0_2, 0); if (blockState.has(BlockStateProperties.STAGE_0_1)) return blockState.with(BlockStateProperties.STAGE_0_1, 0); + if (blockState.has(BlockStateProperties.LEVEL_0_3)) + return blockState.with(BlockStateProperties.LEVEL_0_3, 0); + if (blockState.has(BlockStateProperties.LEVEL_0_8)) + return blockState.with(BlockStateProperties.LEVEL_0_8, 0); + if (blockState.has(BlockStateProperties.EXTENDED)) + return blockState.with(BlockStateProperties.EXTENDED, false); return blockState; }