From 073e3980eee75e39aa2d24caa1d7fa74ca9f817d Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sun, 8 Nov 2020 16:29:58 +0800 Subject: [PATCH 01/12] Fix water rendering overlay on glass blocks --- .../data/minecraft/tags/blocks/impermeable.json | 16 ++++++++++++++++ .../content/palettes/AllPaletteBlocks.java | 3 ++- .../content/palettes/ConnectedGlassBlock.java | 8 ++++++++ .../create/foundation/data/WindowGen.java | 4 +++- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/impermeable.json 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/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/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()), From 428dda58e7a9e31e2540d608409665480ee9afbd Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sun, 8 Nov 2020 16:30:55 +0800 Subject: [PATCH 02/12] Fix deployer duplicating Quark pickarang --- .../contraptions/components/deployer/DeployerHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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()); } } From 5958370900b6eaec90dd05d1f3e9b4c2f6e4af22 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sun, 8 Nov 2020 17:30:40 +0800 Subject: [PATCH 03/12] Give ProcessingOutput a default count --- src/generated/resources/.cache/cache | 223 +++++++++--------- .../assets/create/blockstates/fluid_pipe.json | 154 ++++++------ .../create/blockstates/radial_chassis.json | 48 ++-- .../create/recipes/compacting/blaze_cake.json | 3 +- .../create/recipes/crushing/coal_ore.json | 1 - .../create/recipes/crushing/copper_ore.json | 4 +- .../recipes/crushing/diamond_horse_armor.json | 3 +- .../create/recipes/crushing/emerald_ore.json | 2 - .../create/recipes/crushing/glowstone.json | 1 - .../create/recipes/crushing/gold_ore.json | 4 +- .../data/create/recipes/crushing/gravel.json | 5 +- .../recipes/crushing/iron_horse_armor.json | 2 - .../create/recipes/crushing/iron_ore.json | 4 +- .../create/recipes/crushing/lapis_ore.json | 1 - .../recipes/crushing/nether_quartz_ore.json | 1 - .../create/recipes/crushing/netherrack.json | 4 +- .../create/recipes/crushing/obsidian.json | 4 +- .../create/recipes/crushing/redstone_ore.json | 1 - .../data/create/recipes/crushing/sand.json | 5 +- .../data/create/recipes/crushing/wool.json | 1 - .../create/recipes/crushing/zinc_ore.json | 4 +- .../create/recipes/cutting/acacia_log.json | 3 +- .../create/recipes/cutting/acacia_wood.json | 3 +- .../create/recipes/cutting/birch_log.json | 3 +- .../create/recipes/cutting/birch_wood.json | 3 +- .../create/recipes/cutting/dark_oak_log.json | 3 +- .../create/recipes/cutting/dark_oak_wood.json | 3 +- .../create/recipes/cutting/jungle_log.json | 3 +- .../create/recipes/cutting/jungle_wood.json | 3 +- .../data/create/recipes/cutting/oak_log.json | 3 +- .../data/create/recipes/cutting/oak_wood.json | 3 +- .../create/recipes/cutting/spruce_log.json | 3 +- .../create/recipes/cutting/spruce_wood.json | 3 +- .../data/create/recipes/milling/allium.json | 1 - .../data/create/recipes/milling/andesite.json | 3 +- .../create/recipes/milling/blue_orchid.json | 1 - .../data/create/recipes/milling/bone.json | 1 - .../create/recipes/milling/bone_meal.json | 1 - .../data/create/recipes/milling/cactus.json | 1 - .../data/create/recipes/milling/charcoal.json | 3 +- .../data/create/recipes/milling/clay.json | 1 - .../data/create/recipes/milling/coal.json | 1 - .../create/recipes/milling/cobblestone.json | 3 +- .../create/recipes/milling/cocoa_beans.json | 1 - .../create/recipes/milling/copper_ore.json | 3 +- .../create/recipes/milling/dandelion.json | 1 - .../data/create/recipes/milling/diorite.json | 3 +- .../data/create/recipes/milling/fern.json | 4 +- .../data/create/recipes/milling/gold_ore.json | 3 +- .../data/create/recipes/milling/granite.json | 3 +- .../data/create/recipes/milling/grass.json | 1 - .../data/create/recipes/milling/gravel.json | 3 +- .../data/create/recipes/milling/ink_sac.json | 1 - .../data/create/recipes/milling/iron_ore.json | 3 +- .../create/recipes/milling/lapis_lazuli.json | 1 - .../create/recipes/milling/large_fern.json | 2 - .../data/create/recipes/milling/lilac.json | 2 - .../recipes/milling/lily_of_the_valley.json | 2 - .../create/recipes/milling/orange_tulip.json | 1 - .../create/recipes/milling/oxeye_daisy.json | 2 - .../data/create/recipes/milling/peony.json | 2 - .../create/recipes/milling/pink_tulip.json | 1 - .../data/create/recipes/milling/poppy.json | 1 - .../create/recipes/milling/red_tulip.json | 1 - .../data/create/recipes/milling/sand.json | 3 +- .../create/recipes/milling/sugar_cane.json | 1 - .../create/recipes/milling/sunflower.json | 2 - .../create/recipes/milling/tall_grass.json | 1 - .../create/recipes/milling/terracotta.json | 3 +- .../data/create/recipes/milling/wheat.json | 4 +- .../create/recipes/milling/white_tulip.json | 1 - .../create/recipes/milling/wither_rose.json | 1 - .../data/create/recipes/milling/wool.json | 3 +- .../data/create/recipes/milling/zinc_ore.json | 3 +- .../create/recipes/mixing/andesite_alloy.json | 3 +- .../mixing/andesite_alloy_from_zinc.json | 3 +- .../recipes/mixing/chromatic_compound.json | 3 +- .../create/recipes/mixing/temp_cobble.json | 3 +- .../create/recipes/pressing/brass_ingot.json | 3 +- .../create/recipes/pressing/copper_ingot.json | 3 +- .../create/recipes/pressing/gold_ingot.json | 3 +- .../create/recipes/pressing/iron_ingot.json | 3 +- .../create/recipes/pressing/lapis_block.json | 3 +- .../create/recipes/pressing/sugar_cane.json | 3 +- .../sandpaper_polishing/rose_quartz.json | 3 +- .../splashing/black_concrete_powder.json | 3 +- .../splashing/blue_concrete_powder.json | 3 +- .../splashing/brown_concrete_powder.json | 3 +- .../splashing/cyan_concrete_powder.json | 3 +- .../data/create/recipes/splashing/gravel.json | 2 - .../splashing/gray_concrete_powder.json | 3 +- .../splashing/green_concrete_powder.json | 3 +- .../data/create/recipes/splashing/ice.json | 3 +- .../splashing/light_blue_concrete_powder.json | 3 +- .../splashing/light_gray_concrete_powder.json | 3 +- .../splashing/lime_concrete_powder.json | 3 +- .../create/recipes/splashing/limestone.json | 3 +- .../splashing/magenta_concrete_powder.json | 3 +- .../create/recipes/splashing/magma_block.json | 3 +- .../splashing/orange_concrete_powder.json | 3 +- .../splashing/pink_concrete_powder.json | 3 +- .../splashing/purple_concrete_powder.json | 3 +- .../splashing/red_concrete_powder.json | 3 +- .../create/recipes/splashing/red_sand.json | 1 - .../data/create/recipes/splashing/sand.json | 1 - .../create/recipes/splashing/soul_sand.json | 1 - .../recipes/splashing/stained_glass.json | 3 +- .../recipes/splashing/stained_glass_pane.json | 3 +- .../create/recipes/splashing/wheat_flour.json | 3 +- .../splashing/white_concrete_powder.json | 3 +- .../data/create/recipes/splashing/wool.json | 3 +- .../splashing/yellow_concrete_powder.json | 3 +- .../processing/ProcessingOutput.java | 6 +- 113 files changed, 288 insertions(+), 415 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 6637c18cb..9fa8ea585 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -137,7 +137,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_ fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json 6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json -4c3e0500f9382d2e426e823fe876f57f4d7ee3b4 assets/create/blockstates/fluid_pipe.json +ddf31e35edba4572e4b916e654794c2fc9355c76 assets/create/blockstates/fluid_pipe.json f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json 5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json @@ -329,7 +329,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json 92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json 61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json -bdd56f32ce0a148b6e466a55ab2777f69fc08cfc assets/create/blockstates/radial_chassis.json +100eedce1711b9eea00a4540ebef8a19e834df3a assets/create/blockstates/radial_chassis.json 45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json 722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json @@ -2566,7 +2566,7 @@ d9021504be855cd2d4d91503a82b84233052adb0 data/create/recipes/blasting/gold_ingot c323b106e88b7de77fea71ff12494abdbb818d15 data/create/recipes/chiseled_limestone_from_limestone_stonecutting.json da9a919b476954c1de34826aa7706bf6056a8f12 data/create/recipes/chiseled_scoria_from_scoria_stonecutting.json 09faa4ddcf9f3907dcdb3ab3e8b68c1deb2486e5 data/create/recipes/chiseled_weathered_limestone_from_weathered_limestone_stonecutting.json -370a536cc75b58cb0a07552665297669a763747a data/create/recipes/compacting/blaze_cake.json +eec156ec99d323dbc187f07e67d4449934c3e3e1 data/create/recipes/compacting/blaze_cake.json 19526da3a59fc136654ff1bc93c0251581f397a9 data/create/recipes/crafting/appliances/dough.json 7b5f863dda3d05a79cb85943a178eba0bd8a7dc7 data/create/recipes/crafting/appliances/slime_ball.json b159ba84428eee6ef6e23df1766f2a18f2c8a63e data/create/recipes/crafting/appliances/tree_fertilizer.json @@ -2744,43 +2744,43 @@ fe95f8f5f15edb0a5ff8da5a4757c9f8910b51bd data/create/recipes/crafting/palettes/d 1a810338ea15ab5ac2f37e87579c56f72b2b371b data/create/recipes/crafting/schematics/schematicannon.json 3da7a3cdb84f44e259b5399a94ddfbf94ebebd37 data/create/recipes/crushing/blaze_rod.json 5878767e89be5a522b8f28d6a2d7b2f8566cf0dd data/create/recipes/crushing/brass_block.json -b21b77e313728add68ed7daeb6bda1d12c06fc90 data/create/recipes/crushing/coal_ore.json +b83ef0af844ca068e0353330b8273bace5b6a8c3 data/create/recipes/crushing/coal_ore.json da4ed79975391ec9f263869936b84474f1f727d3 data/create/recipes/crushing/copper_block.json -2962c8c1cb899591a474ee675d8ee699de265f15 data/create/recipes/crushing/copper_ore.json -0c96aa34d8dbf5fdc122361b6f2b090db94dc886 data/create/recipes/crushing/diamond_horse_armor.json -47a6eacac7ea031fd65b6ee9d2a9163a0099af6b data/create/recipes/crushing/emerald_ore.json -5e3bd12462c94835f2707a683e68a9731fd7225d data/create/recipes/crushing/glowstone.json -9984f8c4279540cd930331a9606ed9ae92a19b9a data/create/recipes/crushing/gold_ore.json +d49472887067c871943de1b80887b169682eeca9 data/create/recipes/crushing/copper_ore.json +4c482db5575b74b4111800602d7fce22b2e6d32a data/create/recipes/crushing/diamond_horse_armor.json +e1bb927c62c59f5bf5063bd110da9231de378a1f data/create/recipes/crushing/emerald_ore.json +b26b1f0dccf2ffb194ce12173890a83e93369b39 data/create/recipes/crushing/glowstone.json +50e75cdde6996c47b5dc25f27b84367040249107 data/create/recipes/crushing/gold_ore.json 55c0656723bd5a87089965651fe268b2d2956771 data/create/recipes/crushing/golden_horse_armor.json -49e96d7d2ff8e61f9d92dc9ccd92993fed839c7b data/create/recipes/crushing/gravel.json -060bb54f70c6551af1266aac99befe97ca7d6504 data/create/recipes/crushing/iron_horse_armor.json -bcd7e6c6c0ca248a034023bf8ab33bd461e2db17 data/create/recipes/crushing/iron_ore.json -21566e25e5d06bdb2634acc422457e63e458d041 data/create/recipes/crushing/lapis_ore.json +7ce0637578ab3198de54ac74111b6d458eaf08bd data/create/recipes/crushing/gravel.json +a7c97582bae243ab04ff5ff9914b24af25d40d59 data/create/recipes/crushing/iron_horse_armor.json +15d2e42423fd9fbf37864de4a6dffc2f53a307a9 data/create/recipes/crushing/iron_ore.json +5be5d90f862da95d9fd15663b71bff126fd04441 data/create/recipes/crushing/lapis_ore.json e870d049abc5cd5f389f70414c67e76ddc14060d data/create/recipes/crushing/leather_horse_armor.json -d73a0ed13112e001dad61d6ea66fd729c86e7b62 data/create/recipes/crushing/nether_quartz_ore.json +2bc66f89a751a440c93de5f1d28d54f9b5a0da77 data/create/recipes/crushing/nether_quartz_ore.json 2b9b8e1ab81f47c4f7fb79a007aef214af12a342 data/create/recipes/crushing/nether_wart_block_no_quark.json 70116a5a9d1f93ae377e1526ca99582190cf2e3e data/create/recipes/crushing/nether_wart_block_quark.json -0dfe5092af96fbaeddaace6d3b1c45fa6f4cf7fe data/create/recipes/crushing/netherrack.json -71397f0ae2e175181195b8b2894d108e0cdc3da7 data/create/recipes/crushing/obsidian.json +8003e7db3ee11066b365c251f04f84028820de94 data/create/recipes/crushing/netherrack.json +dd4b9e88a723f6c3f2456f36ef2354cd86d85433 data/create/recipes/crushing/obsidian.json 88d7ab3d6407010876e328f5f20a4ed9ddda7e3e data/create/recipes/crushing/prismarine_crystals.json -42299b3a0596c7743404496205854ac2324aedd7 data/create/recipes/crushing/redstone_ore.json -94589aa3171fcfda8eed76000d53a36ea6fd7e53 data/create/recipes/crushing/sand.json -dc4cf8b759f5eeee0ccfa6aaad204fbeea487b7f data/create/recipes/crushing/wool.json +03874de476273de5aab8758f23d1ae638847843b data/create/recipes/crushing/redstone_ore.json +2f48a98a44f01a014d4dd59030dc38afa234f3fc data/create/recipes/crushing/sand.json +b6b97f139ee0a06a4ec1ed9f43e1f845b3c502d3 data/create/recipes/crushing/wool.json 967bea8eabac8fab8de547ddd6670230f400c111 data/create/recipes/crushing/zinc_block.json -fec666f3d9d40214411b3e13df957c430f748b38 data/create/recipes/crushing/zinc_ore.json -a6fcae05c9483516c0b05553dc9dc58aa24bcb3d data/create/recipes/cutting/acacia_log.json -dc45636779c05e3be6b9ab6348618c5bf4b6a935 data/create/recipes/cutting/acacia_wood.json +e4683ed7e28fbf502ca176513c43ee719a016d13 data/create/recipes/crushing/zinc_ore.json +86b1e391fe567ad1ca9f27c963e16c2f6e6b3bc9 data/create/recipes/cutting/acacia_log.json +3601e7100d6de215a524a12c641b5111c95d314c data/create/recipes/cutting/acacia_wood.json 68687da80b9dc7ea69729b0e16d3e75efed8679a data/create/recipes/cutting/andesite_alloy.json -96128e5538ce36172271aeb5f13b9a96b23622e8 data/create/recipes/cutting/birch_log.json -3314272b66d99d64c6454a798d58a87cd7ce18bb data/create/recipes/cutting/birch_wood.json -a0c8189a002a80e3d68ed658b9adf69e98609458 data/create/recipes/cutting/dark_oak_log.json -f5ed40088993dd5ef09db74d154d02db0fefe772 data/create/recipes/cutting/dark_oak_wood.json -a695868ac8943924bcd375089995f909ef95d0a8 data/create/recipes/cutting/jungle_log.json -8de2bec42f36c8ed87b9eac957b09eb302f84b63 data/create/recipes/cutting/jungle_wood.json -7946211bb119a9ccdc192c72d57f7d732e9cac13 data/create/recipes/cutting/oak_log.json -f39da018c21b0b99b41cd25ecbadc75ee9d552c7 data/create/recipes/cutting/oak_wood.json -6abbe6463bb4da2fff1cabaefa92e043fdefdf88 data/create/recipes/cutting/spruce_log.json -cb5343fdcab4ab27335deef2988db7dc0c9ff7f2 data/create/recipes/cutting/spruce_wood.json +08e2da1149421b9edffdd227f40f6023d7e8ff0e data/create/recipes/cutting/birch_log.json +f3e6a435ccdfac3da0482e0eee825f75485370dd data/create/recipes/cutting/birch_wood.json +8d71bb2524538a0d8fd044427cf7134bc2b31d8b data/create/recipes/cutting/dark_oak_log.json +bb4c6b1ef57e5aceeaf8c1840e880e671788256f data/create/recipes/cutting/dark_oak_wood.json +f0eb32c6d9f7a5a78f08ee6ac3b97f70747c89f9 data/create/recipes/cutting/jungle_log.json +f218210af2282903968f84df77b16cac7a9d244e data/create/recipes/cutting/jungle_wood.json +fd565e84aff897968be805c03623757c11ea57ed data/create/recipes/cutting/oak_log.json +2bf4234c994073addb7341fa1ef8b721572dde37 data/create/recipes/cutting/oak_wood.json +2cd588872f6bbf63686a92a12735aa65d1960fe3 data/create/recipes/cutting/spruce_log.json +5ae29d81388c3d0d7966e703b6e9463ea58221ef data/create/recipes/cutting/spruce_wood.json 9f14b915695407155fdf806b1e5ecf91e0860c5b data/create/recipes/cutting/stripped_acacia_log.json c7f0e3b7a46676ede1ed775ec8aa8b969e1fe598 data/create/recipes/cutting/stripped_acacia_wood.json 4c657d8ff753789853c8d705fb5ae01caeef5cc1 data/create/recipes/cutting/stripped_birch_log.json @@ -2976,58 +2976,58 @@ e491fd8a8873308270f9dc2a57ac8f2c70431dcc data/create/recipes/mechanical_crafting ce17f8ab6e051f45a12e55f1642ad1b8a0f8510f data/create/recipes/mechanical_crafting/integrated_circuit.json fc380bc241f3233700e91fe2947e1a5d6c70e7db data/create/recipes/mechanical_crafting/mechanical_arm.json 23bd72789e7be894c4ee8927a171c721afcc2084 data/create/recipes/mechanical_crafting/nixie_tube.json -9d637c3c552840bd79ccfac57b1508e21146de49 data/create/recipes/milling/allium.json -7823440a3707ab2ea41d8dae214b11364a53e290 data/create/recipes/milling/andesite.json +98f877bf8f3f8a686fc6cf7479a0fba5744248ce data/create/recipes/milling/allium.json +bcff4d30ae09a0729bce8b2dbde4ddd6719a998b data/create/recipes/milling/andesite.json ac3f1c92115a113a1ea7e5543c1e061e3d2a0b36 data/create/recipes/milling/azure_bluet.json -3f38c1025e0a1553e756fc494b03a39cff2a6b81 data/create/recipes/milling/blue_orchid.json -9386c7e1f9d69826965402af8cc7609d8285f0c8 data/create/recipes/milling/bone.json -72676ef5267d005b52b6d138cf68b5428da25b85 data/create/recipes/milling/bone_meal.json -1209f70f8f09af5a4cce67eb8e090c63981d675e data/create/recipes/milling/cactus.json -335f32092c32238daec5ab5914836e1a50baed36 data/create/recipes/milling/charcoal.json -b9b8d7a0ed2121ac4202b1cd23fc9a18da9f89fa data/create/recipes/milling/clay.json -915d00bb4518e9dd5bb35f5ccc41a974548f5e6a data/create/recipes/milling/coal.json -f585d39316e016a559b72e53770ff7ff9375e292 data/create/recipes/milling/cobblestone.json -d6d024c8fccd18a47a1b22962a20877d8f74dc94 data/create/recipes/milling/cocoa_beans.json -6e9e700b353471e9d5d4bf3ab2ae504c54f84cf7 data/create/recipes/milling/copper_ore.json +95d673bb272d273c2ad25bf01723dd978642faed data/create/recipes/milling/blue_orchid.json +25d008621c461a1f6fef0e45913dc8654c645ea3 data/create/recipes/milling/bone.json +8c09dc48b3e3c3c6bfdc4ed7683bdee860802172 data/create/recipes/milling/bone_meal.json +c152f6ae0c5bdcd4eaf3e714864a318f462b64a0 data/create/recipes/milling/cactus.json +b8eff5bcc773a7ce75146423e5997ee24f69a92c data/create/recipes/milling/charcoal.json +e34c20506e9054da0e3b22fb27a093222eeb9a9c data/create/recipes/milling/clay.json +ccce7e6d1ab703d6567046b9c99c254e8baa88f7 data/create/recipes/milling/coal.json +851e4f3b84f431003264bc902a3351b6d769c897 data/create/recipes/milling/cobblestone.json +929d5c69bfd4eefc33766954e1ed7cbc284180b6 data/create/recipes/milling/cocoa_beans.json +08f453ce32e4ea28e4ca3ac3e446fa8019e2bc58 data/create/recipes/milling/copper_ore.json 31da5a1a6cc6f6cf90bf091d968d8b6f8555b292 data/create/recipes/milling/cornflower.json -d8f48766699d10fe948f993c44e5f290354e6a03 data/create/recipes/milling/dandelion.json -4e486a45118b45d01a1aa277b56e05f600ae7524 data/create/recipes/milling/diorite.json -d6cb91af193f88f0861813094cd4dc2d9111b304 data/create/recipes/milling/fern.json -e4533cf74cf1a9422ecb50820dd9a393a7f327b8 data/create/recipes/milling/gold_ore.json -5b31ee99e30e920162e8fdabc4608ca828bf992d data/create/recipes/milling/granite.json -5fa9947eb9c423c19d824ab83700ced4fc80f7a3 data/create/recipes/milling/grass.json -d39af13f1110fbf80ac6d4ed6770153153e647b9 data/create/recipes/milling/gravel.json -fcac9030cdc13052d8cd006d27cf420fc2879375 data/create/recipes/milling/ink_sac.json -33aea07b98a40a5e122b407252cc1a85d7176626 data/create/recipes/milling/iron_ore.json -c6d91bc1b90d9baa022abf4eb15d3934a1dd298e data/create/recipes/milling/lapis_lazuli.json -121073a5d934ad220de8286185a398575ddbb5b1 data/create/recipes/milling/large_fern.json -83d11b3743864ecd59cdc1e6626a3118e5dc5cfc data/create/recipes/milling/lilac.json -efe625cb321255c3d7d2db626ff239722f774623 data/create/recipes/milling/lily_of_the_valley.json -e1218d6bf8f80461887de609f478b99facb1c5a2 data/create/recipes/milling/orange_tulip.json -b88646f1b4599b36920e0bff5829c372fddfa2b4 data/create/recipes/milling/oxeye_daisy.json -a600f9048060ef635fb84eea3facdb1918fbad73 data/create/recipes/milling/peony.json -e0be5c3c2d8bae1031de9291ee8434ef8f2608b0 data/create/recipes/milling/pink_tulip.json -e54acf873ebea2d97294ed8f609070e7395b463a data/create/recipes/milling/poppy.json -c8f76e426ff2d3df3c0ebe2f6c354ea5cfeb7b89 data/create/recipes/milling/red_tulip.json +623c1a134f8ce6b7d52476b6da8e8d210dba7bb1 data/create/recipes/milling/dandelion.json +62652b87e4f6435be9900afd4725e7a5782bc9d1 data/create/recipes/milling/diorite.json +28bad3c34cf0f5e20c48486c15130f6c552a93ec data/create/recipes/milling/fern.json +639469b734d0fed1583e963b461b01cbf04ec417 data/create/recipes/milling/gold_ore.json +51d692a94c69e10e3b77542f9cd98500104d5a42 data/create/recipes/milling/granite.json +6f9d6891b2bc2e6f1dc24a7802f9a0f7982e9d20 data/create/recipes/milling/grass.json +407a82fb6ca49d8e6159b0e900f856021b1dd771 data/create/recipes/milling/gravel.json +7932570ab897c0afe71ca368372f7628cb2c9b31 data/create/recipes/milling/ink_sac.json +ad9857c18bbeaf838f389bbc69e2d33418245285 data/create/recipes/milling/iron_ore.json +b2e80b5752eec591f4110f6a5fc5e052aeecab78 data/create/recipes/milling/lapis_lazuli.json +1720439fd1c8eb808d1a1d29510b71860afbdec2 data/create/recipes/milling/large_fern.json +3c8a3b3d8c91e107c2ff64b2115f5cf94197fc91 data/create/recipes/milling/lilac.json +f2a7518eeef43052785dff6c3bf305c8c74c4789 data/create/recipes/milling/lily_of_the_valley.json +5ba9cd55d4a551350b64ecbbff6bfd32e130c00c data/create/recipes/milling/orange_tulip.json +e5f121e244cd0afa2fe3d76a1e15ca9974bee96b data/create/recipes/milling/oxeye_daisy.json +077edce210beb2cbe5e37062b0518be473784dc7 data/create/recipes/milling/peony.json +00c67bfbfc780b0d0343c9d31fda9f477341bc88 data/create/recipes/milling/pink_tulip.json +47fabce9ae3fbc2cc888697b11e6d48748631ef5 data/create/recipes/milling/poppy.json +ea6fb7e30fa22cd87ff4760288e11f909b78ac86 data/create/recipes/milling/red_tulip.json bda581c2039f41f7d55527814a46903f10da7e05 data/create/recipes/milling/rose_bush.json 54be62a1bf098a370d315f79068ec326e4f4d6c2 data/create/recipes/milling/saddle.json -90cc7b8a945fb019cddb8fbfea1564f46614d69a data/create/recipes/milling/sand.json -b44e771a42b0630cd01b31cf4b9cf337e3e21041 data/create/recipes/milling/sugar_cane.json -ec53cd589fb96d126cbd85f7540fbb685310355a data/create/recipes/milling/sunflower.json -11cf0d26f667ac8749818fa3a5accbdb726a6356 data/create/recipes/milling/tall_grass.json -79797c0658f5dce82ee50a612627f47df33ce09e data/create/recipes/milling/terracotta.json -06703af2619170b21a2acd89e755826ad4bb2e5b data/create/recipes/milling/wheat.json -3f4e1adbbbdc1327e2f83d648918b4959a8cff2e data/create/recipes/milling/white_tulip.json -ca72436410265c33b1d8a2d9b634767df73efa6e data/create/recipes/milling/wither_rose.json -0137a135731a41d1d33e0c264decb03ee1582c4f data/create/recipes/milling/wool.json -28f37178b75fc4d63c4495c721fe2f0f011756cf data/create/recipes/milling/zinc_ore.json -8975bb125e09b68cc539c7b368fd7c6853657fd6 data/create/recipes/mixing/andesite_alloy.json -e7bfaa806d57573d060fac0a5e7a84f345b8bb85 data/create/recipes/mixing/andesite_alloy_from_zinc.json +8bc6124293f4efb5f2d0fa4a3166c6d00a88a14c data/create/recipes/milling/sand.json +1e14bd30032aab6dfaff5bca50c791332ffc1aaa data/create/recipes/milling/sugar_cane.json +af2beca9f934601ad029f34bad08be3cee07f6b4 data/create/recipes/milling/sunflower.json +949c7aa8f5172c07b0b5ea178d8046ffaac9f527 data/create/recipes/milling/tall_grass.json +542ffcedc9b1467ec41c6f4e162453e76fa1ead1 data/create/recipes/milling/terracotta.json +4f61f0efbd980407d4e0fa1067dd320f01496c6c data/create/recipes/milling/wheat.json +0a598bfc39ad473856887703d7971ba3a70339f8 data/create/recipes/milling/white_tulip.json +19a16516ce26afddef5604b118899a50671a9a9a data/create/recipes/milling/wither_rose.json +eec880075efd6008b604a4b8064d782752b4bad6 data/create/recipes/milling/wool.json +9f105242e06994f541236f669931a6bb983afadc data/create/recipes/milling/zinc_ore.json +b3cc5e61bab40ca6135dc1f706f3ab447e9f78bf data/create/recipes/mixing/andesite_alloy.json +ce9dc7dacb85cb23a7187c19a115b40e597ad36b data/create/recipes/mixing/andesite_alloy_from_zinc.json 3417f9399ce0fb32fc4bce94c772b40d780c9006 data/create/recipes/mixing/brass_ingot.json -76939e4d3e5b615ae21d14c0ff7b917a622bcf80 data/create/recipes/mixing/chromatic_compound.json +0e29b4ce13750aab5a60ae54cbec8776569b35e0 data/create/recipes/mixing/chromatic_compound.json d9a3dff1288d675ab812eef1eb73cb27dcc71bd2 data/create/recipes/mixing/crushed_brass.json 00b165ea38d834c7955440e87062004a8182c3f8 data/create/recipes/mixing/gunpowder.json -cf2a741be46fd2069f242afe74eb7c11f3139c46 data/create/recipes/mixing/temp_cobble.json +3279bd1a34217a19bc9992a2ad87629390dd003f data/create/recipes/mixing/temp_cobble.json 3295a2195707f952a83deb3bed10b43570b215e5 data/create/recipes/mixing/temp_lava.json 1998c6f84f871d6da58ec29d729401d18f8f1aa1 data/create/recipes/mossy_andesite_from_andesite_stonecutting.json 89929d9cb11b5c589b2ecfa821c61add1ef7b62b data/create/recipes/mossy_dark_scoria_from_dark_scoria_stonecutting.json @@ -3162,13 +3162,13 @@ d51106184083761635fa902c09c45436c414ddab data/create/recipes/polished_weathered_ 9d4382462376e85c2627b8150b09acd3b063e347 data/create/recipes/polished_weathered_limestone_stairs_from_polished_weathered_limestone_stonecutting.json 7dd58714cf8fc4614ae2e1c2981471da3a52f06c data/create/recipes/polished_weathered_limestone_wall.json eae06580a0a5f486cde35426716d50fcb3ba5bb3 data/create/recipes/polished_weathered_limestone_wall_from_polished_weathered_limestone_stonecutting.json -228d2002ec3da06f940d004b1f3c74fc33413fb6 data/create/recipes/pressing/brass_ingot.json -a07323c42c78815ebc756372a30bb8295abaf9a0 data/create/recipes/pressing/copper_ingot.json -b107b827c888a8349a937aebeed575b40e9cee9a data/create/recipes/pressing/gold_ingot.json -c2fd8639ed37034eabc821842d48385cb0918c3b data/create/recipes/pressing/iron_ingot.json -05b620a5cb6cf0a7ebe5e6183a061067fcccc191 data/create/recipes/pressing/lapis_block.json -91d12d892c2660f962b26b9dde020a5570c2c6e7 data/create/recipes/pressing/sugar_cane.json -9ebd1cc7dac1874c49a75e7709c3fea79853c087 data/create/recipes/sandpaper_polishing/rose_quartz.json +9c8b3ec11152820acd5ee99971fd22c1484c8815 data/create/recipes/pressing/brass_ingot.json +4a51cb6066e87613c13bdc6d3427929080ef1def data/create/recipes/pressing/copper_ingot.json +0fa8386648398724f6fd373178b706c6b11ddefc data/create/recipes/pressing/gold_ingot.json +a104ef6eb8872a40ea7b2ef67ae54cec943162f0 data/create/recipes/pressing/iron_ingot.json +7f9e72ec02a9926656744a95066f8aa304514565 data/create/recipes/pressing/lapis_block.json +bd57ccc8eb4357b4a5af021db7b806b514cd2558 data/create/recipes/pressing/sugar_cane.json +141173778757d87e7f2e9466bdab6ff1263c8e98 data/create/recipes/sandpaper_polishing/rose_quartz.json d59c68621c78ff5d2c51be4440dea603480efed8 data/create/recipes/scoria_bricks_from_scoria_stonecutting.json a7a28cf77955c2b4ed3687205dd24162e461aa30 data/create/recipes/scoria_bricks_slab.json 0577ffde98e7a027b21c430cd71cdafdd3cee3a3 data/create/recipes/scoria_bricks_slab_from_scoria_bricks_stonecutting.json @@ -3206,38 +3206,38 @@ bf0e5df5a88e583e39a4e14b006cbf33b99611e1 data/create/recipes/smelting/limestone. a5d23be4cc959eb47d84b210190abaafcf41f022 data/create/recipes/smelting/zinc_ingot_from_crushed.json 2d8e448bbe841871c5d9a022149c5f34fd5c0df1 data/create/recipes/smelting/zinc_ingot_from_ore.json ce7c3c6e1da9d6684c9537d1a558423925d89f33 data/create/recipes/smoking/bread.json -60ee56b41a279124ff59724794c80da7e8cc81e4 data/create/recipes/splashing/black_concrete_powder.json -59ce20e3f4193a6e28cde2d46c008afe5d53c67f data/create/recipes/splashing/blue_concrete_powder.json -6d69b04151846675b5b9d1de3374f0168bcdc20b data/create/recipes/splashing/brown_concrete_powder.json +6b1d2483fe717657f7188f6490eab2da715609e8 data/create/recipes/splashing/black_concrete_powder.json +1aedfde11712827604bbef34e992c411c0b02876 data/create/recipes/splashing/blue_concrete_powder.json +6e11d592dc9b19c4cd9bf2df2aa46b7ec4d9a331 data/create/recipes/splashing/brown_concrete_powder.json c22dc50b7c8dea74dae9018506989fa14a340796 data/create/recipes/splashing/crushed_brass.json d43ec1edc4743dc5a3483c327dc010a12d81dbf5 data/create/recipes/splashing/crushed_copper_ore.json a1112c785f4571c0a9900288081eb216c729a17b data/create/recipes/splashing/crushed_gold_ore.json f3b03dd4532086a785d6bbc9de081ab8adf58146 data/create/recipes/splashing/crushed_iron_ore.json d2d6137fd7a3155263cfffef45f760b99f26f26b data/create/recipes/splashing/crushed_zinc_ore.json -25796b0f832249cd3ffc8493daff534d783ec850 data/create/recipes/splashing/cyan_concrete_powder.json -0c0e987bb771868b34d04759f672cd4e1cd83c60 data/create/recipes/splashing/gravel.json -756857a8a3f931ba55056239664530849680b9a5 data/create/recipes/splashing/gray_concrete_powder.json -ab1a3e111e00ce7d6e6cf55a110eb843be040b17 data/create/recipes/splashing/green_concrete_powder.json -319c0423276eec8b5bdd2b3d7596b86eff113986 data/create/recipes/splashing/ice.json -fe3c9a2343a796c5e08e9d607b978563b9d9320a data/create/recipes/splashing/light_blue_concrete_powder.json -26f43d0f3d8381fd89c1d97b530aa56145bc5df5 data/create/recipes/splashing/light_gray_concrete_powder.json -11cd9b3d32db881c8ab435bb7f3fe0bf8233038b data/create/recipes/splashing/lime_concrete_powder.json -040e5de4d06e47c59a9cdbaf574ac51320201f2a data/create/recipes/splashing/limestone.json -b4a42622cd9363951984140e0afdb68e40efda3c data/create/recipes/splashing/magenta_concrete_powder.json -77a5ac46d93a6031d6c3827818d6e7baf11e155f data/create/recipes/splashing/magma_block.json -bd715561deaeac2afb11e5394679fc3b8b30eb7f data/create/recipes/splashing/orange_concrete_powder.json -dd7457da2124a93e8bdc4f68380378f945df12d9 data/create/recipes/splashing/pink_concrete_powder.json -f031372403ea35d5bc63b18a82ce84ff2d69f206 data/create/recipes/splashing/purple_concrete_powder.json -e7ff4602fd5444a2e3c8ddc20be9569d64e1746e data/create/recipes/splashing/red_concrete_powder.json -d0c652c4382e9213bb7d61380162a8d6c55d9d39 data/create/recipes/splashing/red_sand.json -43fe8ba65a79909e4b9ea985dea2861cba1e680b data/create/recipes/splashing/sand.json -e802591c68932b24f027c99281a51d8f13393bf8 data/create/recipes/splashing/soul_sand.json -4773a92dea2e3ba6cb529e097948d881b4d0988b data/create/recipes/splashing/stained_glass.json -1bc046f79c8e0660d11f7e6951b866cb74b9339b data/create/recipes/splashing/stained_glass_pane.json -a465629e286012f616ccf48305bbdd9e493b290a data/create/recipes/splashing/wheat_flour.json -8c995694c62035a84b6f993cf452811c577dc752 data/create/recipes/splashing/white_concrete_powder.json -53b0a123f52437842631ffdec05eebed8ba6c73a data/create/recipes/splashing/wool.json -224c91bcc2ff94054b62761f9fed3925d6b52cb7 data/create/recipes/splashing/yellow_concrete_powder.json +42cee25fabf4f0f9fb4815a98134eaf38ae197d0 data/create/recipes/splashing/cyan_concrete_powder.json +c4d680eed98791fe45fa93aeeae9e8dbd508d6f5 data/create/recipes/splashing/gravel.json +7af4d9ae50af13da0d4fc814687f9586ff872798 data/create/recipes/splashing/gray_concrete_powder.json +23fb61c0e4bcca58fa7241db9cbef07bf4bd9a9b data/create/recipes/splashing/green_concrete_powder.json +0a15fffe26190b78d2177c8302c92fc2232ce398 data/create/recipes/splashing/ice.json +601e460575d3d1f45dca3e259f5a7c2701f45888 data/create/recipes/splashing/light_blue_concrete_powder.json +11792305bc949f08e7c1199ead8430f20848fa54 data/create/recipes/splashing/light_gray_concrete_powder.json +a43d7c9a6369a48ef7d1396f2c11dc1f3704a61e data/create/recipes/splashing/lime_concrete_powder.json +67d97de29a9075a7ba8edb6e47c997b02600557e data/create/recipes/splashing/limestone.json +862f7b68bb107d7c4ecc82ddd10c788eb0a07b03 data/create/recipes/splashing/magenta_concrete_powder.json +004e05fed3684de8603905d9c9381cbbd789a882 data/create/recipes/splashing/magma_block.json +625c2d68ad722209523925375bc4f7494667feb2 data/create/recipes/splashing/orange_concrete_powder.json +fb0c5fb2da0ac1fd236b19823747b9c15b536b02 data/create/recipes/splashing/pink_concrete_powder.json +2599fcd240eacdf4ace0dffe64f026d0bb4919d9 data/create/recipes/splashing/purple_concrete_powder.json +9c10bfdd047fb9ac17d51ebdd38bc8be0883d970 data/create/recipes/splashing/red_concrete_powder.json +87ddb764bcff88c12686d171540cea4cc6edaf16 data/create/recipes/splashing/red_sand.json +3a5dea804e0aec6fa8711eb07b006d8b1de098ff data/create/recipes/splashing/sand.json +cf0dcdb8ec3f3e75b315faa377eccef662dea71f data/create/recipes/splashing/soul_sand.json +ba660fe5786c95a359a6ddfdeb73d7109cbebe5d data/create/recipes/splashing/stained_glass.json +c7a51fd1b730d48991cf6b4f1b56da4144537f1d data/create/recipes/splashing/stained_glass_pane.json +39bd2780c1d3066e6b5b8d3b029f058f5ea63165 data/create/recipes/splashing/wheat_flour.json +24cedf74a5a118fa03c7e91a3fdaae3e41f6ec40 data/create/recipes/splashing/white_concrete_powder.json +4ad9a4699a6e28c4406ab2aa453bbe50fcb34abc data/create/recipes/splashing/wool.json +e2c1774577aeb0756fb1d092245d9d77e40ba5f8 data/create/recipes/splashing/yellow_concrete_powder.json 7a4e163767827fc8cef3646204c2f2bf0f8aac99 data/create/recipes/spruce_window.json 96d515ff0172dafa04d650ab69d68ed508e99e6f data/create/recipes/spruce_window_pane.json 1f689453146c7dd2d315e8b5fb5e7cdc0aaf0fa2 data/create/recipes/tiled_glass_from_glass_colorless_stonecutting.json @@ -3305,6 +3305,7 @@ fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/items/storage_blocks/copper.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json +31424fe956db0354a9f24c61baf977a2961c8db6 data/minecraft/tags/blocks/impermeable.json 9dadc647e17b6262c13b6d8eda9139e30ce7e7d0 data/minecraft/tags/blocks/rails.json 29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data/minecraft/tags/blocks/slabs.json 0d188ad2c33d10ee8f0d455c4e63a4460a8302fb data/minecraft/tags/blocks/stairs.json diff --git a/src/generated/resources/assets/create/blockstates/fluid_pipe.json b/src/generated/resources/assets/create/blockstates/fluid_pipe.json index 581373307..27681190a 100644 --- a/src/generated/resources/assets/create/blockstates/fluid_pipe.json +++ b/src/generated/resources/assets/create/blockstates/fluid_pipe.json @@ -60,10 +60,10 @@ }, { "when": { - "south": "false", - "up": "true", "down": "false", - "north": "true" + "north": "true", + "south": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/lu_x" @@ -71,10 +71,10 @@ }, { "when": { - "south": "true", - "up": "true", "down": "false", - "north": "false" + "north": "false", + "south": "true", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ru_x" @@ -82,10 +82,10 @@ }, { "when": { - "south": "false", - "up": "false", "down": "true", - "north": "true" + "north": "true", + "south": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/ld_x" @@ -93,10 +93,10 @@ }, { "when": { - "south": "true", - "up": "false", "down": "true", - "north": "false" + "north": "false", + "south": "true", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/rd_x" @@ -104,10 +104,10 @@ }, { "when": { - "south": "false", - "up": "true", "down": "true", - "north": "false" + "north": "false", + "south": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -115,10 +115,10 @@ }, { "when": { - "south": "false", - "up": "true", "down": "false", - "north": "false" + "north": "false", + "south": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -126,10 +126,10 @@ }, { "when": { - "south": "false", - "up": "false", "down": "true", - "north": "false" + "north": "false", + "south": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -137,10 +137,10 @@ }, { "when": { + "down": "false", + "north": "true", "south": "true", - "up": "false", - "down": "false", - "north": "true" + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -148,10 +148,10 @@ }, { "when": { + "down": "false", + "north": "true", "south": "false", - "up": "false", - "down": "false", - "north": "true" + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -159,10 +159,10 @@ }, { "when": { + "down": "false", + "north": "false", "south": "true", - "up": "false", - "down": "false", - "north": "false" + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -170,10 +170,10 @@ }, { "when": { - "south": "false", - "up": "false", "down": "false", - "north": "false" + "north": "false", + "south": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/none_x" @@ -181,10 +181,10 @@ }, { "when": { - "south": "true", "west": "true", "north": "false", - "east": "false" + "east": "false", + "south": "true" }, "apply": { "model": "create:block/fluid_pipe/lu_y" @@ -192,10 +192,10 @@ }, { "when": { - "south": "true", "west": "false", "north": "false", - "east": "true" + "east": "true", + "south": "true" }, "apply": { "model": "create:block/fluid_pipe/ru_y" @@ -203,10 +203,10 @@ }, { "when": { - "south": "false", "west": "true", "north": "true", - "east": "false" + "east": "false", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/ld_y" @@ -214,10 +214,10 @@ }, { "when": { - "south": "false", "west": "false", "north": "true", - "east": "true" + "east": "true", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/rd_y" @@ -225,10 +225,10 @@ }, { "when": { - "south": "true", "west": "false", "north": "true", - "east": "false" + "east": "false", + "south": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_y" @@ -236,10 +236,10 @@ }, { "when": { - "south": "true", "west": "false", "north": "false", - "east": "false" + "east": "false", + "south": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_y" @@ -247,10 +247,10 @@ }, { "when": { - "south": "false", "west": "false", "north": "true", - "east": "false" + "east": "false", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_y" @@ -258,10 +258,10 @@ }, { "when": { - "south": "false", "west": "true", "north": "false", - "east": "true" + "east": "true", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_y" @@ -269,10 +269,10 @@ }, { "when": { - "south": "false", "west": "true", "north": "false", - "east": "false" + "east": "false", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_y" @@ -280,10 +280,10 @@ }, { "when": { - "south": "false", "west": "false", "north": "false", - "east": "true" + "east": "true", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_y" @@ -291,10 +291,10 @@ }, { "when": { - "south": "false", "west": "false", "north": "false", - "east": "false" + "east": "false", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/none_y" @@ -302,10 +302,10 @@ }, { "when": { - "up": "true", "down": "false", "west": "false", - "east": "true" + "east": "true", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/lu_z" @@ -313,10 +313,10 @@ }, { "when": { - "up": "true", "down": "false", "west": "true", - "east": "false" + "east": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ru_z" @@ -324,10 +324,10 @@ }, { "when": { - "up": "false", "down": "true", "west": "false", - "east": "true" + "east": "true", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/ld_z" @@ -335,10 +335,10 @@ }, { "when": { - "up": "false", "down": "true", "west": "true", - "east": "false" + "east": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/rd_z" @@ -346,10 +346,10 @@ }, { "when": { - "up": "true", "down": "true", "west": "false", - "east": "false" + "east": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -357,10 +357,10 @@ }, { "when": { - "up": "true", "down": "false", "west": "false", - "east": "false" + "east": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -368,10 +368,10 @@ }, { "when": { - "up": "false", "down": "true", "west": "false", - "east": "false" + "east": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -379,10 +379,10 @@ }, { "when": { - "up": "false", "down": "false", "west": "true", - "east": "true" + "east": "true", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -390,10 +390,10 @@ }, { "when": { - "up": "false", "down": "false", "west": "false", - "east": "true" + "east": "true", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -401,10 +401,10 @@ }, { "when": { - "up": "false", "down": "false", "west": "true", - "east": "false" + "east": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -412,10 +412,10 @@ }, { "when": { - "up": "false", "down": "false", "west": "false", - "east": "false" + "east": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/none_z" diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 1aa3d3728..9fdd50ee7 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -149,8 +149,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "true" + "sticky_north": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky" @@ -158,8 +158,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "true" + "sticky_north": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -168,8 +168,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "true" + "sticky_north": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -178,8 +178,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "false" + "sticky_north": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x" @@ -187,8 +187,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "false" + "sticky_north": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -197,8 +197,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "false" + "sticky_north": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -207,8 +207,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "true" + "sticky_east": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -217,8 +217,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "true" + "sticky_east": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -227,8 +227,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "true" + "sticky_east": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky" @@ -236,8 +236,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "false" + "sticky_east": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -246,8 +246,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "false" + "sticky_east": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -256,8 +256,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "false" + "sticky_east": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z" 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/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); From 671f307071d393c72ea401e27172bc9da1cc1c93 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sun, 8 Nov 2020 18:12:44 +0800 Subject: [PATCH 04/12] Fix blockzapper duplicating bonemeal and breaking bedrock --- .../com/simibubi/create/foundation/utility/BlockHelper.java | 6 ++++++ 1 file changed, 6 insertions(+) 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; } From 2e3100be9a22ba95de2201e5cba50128167d6795 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sun, 8 Nov 2020 20:53:12 +0800 Subject: [PATCH 05/12] Fix JEI ingredients getting merged incorrectly --- .../java/com/simibubi/create/foundation/item/ItemHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } } From 6b34eb453dc86da24f05a6ffdddce84b650b61f5 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sun, 8 Nov 2020 22:54:46 +0800 Subject: [PATCH 06/12] Defensive coding to prevent client chunk loading --- .../logistics/block/mechanicalArm/ArmPlacementPacket.java | 4 ++-- .../schematics/packet/ConfigureSchematicannonPacket.java | 2 +- .../foundation/networking/TileEntityConfigurationPacket.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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/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/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) { From 196083cb00f2f189ca2b088d723f1d5f16a20011 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Tue, 10 Nov 2020 00:51:56 +0800 Subject: [PATCH 07/12] Packet workaround --- .../schematics/client/SchematicHandler.java | 14 +--- .../packet/SchematicSyncPacket.java | 77 +++++++++++++++++++ .../foundation/networking/AllPackets.java | 2 + .../foundation/networking/NbtPacket.java | 9 ++- 4 files changed, 89 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/simibubi/create/content/schematics/packet/SchematicSyncPacket.java 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/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/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()) { From 1afab1dd51bda287b5e0c2609c52a58afeba20a4 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Wed, 11 Nov 2020 00:57:29 +0800 Subject: [PATCH 08/12] Fix slab loot tables --- src/generated/resources/.cache/cache | 84 +++++++++---------- .../blocks/andesite_bricks_slab.json | 23 +++-- .../blocks/andesite_cobblestone_slab.json | 23 +++-- .../blocks/dark_scoria_bricks_slab.json | 23 +++-- .../blocks/dark_scoria_cobblestone_slab.json | 23 +++-- .../blocks/diorite_bricks_slab.json | 23 +++-- .../blocks/diorite_cobblestone_slab.json | 23 +++-- .../blocks/dolomite_bricks_slab.json | 23 +++-- .../blocks/dolomite_cobblestone_slab.json | 23 +++-- .../blocks/fancy_andesite_bricks_slab.json | 23 +++-- .../blocks/fancy_dark_scoria_bricks_slab.json | 23 +++-- .../blocks/fancy_diorite_bricks_slab.json | 23 +++-- .../blocks/fancy_dolomite_bricks_slab.json | 23 +++-- .../blocks/fancy_gabbro_bricks_slab.json | 23 +++-- .../blocks/fancy_granite_bricks_slab.json | 23 +++-- .../blocks/fancy_limestone_bricks_slab.json | 23 +++-- .../blocks/fancy_scoria_bricks_slab.json | 23 +++-- ...fancy_weathered_limestone_bricks_slab.json | 23 +++-- .../blocks/gabbro_bricks_slab.json | 23 +++-- .../blocks/gabbro_cobblestone_slab.json | 23 +++-- .../blocks/granite_bricks_slab.json | 23 +++-- .../blocks/granite_cobblestone_slab.json | 23 +++-- .../blocks/limestone_bricks_slab.json | 23 +++-- .../blocks/limestone_cobblestone_slab.json | 23 +++-- .../blocks/paved_andesite_slab.json | 23 +++-- .../blocks/paved_dark_scoria_slab.json | 23 +++-- .../blocks/paved_diorite_slab.json | 23 +++-- .../blocks/paved_dolomite_slab.json | 23 +++-- .../loot_tables/blocks/paved_gabbro_slab.json | 23 +++-- .../blocks/paved_granite_slab.json | 23 +++-- .../blocks/paved_limestone_slab.json | 23 +++-- .../loot_tables/blocks/paved_scoria_slab.json | 23 +++-- .../paved_weathered_limestone_slab.json | 23 +++-- .../blocks/polished_dark_scoria_slab.json | 23 +++-- .../blocks/polished_dolomite_slab.json | 23 +++-- .../blocks/polished_gabbro_slab.json | 23 +++-- .../blocks/polished_limestone_slab.json | 23 +++-- .../blocks/polished_scoria_slab.json | 23 +++-- .../polished_weathered_limestone_slab.json | 23 +++-- .../blocks/scoria_bricks_slab.json | 23 +++-- .../blocks/scoria_cobblestone_slab.json | 23 +++-- .../weathered_limestone_bricks_slab.json | 23 +++-- .../weathered_limestone_cobblestone_slab.json | 23 +++-- .../content/palettes/PaletteBlockPartial.java | 8 ++ 44 files changed, 806 insertions(+), 252 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 9fa8ea585..0208a7ecc 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -2148,12 +2148,12 @@ d0ba402852cea164f6d279a9b37cc38ac3958574 data/create/loot_tables/blocks/adjustab 0d139e302f4a11438b0acd664c0df15b41040f69 data/create/loot_tables/blocks/analog_lever.json d3202a337c15c8b8ec41fa5879bb94327bb75057 data/create/loot_tables/blocks/andesite_belt_funnel.json 1d04146c468ce4bf898b596c171b3ba3146d7d66 data/create/loot_tables/blocks/andesite_bricks.json -b67ea51eaed1e847317829636cbf5967522e73d1 data/create/loot_tables/blocks/andesite_bricks_slab.json +406e04981bee322d5e6ad1c58bc6c9036e8fd218 data/create/loot_tables/blocks/andesite_bricks_slab.json 0ba4528089294c5229e1904dc3191f604138cf8e data/create/loot_tables/blocks/andesite_bricks_stairs.json db2d27969cb53d9489e7c7e4bf60864fa89b29f4 data/create/loot_tables/blocks/andesite_bricks_wall.json cb36b039a511aca643fe674a63de8d6ad8478256 data/create/loot_tables/blocks/andesite_casing.json 906155b0d00438e695d34dd14b374d94e691460d data/create/loot_tables/blocks/andesite_cobblestone.json -6d2f1bd619b131803d5bc9e393a2c67e03c39ff6 data/create/loot_tables/blocks/andesite_cobblestone_slab.json +a438bc69030589264e1d736bbd08662bdd123be3 data/create/loot_tables/blocks/andesite_cobblestone_slab.json 6b5393dab7d443da6d54debccbc8b060c6c9bdc7 data/create/loot_tables/blocks/andesite_cobblestone_stairs.json 36d38c085d8e522fe15f0ef9bc64363e163f3de7 data/create/loot_tables/blocks/andesite_cobblestone_wall.json d3202a337c15c8b8ec41fa5879bb94327bb75057 data/create/loot_tables/blocks/andesite_funnel.json @@ -2209,32 +2209,32 @@ fd309e1d39dcbcb25c3361edecd8c9afa0f847d0 data/create/loot_tables/blocks/dark_oak 58e6307ba0efa65a0715662a391fe7dc6fba0c68 data/create/loot_tables/blocks/dark_oak_window_pane.json 7a40002e4c05f6456b52558b9ee9607cfc868a69 data/create/loot_tables/blocks/dark_scoria.json 502160551afd210c68582a1dfd41a2df720f53a1 data/create/loot_tables/blocks/dark_scoria_bricks.json -5bce6b714e1131ccc11a670f57fa627cbb0f4409 data/create/loot_tables/blocks/dark_scoria_bricks_slab.json +d37adba01cd1220e265dbdc025b3f8d01b992289 data/create/loot_tables/blocks/dark_scoria_bricks_slab.json 265bb133af68497d9b4ba4bd418a198506caa45b data/create/loot_tables/blocks/dark_scoria_bricks_stairs.json 43fd6e4e2e140416245f7e7e4a680e347a446fc5 data/create/loot_tables/blocks/dark_scoria_bricks_wall.json ef1beeb856cb30d381fd4f1cb4d2bf62fc444e52 data/create/loot_tables/blocks/dark_scoria_cobblestone.json -3dc33d264a78b21915ee4dcaef9fc8a989a90ae2 data/create/loot_tables/blocks/dark_scoria_cobblestone_slab.json +b479f01037bc74f56f8d7b047afc8fa0ff79b0b8 data/create/loot_tables/blocks/dark_scoria_cobblestone_slab.json 7b55b57140f7f04e39c951958cd4b62e17621761 data/create/loot_tables/blocks/dark_scoria_cobblestone_stairs.json 76457f3ec7c2d3874866ce8eb894f7bd9cfd59ee data/create/loot_tables/blocks/dark_scoria_cobblestone_wall.json be851f6643d151ed464e4164bc2b7ca145e5ff82 data/create/loot_tables/blocks/dark_scoria_pillar.json cf9be747e10a98f3f3aabb95c9753f39d806f73b data/create/loot_tables/blocks/deployer.json 5b46f6003bfe393b43ea0447fffcf7ae3bf969b1 data/create/loot_tables/blocks/depot.json 5c8ca846c3fb348fea628035e1670208e386516b data/create/loot_tables/blocks/diorite_bricks.json -427fea1465652db87a2c192934511b972ecfcedf data/create/loot_tables/blocks/diorite_bricks_slab.json +b889b5b9d33ef36fe5ce8b59e0922a22ba2a8e91 data/create/loot_tables/blocks/diorite_bricks_slab.json bdaba62199f7a65e1149b742aaaf0c23a1e149b0 data/create/loot_tables/blocks/diorite_bricks_stairs.json 17c768f01d476fc263ac4c3d2b588412f3c1198e data/create/loot_tables/blocks/diorite_bricks_wall.json 634c0fbb429c8f8350a790fbaf44338a7d3e299e data/create/loot_tables/blocks/diorite_cobblestone.json -1b07173a3b2e57a036fbec2ffac7f4522ad5f1c8 data/create/loot_tables/blocks/diorite_cobblestone_slab.json +529a6ddf7d57a12f4b4ee7e9b2890b789e79b327 data/create/loot_tables/blocks/diorite_cobblestone_slab.json 5141eec8eebed0feec906618dd3474ea402fbf28 data/create/loot_tables/blocks/diorite_cobblestone_stairs.json f3c963cfd51069876140373f410e868706744e9b data/create/loot_tables/blocks/diorite_cobblestone_wall.json fdcf47cddebca81730ac122925b01daeddf9233d data/create/loot_tables/blocks/diorite_pillar.json 7aa075c7fbe97447422bfcb95afb3bbe3b26301c data/create/loot_tables/blocks/dolomite.json 7ecdbfa3ebfc6865833bafed06ed7cd6eef58345 data/create/loot_tables/blocks/dolomite_bricks.json -61d2020cb26b67467711d6dd4f2381c0518acdd9 data/create/loot_tables/blocks/dolomite_bricks_slab.json +ecc855c3ce298855038eb7b53137cab519bca55a data/create/loot_tables/blocks/dolomite_bricks_slab.json 699815e110c76bcb793efdfedcb8ac3a5b9b7131 data/create/loot_tables/blocks/dolomite_bricks_stairs.json fea6a8aa0997360e2713c159b19cb89858ab5982 data/create/loot_tables/blocks/dolomite_bricks_wall.json cfa4afad6cba1706474ee878b0043aa6cb2c1075 data/create/loot_tables/blocks/dolomite_cobblestone.json -f1d9565dd7e9d57832581a3774084f9390cf23b6 data/create/loot_tables/blocks/dolomite_cobblestone_slab.json +c75e9574f5ba34335598e6b1f1e957de9dea4a6b data/create/loot_tables/blocks/dolomite_cobblestone_slab.json 59ff2dc7c0663b0a041a8b4dc66af3a17e117aa4 data/create/loot_tables/blocks/dolomite_cobblestone_stairs.json d5fc5b3dc612cd748117e9d8b0ecda76e73f4514 data/create/loot_tables/blocks/dolomite_cobblestone_wall.json 6121c99e6e037dda9022af3a414aee444467ac1b data/create/loot_tables/blocks/dolomite_pillar.json @@ -2243,39 +2243,39 @@ d5fc5b3dc612cd748117e9d8b0ecda76e73f4514 data/create/loot_tables/blocks/dolomite c8aa9bbed8fd703eb1853de0b7c9e04dffb7a511 data/create/loot_tables/blocks/encased_fluid_pipe.json b127cb6920e6d7d9c8b2402cb186402a9a8dd3fc data/create/loot_tables/blocks/encased_shaft.json ddfc4764a6039d771e03af815ac4493da80d2e6b data/create/loot_tables/blocks/fancy_andesite_bricks.json -31f2e6932505c68b28e92221a37144f69161c376 data/create/loot_tables/blocks/fancy_andesite_bricks_slab.json +6de29951b4129dfd5c7fd6960e7dd8b8d371b451 data/create/loot_tables/blocks/fancy_andesite_bricks_slab.json 413c8bb80954679796cd9d18f808c28a7bdbe681 data/create/loot_tables/blocks/fancy_andesite_bricks_stairs.json b51e0f9df7297f6d98d7fc24202c01c8437b613a data/create/loot_tables/blocks/fancy_andesite_bricks_wall.json 1e0f7ab66554911b37ffeeceef4d13ad3c12c7cf data/create/loot_tables/blocks/fancy_dark_scoria_bricks.json -65c7ec7034462ccf9bf4237f3d7a5a07ea613170 data/create/loot_tables/blocks/fancy_dark_scoria_bricks_slab.json +13c74ed5609dc8758cf550c68a7d115a42ee5f15 data/create/loot_tables/blocks/fancy_dark_scoria_bricks_slab.json 692b7aab0fa9a1610cc87b469172baccd6f206bb data/create/loot_tables/blocks/fancy_dark_scoria_bricks_stairs.json 5600f9afd4271045383332799cae926cae03691e data/create/loot_tables/blocks/fancy_dark_scoria_bricks_wall.json b272bdf3a70adb5477e73f1a6db112dadf83e750 data/create/loot_tables/blocks/fancy_diorite_bricks.json -b5f76570503a5f77062e529263a9a4cbe0d7bfa6 data/create/loot_tables/blocks/fancy_diorite_bricks_slab.json +80a87576fe18768dac2f13b238e9f731074c07a0 data/create/loot_tables/blocks/fancy_diorite_bricks_slab.json 686cf8fe6950fd336755ed6a65cd41f611a8cba7 data/create/loot_tables/blocks/fancy_diorite_bricks_stairs.json a76222e64356951c6038c4b26a28465a1c51f609 data/create/loot_tables/blocks/fancy_diorite_bricks_wall.json f21cc226848e6d65b1c1167acf6a84be97e22b8a data/create/loot_tables/blocks/fancy_dolomite_bricks.json -fa3123cd6b14bbb4090e2b1cd15d48a8f9c1ff95 data/create/loot_tables/blocks/fancy_dolomite_bricks_slab.json +e47bd7a391a163dabe29763b77975dc38db41201 data/create/loot_tables/blocks/fancy_dolomite_bricks_slab.json b1cb60875d96d403734793c848cb48d1af003ebe data/create/loot_tables/blocks/fancy_dolomite_bricks_stairs.json 35ea72b6aa72d027be3f565ffa8315b99d3f55d9 data/create/loot_tables/blocks/fancy_dolomite_bricks_wall.json 6d7ebe8708748780865a8c5c9acd1ea338734951 data/create/loot_tables/blocks/fancy_gabbro_bricks.json -99893d8bd3dac544d447c3023d858f497cb97556 data/create/loot_tables/blocks/fancy_gabbro_bricks_slab.json +c32966d3315e81c21d1cb116fb801dfc73865e2a data/create/loot_tables/blocks/fancy_gabbro_bricks_slab.json dc70fcfb5bd4baf5418b630f5e3a8724e0bdad25 data/create/loot_tables/blocks/fancy_gabbro_bricks_stairs.json 030b562f049fbd403efbc84b88efcb6988e9ed74 data/create/loot_tables/blocks/fancy_gabbro_bricks_wall.json c9f185553e94cd941a4058ab2194c279919c7778 data/create/loot_tables/blocks/fancy_granite_bricks.json -f15c6758244806514329ab21fb46a763b6785110 data/create/loot_tables/blocks/fancy_granite_bricks_slab.json +9748bdfc8350085d0baabc791bf7a39dc05a8e82 data/create/loot_tables/blocks/fancy_granite_bricks_slab.json 70266c8f9d1b150da78c40f3fd5ef51cd9e11090 data/create/loot_tables/blocks/fancy_granite_bricks_stairs.json 04fc099dc4f0e7e1e03a4e162c1c9f8e1443817f data/create/loot_tables/blocks/fancy_granite_bricks_wall.json a919a7333a2309392ba6908cd2330d014c0b44da data/create/loot_tables/blocks/fancy_limestone_bricks.json -5227c512cf9e75f36eb8a89c2aca8139392d6e7e data/create/loot_tables/blocks/fancy_limestone_bricks_slab.json +9774bbcd18fb216bcbc32e26fc4dd23072ed58ba data/create/loot_tables/blocks/fancy_limestone_bricks_slab.json 01d9d1a53ee36a84b689ea9018ed97b396dadf52 data/create/loot_tables/blocks/fancy_limestone_bricks_stairs.json 7d27790caf8d617c178f7b13cc6424813fad4f1f data/create/loot_tables/blocks/fancy_limestone_bricks_wall.json 03eaefe79ab0b61ad0bd0109db995059ed036d60 data/create/loot_tables/blocks/fancy_scoria_bricks.json -557e9825375f8486f61185bd8ed2433c63f6f845 data/create/loot_tables/blocks/fancy_scoria_bricks_slab.json +6105aaaed7ab75a6d4a9681bc0dc7556da375a76 data/create/loot_tables/blocks/fancy_scoria_bricks_slab.json 5f8f0283601f6abc1e0ee19861fc4eb8dfcd2914 data/create/loot_tables/blocks/fancy_scoria_bricks_stairs.json 664b145ec54ad8e2a26fac4ba64de9dc7c9d92e3 data/create/loot_tables/blocks/fancy_scoria_bricks_wall.json 7580387fd66509a5a265f1a332666b96f9ca2355 data/create/loot_tables/blocks/fancy_weathered_limestone_bricks.json -e4d0fe35d3441a5815bd4e1357329b284e63ecd8 data/create/loot_tables/blocks/fancy_weathered_limestone_bricks_slab.json +1864ecdcba9588e17004a55415ab993937117b68 data/create/loot_tables/blocks/fancy_weathered_limestone_bricks_slab.json 1be3aae5c0aa8b3c3750db79699e9350adb12231 data/create/loot_tables/blocks/fancy_weathered_limestone_bricks_stairs.json 6bb505bad78cbb01a5cb5a069435bf4ed0e62adf data/create/loot_tables/blocks/fancy_weathered_limestone_bricks_wall.json c8aa9bbed8fd703eb1853de0b7c9e04dffb7a511 data/create/loot_tables/blocks/fluid_pipe.json @@ -2287,11 +2287,11 @@ ce0bb978b11935bc2d1218445f8ab18099af6b8a data/create/loot_tables/blocks/framed_g 4063880eda871fe63a4eb549a19daecabce849e5 data/create/loot_tables/blocks/furnace_engine.json 1070cba1c0f46cf7ebe31089f35333f5eadda6e4 data/create/loot_tables/blocks/gabbro.json 0356e003d8890d31b89d0ad98e32aae892da71f9 data/create/loot_tables/blocks/gabbro_bricks.json -dfecc18b03f1037bde2cbf02bc85c5d176b29828 data/create/loot_tables/blocks/gabbro_bricks_slab.json +bd93e42ebca985b8aeeaf0ea5fb736d496183615 data/create/loot_tables/blocks/gabbro_bricks_slab.json e51893e1601c470da466b35b17251238e15d0361 data/create/loot_tables/blocks/gabbro_bricks_stairs.json 7064a46c81963ad06e14c1ed2f5a885a8895c459 data/create/loot_tables/blocks/gabbro_bricks_wall.json 54fb8b5b8ab3a22197e3c1b5b04767b898377da8 data/create/loot_tables/blocks/gabbro_cobblestone.json -986300390270e170b96db152017f5939c0e0653c data/create/loot_tables/blocks/gabbro_cobblestone_slab.json +8bb96e5257b0b6c09ce60bfe6c8b43a9d13dee95 data/create/loot_tables/blocks/gabbro_cobblestone_slab.json 54879fe6ca3b7271fbb94ec26bef1c3031942d4d data/create/loot_tables/blocks/gabbro_cobblestone_stairs.json ae19749df10663efc51b8b27af310164f250ed38 data/create/loot_tables/blocks/gabbro_cobblestone_wall.json e8d09c919e3b8125d7da0f38383c01bcfc61c7a8 data/create/loot_tables/blocks/gabbro_pillar.json @@ -2299,11 +2299,11 @@ b0109b4a4f0f738cbbe6b5911e8c3c0310b76f99 data/create/loot_tables/blocks/gearbox. 5f39461c5c9d3ad8d84195b06b9468fe2b0fb269 data/create/loot_tables/blocks/gearshift.json c8aa9bbed8fd703eb1853de0b7c9e04dffb7a511 data/create/loot_tables/blocks/glass_fluid_pipe.json 74371bc2b516ad9742ca081d82dc1b7f642e25b4 data/create/loot_tables/blocks/granite_bricks.json -29f2cbc04f898bb8ff48055a7e43ded85e635bf9 data/create/loot_tables/blocks/granite_bricks_slab.json +f341c87b9d67f3281a4ca3fac99fccfb6ef81003 data/create/loot_tables/blocks/granite_bricks_slab.json 6b2c74992f261df4f539ff65919e2f4a58b146ec data/create/loot_tables/blocks/granite_bricks_stairs.json 8916645260d99be1e13421d343980d863a14a695 data/create/loot_tables/blocks/granite_bricks_wall.json fa0ddf45d108f55550164113cb5cfd002586a9d4 data/create/loot_tables/blocks/granite_cobblestone.json -1889a94c41a2d6bcc24cc7b9546a2d75bd297fbd data/create/loot_tables/blocks/granite_cobblestone_slab.json +3495c41fbb9f93c957c957d03b220a2537680538 data/create/loot_tables/blocks/granite_cobblestone_slab.json feca8a1f62e0e13fcb2252d5f782d74938b84431 data/create/loot_tables/blocks/granite_cobblestone_stairs.json 1d225a68b09d6f389aa7ed48aa05979bdaa482a9 data/create/loot_tables/blocks/granite_cobblestone_wall.json 87a4ac3db5ec80613b940abccc72fc4b37cee0ba data/create/loot_tables/blocks/granite_pillar.json @@ -2342,11 +2342,11 @@ cae6d16c8967164698efbce3b91018a8e79a81e9 data/create/loot_tables/blocks/lime_val 7dfd638cc6f0d22bbc8fcbdb7212a3bfc8c85223 data/create/loot_tables/blocks/limesand.json 9d585f677a32a2336df5f17b5b389cdee867939f data/create/loot_tables/blocks/limestone.json 57134f7d3d32fc1c48f2a20c4be84388587092bc data/create/loot_tables/blocks/limestone_bricks.json -cb315814960850b5080598b89ee94c833b5048f7 data/create/loot_tables/blocks/limestone_bricks_slab.json +1b59a36aa1a889c42d4b8b939f5eeee2967222d0 data/create/loot_tables/blocks/limestone_bricks_slab.json 41ed1d0750e8ddd7e7e75fd7e4cafde6346d1afe data/create/loot_tables/blocks/limestone_bricks_stairs.json 0b8b29ef8b5da9527fb56e676de210f7f5b4c1b4 data/create/loot_tables/blocks/limestone_bricks_wall.json 9fa612159a498b2475489f984ce4fee18f971568 data/create/loot_tables/blocks/limestone_cobblestone.json -837129095bd84142e00c18ed03be39ad178627a9 data/create/loot_tables/blocks/limestone_cobblestone_slab.json +ebb8f7a60d6d9debc53a1f16749d61b980dd1d18 data/create/loot_tables/blocks/limestone_cobblestone_slab.json 8db1e3f0dac48b91a4839206a7d5a88cef415fdc data/create/loot_tables/blocks/limestone_cobblestone_stairs.json 92fb16606f289ad33860270d098fad2522b24e09 data/create/loot_tables/blocks/limestone_cobblestone_wall.json 371115e5ceb08c07a9ab2371509960c31e0baa8a data/create/loot_tables/blocks/limestone_pillar.json @@ -2399,39 +2399,39 @@ bab9f6fb35f2ba4aa45fd726a8e94f90ef155bfb data/create/loot_tables/blocks/overgrow e0fc59a8645dae8f87e62b34c08014077e14de66 data/create/loot_tables/blocks/overgrown_scoria.json 8af10a6b2d07ed1b84ce617502ad68044262e701 data/create/loot_tables/blocks/overgrown_weathered_limestone.json fc529ec8d55abf361ba1b8c38875839530b082c6 data/create/loot_tables/blocks/paved_andesite.json -3658337cb8a5a6cdd7dd19dd8ac399b1397350d5 data/create/loot_tables/blocks/paved_andesite_slab.json +d2b507115f64319f26785ce909eb0141a9f9d6d7 data/create/loot_tables/blocks/paved_andesite_slab.json 4dbc7c7537e680e4e7c8a5ba4e4ed394d788b10d data/create/loot_tables/blocks/paved_andesite_stairs.json 550795c90bce7ee25d12611ac04333dc2f04c727 data/create/loot_tables/blocks/paved_andesite_wall.json 6e2abd4ccd9f1835237a074ee897306049faeeaf data/create/loot_tables/blocks/paved_dark_scoria.json -d1f6830634cc426761a998bbc13d12be23b35fbc data/create/loot_tables/blocks/paved_dark_scoria_slab.json +d9642c4ef3e7efa3479627e9ee0ddda93baeeaec data/create/loot_tables/blocks/paved_dark_scoria_slab.json c6b0ff8dc016dd42b22c408c3419f6711f1b3080 data/create/loot_tables/blocks/paved_dark_scoria_stairs.json 974783eeb365799e9a506d304ef2933695f28fd4 data/create/loot_tables/blocks/paved_dark_scoria_wall.json ffbf1aa8e79c473a3c9e23b1b5b47b5b5028d3d1 data/create/loot_tables/blocks/paved_diorite.json -f5ef960992b47a951a711fa106c48f7b8a5b96d4 data/create/loot_tables/blocks/paved_diorite_slab.json +077ec4b8e967de13f467dd5577c299353cf0c8b5 data/create/loot_tables/blocks/paved_diorite_slab.json bb07e230483cf3bee30b9d9f6eb4976dabac02d7 data/create/loot_tables/blocks/paved_diorite_stairs.json a32cc9641d0a5ddc1d0e3203c8b5f889f8c8dfc4 data/create/loot_tables/blocks/paved_diorite_wall.json 3ba353c436a3ff7af9174f103453fb5828c09294 data/create/loot_tables/blocks/paved_dolomite.json -cd25811c174f143b06a37175bfbdd768a2831204 data/create/loot_tables/blocks/paved_dolomite_slab.json +df5ef5fa0ae95765435f518cedc63df27df03c60 data/create/loot_tables/blocks/paved_dolomite_slab.json 4ae91089463b12b3cd83504b9479f8bf12131523 data/create/loot_tables/blocks/paved_dolomite_stairs.json 54f2b73b5bc1cdfb9967cc8739fdb5964e0823b3 data/create/loot_tables/blocks/paved_dolomite_wall.json 22845a058f1ce2e998bbb9934bd042b3bd6e6b81 data/create/loot_tables/blocks/paved_gabbro.json -592b138171f9a54fa7208269503c9cf42d82b3e1 data/create/loot_tables/blocks/paved_gabbro_slab.json +c61e86f4f82340072b63a2eccf1e944f85990d94 data/create/loot_tables/blocks/paved_gabbro_slab.json 9bf714ac05d6ab5d2eb64af9b42333180eac3483 data/create/loot_tables/blocks/paved_gabbro_stairs.json 49faaf2df21b468bb033fafc406753c2303e3410 data/create/loot_tables/blocks/paved_gabbro_wall.json 6ce5f4468d05e4458a38ec916b42e45cf1478ae6 data/create/loot_tables/blocks/paved_granite.json -dcad2650b29ef4ebda66a4c8f3af25e8e634e56a data/create/loot_tables/blocks/paved_granite_slab.json +1c656ae7dc434094419b3f906acacfbfdd3716f0 data/create/loot_tables/blocks/paved_granite_slab.json 598924af51d35e3a1115896c161a31a72d5f0905 data/create/loot_tables/blocks/paved_granite_stairs.json 8c4a5acdf69eb5d1fa50453592f07dc28e4da813 data/create/loot_tables/blocks/paved_granite_wall.json 32a8d96e95cb0b784656b36078905c72ad51ee70 data/create/loot_tables/blocks/paved_limestone.json -d59bf5bece914869ce3277090ce199881a812bfc data/create/loot_tables/blocks/paved_limestone_slab.json +e44f9e93023232a240905a2ca4ef0ec71b9ec35a data/create/loot_tables/blocks/paved_limestone_slab.json a16ba0798803221478012d37db8555bb36e0a9ac data/create/loot_tables/blocks/paved_limestone_stairs.json fde4316b1469c689370264fcdca37ac4929906c4 data/create/loot_tables/blocks/paved_limestone_wall.json 6d832782d9e73ff9f94920aaa0335d7e86aa65e9 data/create/loot_tables/blocks/paved_scoria.json -a0777a7b1d9a25f25d65d8093948c890fed4baec data/create/loot_tables/blocks/paved_scoria_slab.json +eb87b6c339efa712dec346f84189e0a519f3bfa9 data/create/loot_tables/blocks/paved_scoria_slab.json 3a72097f8e8ff3df80c540f5e8b54435e319c479 data/create/loot_tables/blocks/paved_scoria_stairs.json 7b717c3176a2a55d728f2102c6f9d82cc6305fb2 data/create/loot_tables/blocks/paved_scoria_wall.json dfeba5c6de20e9ec0252e43b7c4046f017284d3d data/create/loot_tables/blocks/paved_weathered_limestone.json -32eed137f13c25a7b9db2fb457901e0c03cabb16 data/create/loot_tables/blocks/paved_weathered_limestone_slab.json +09789862582b5409cd446f734cd53b6f807342cf data/create/loot_tables/blocks/paved_weathered_limestone_slab.json 67b9227237ed2a8c09c4183c0f2ab1b3bd07084b data/create/loot_tables/blocks/paved_weathered_limestone_stairs.json d3e4ab984aef19ee21a1c5b868eb3fde96c05afd data/create/loot_tables/blocks/paved_weathered_limestone_wall.json 28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/pink_sail.json @@ -2439,27 +2439,27 @@ d3e4ab984aef19ee21a1c5b868eb3fde96c05afd data/create/loot_tables/blocks/paved_we d85b09659f08a73513c57b1b2e5ec7fc4b6f340a data/create/loot_tables/blocks/pink_valve_handle.json 1087b6c6d88dc7c71ed81e1d3e180fe065e6d098 data/create/loot_tables/blocks/piston_extension_pole.json 05302657546d8d410e367e84d4d5e01f01523236 data/create/loot_tables/blocks/polished_dark_scoria.json -1b323a883816428ff851462f61d00eaee7255e33 data/create/loot_tables/blocks/polished_dark_scoria_slab.json +d3e0339ae3f25eca37279dc22676e07c1d80a9bb data/create/loot_tables/blocks/polished_dark_scoria_slab.json a105d9992122370d80d190fcabcadcf167f71bd3 data/create/loot_tables/blocks/polished_dark_scoria_stairs.json 3298bdd51f488399459e9be88610296c8fdbf880 data/create/loot_tables/blocks/polished_dark_scoria_wall.json 9faa9435b97de565947686a8d5ecb29fff5aca8c data/create/loot_tables/blocks/polished_dolomite.json -5d85866fab9c553dd387b2c147d2b8c5f4617c11 data/create/loot_tables/blocks/polished_dolomite_slab.json +7bb70c7613df2accfbe81164a3c73fb5d27bf0fb data/create/loot_tables/blocks/polished_dolomite_slab.json 25d03f9ad84709dc86ef660b78384c5e6b4a566c data/create/loot_tables/blocks/polished_dolomite_stairs.json 73b2aae50efbef2f69177dfdb55a4fe60c377f71 data/create/loot_tables/blocks/polished_dolomite_wall.json 3963878203d8383de9190ea08bafb85a83f7c6bb data/create/loot_tables/blocks/polished_gabbro.json -1af13e327c6ef6de64d9e220ef8c8960774170d0 data/create/loot_tables/blocks/polished_gabbro_slab.json +bb41b7dd97fe6114ca45319868d98d75bb3d824e data/create/loot_tables/blocks/polished_gabbro_slab.json d7af796369513af346c7325866433f7e0fea0ab7 data/create/loot_tables/blocks/polished_gabbro_stairs.json f54e5452a659d452e936424f35e4fdf7b2817843 data/create/loot_tables/blocks/polished_gabbro_wall.json 9f9c0531d0a6fd6041a24390126531c8d8fd5b2e data/create/loot_tables/blocks/polished_limestone.json -cd507b7b5990ec15793c187105359c4b37205757 data/create/loot_tables/blocks/polished_limestone_slab.json +6b5343b5f1b59ca30dc9cff6f40b6d0fc37f0057 data/create/loot_tables/blocks/polished_limestone_slab.json ddad935d589d85c2b2c4666caf4215771fb7dfbc data/create/loot_tables/blocks/polished_limestone_stairs.json 142148b74e61ae778f45465fc1df0aaae59e8fef data/create/loot_tables/blocks/polished_limestone_wall.json 51cbf4f5df6382161121f8b3b773d04cea36636b data/create/loot_tables/blocks/polished_scoria.json -27745995383c4e4d67acd9a55666f3c89a168b5d data/create/loot_tables/blocks/polished_scoria_slab.json +9fd9b4a384ea06b3f8522b8397a5e1a997a0a6ca data/create/loot_tables/blocks/polished_scoria_slab.json 125e1fa323de8b565e17b1eedf1ca779bb2fddf7 data/create/loot_tables/blocks/polished_scoria_stairs.json c7029af40b6f5dd2cd8f2ae7dfb89b37074624e6 data/create/loot_tables/blocks/polished_scoria_wall.json 6da8efd3289ceeb187f7037397329dcece287683 data/create/loot_tables/blocks/polished_weathered_limestone.json -812be8e20c86013b9336939ecd78a9579ef75a1a data/create/loot_tables/blocks/polished_weathered_limestone_slab.json +93f7be402a8088d33a94954572e111bcd71f11c8 data/create/loot_tables/blocks/polished_weathered_limestone_slab.json 6ef650c723d409c7a678ffac45212e22e37581c0 data/create/loot_tables/blocks/polished_weathered_limestone_stairs.json 58715bc033e4740dbb754f91c93a22b9d06828e6 data/create/loot_tables/blocks/polished_weathered_limestone_wall.json fbe98efcb1a5970b6795fdbbb671fee704c0945f data/create/loot_tables/blocks/portable_storage_interface.json @@ -2486,11 +2486,11 @@ aa6af37356d65105efab2503ffe75f778cfe873b data/create/loot_tables/blocks/rotation c4a89145334addfd0dd1fedf7fa75ba07a7d3490 data/create/loot_tables/blocks/schematicannon.json af1bbbb8236b4ab05a6a8edc6db960bc758cbdf3 data/create/loot_tables/blocks/scoria.json bb670ac5dd2fa4c743bc268cd0547926eb6cdb68 data/create/loot_tables/blocks/scoria_bricks.json -93c5165b6d1655f99eb45d708080ae54b1a3a118 data/create/loot_tables/blocks/scoria_bricks_slab.json +a7217ea301a282d0ef52f2d8c06dd8683398408d data/create/loot_tables/blocks/scoria_bricks_slab.json 58a188f3ebfeb3d19323c3f8dfa3e020a7f6cdc4 data/create/loot_tables/blocks/scoria_bricks_stairs.json 81dae28911c6ff8d8330a597fc1e4eab1e77942d data/create/loot_tables/blocks/scoria_bricks_wall.json c55969dc0f736f770e3c27d9f2609d20d379fed1 data/create/loot_tables/blocks/scoria_cobblestone.json -18637fc6cd83ed43fed0cda3a9538ca77f3c96e1 data/create/loot_tables/blocks/scoria_cobblestone_slab.json +4e9284ff133bc53ef5a55788c2e80079bb3c6817 data/create/loot_tables/blocks/scoria_cobblestone_slab.json 3205ea5dd97df68f733f54aa3ab3f98a5ce20942 data/create/loot_tables/blocks/scoria_cobblestone_stairs.json d2139e9daa55c09cd262b15c980d65c554347e45 data/create/loot_tables/blocks/scoria_cobblestone_wall.json 82fb40738f53892571ad83789ff45315e887c811 data/create/loot_tables/blocks/scoria_pillar.json @@ -2514,11 +2514,11 @@ d0156602dd5f4a274c293df67e19374820c72890 data/create/loot_tables/blocks/vertical 2883c63ceb1273009dbf91cb0693756cadf79a1a data/create/loot_tables/blocks/water_wheel.json 611d6195db52c074de484ec52d7ac9eb96b4ff10 data/create/loot_tables/blocks/weathered_limestone.json c1f379baad36a20fc767be094db10480a0378184 data/create/loot_tables/blocks/weathered_limestone_bricks.json -d9ab81fb9e2bb348e5bcc0ef2c2adf767493da4d data/create/loot_tables/blocks/weathered_limestone_bricks_slab.json +43be7e49b9a8a75077066aa824a0f784aa741683 data/create/loot_tables/blocks/weathered_limestone_bricks_slab.json c2a62f12680d04ed4f586c501bb026e367243dd2 data/create/loot_tables/blocks/weathered_limestone_bricks_stairs.json 1b1016be0cc0bdf599f3e6b84c6663436e8d5835 data/create/loot_tables/blocks/weathered_limestone_bricks_wall.json 2500dc22c1f8793053d223958a5763a0f9554874 data/create/loot_tables/blocks/weathered_limestone_cobblestone.json -8e3f79fe8a06b1b55f347d80f028e040c85c19ab data/create/loot_tables/blocks/weathered_limestone_cobblestone_slab.json +8b5e676938d5b356054d336e1716944178d35a42 data/create/loot_tables/blocks/weathered_limestone_cobblestone_slab.json a89f425c47c3831071b556697169a3124370aed7 data/create/loot_tables/blocks/weathered_limestone_cobblestone_stairs.json e8f3af61d9a2fd1ff5b32c9bb474ed005e6d70c4 data/create/loot_tables/blocks/weathered_limestone_cobblestone_wall.json 54358a64639957cc66ffa5296ff45723f7adf00e data/create/loot_tables/blocks/weathered_limestone_pillar.json 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/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 { From 5bd6110d59d3f0302fbd9e4c515e2d399aa528ec Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Wed, 11 Nov 2020 01:17:06 +0800 Subject: [PATCH 09/12] Implement GuiBlockModelRenderBuilder tinting --- .../com/simibubi/create/foundation/gui/GuiGameElement.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); From 85b3ab20254439eeb378e8e18bd97d6da62e438c Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Wed, 11 Nov 2020 01:48:42 +0800 Subject: [PATCH 10/12] Fix SchematicWorld NPE --- .../simibubi/create/content/schematics/SchematicWorld.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; From 466739bcf5d3407218e8ee517236a24784434aa1 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Wed, 11 Nov 2020 10:52:57 +0800 Subject: [PATCH 11/12] Fix Extendo Grip knockback --- .../glue/SuperGlueHandler.java | 4 +--- .../curiosities/tools/ExtendoGripItem.java | 20 ++++--------------- .../zapper/ZapperRenderHandler.java | 2 -- 3 files changed, 5 insertions(+), 21 deletions(-) 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/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; From 6cc6973bc89cb40b6dcc0da7d0b4798f7724eec9 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Wed, 11 Nov 2020 11:54:04 +0800 Subject: [PATCH 12/12] Fix BeltInventory.eject different behavior in orientations --- .../contraptions/relays/belt/transport/BeltInventory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8271b56b8..85775cead 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();