From c2fe23bb5de1f17083397d18b558c68cc0431d7a Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 8 Nov 2023 20:00:19 +0000 Subject: [PATCH] Feature murder --- .../quark/base/network/QuarkNetwork.java | 1 - .../base/network/message/EditSignMessage.java | 31 ----- .../building/module/BambooBackportModule.java | 27 ---- .../module/CompressedBlocksModule.java | 13 +- ...Module.java => ImprovedSpongesModule.java} | 34 ++++- .../tweaks/module/SignEditingModule.java | 97 -------------- .../tweaks/module/SpongesBetterModule.java | 35 ----- .../world/module/BlossomTreesModule.java | 2 - .../quark/mixin/SpongeBlockMixin.java | 6 +- .../quark/blockstates/bamboo_block.json | 7 - .../quark/blockstates/bamboo_button.json | 28 ---- .../assets/quark/blockstates/bamboo_door.json | 124 ------------------ .../quark/blockstates/bamboo_fence.json | 45 ------- .../quark/blockstates/bamboo_fence_gate.json | 80 ----------- .../quark/blockstates/bamboo_mosaic.json | 5 - .../quark/blockstates/bamboo_planks.json | 5 - .../quark/blockstates/bamboo_planks_slab.json | 7 - .../blockstates/bamboo_planks_stairs.json | 44 ------- .../blockstates/bamboo_pressure_plate.json | 6 - .../assets/quark/blockstates/bamboo_sign.json | 7 - .../quark/blockstates/bamboo_trapdoor.json | 69 ---------- .../quark/blockstates/bamboo_wall_sign.json | 7 - .../quark/blockstates/pink_blossom_hedge.json | 59 --------- .../blockstates/pink_blossom_leaf_carpet.json | 5 - .../blockstates/pink_blossom_leaves.json | 5 - .../blockstates/pink_blossom_sapling.json | 5 - .../potted_pink_blossom_sapling.json | 5 - .../blockstates/stripped_bamboo_block.json | 7 - .../quark/models/block/bamboo_block.json | 7 - .../quark/models/block/bamboo_button.json | 6 - .../models/block/bamboo_button_pressed.json | 6 - .../models/block/bamboo_door_bottom_left.json | 7 - .../block/bamboo_door_bottom_left_open.json | 7 - .../block/bamboo_door_bottom_right.json | 7 - .../block/bamboo_door_bottom_right_open.json | 7 - .../models/block/bamboo_door_top_left.json | 7 - .../block/bamboo_door_top_left_open.json | 7 - .../models/block/bamboo_door_top_right.json | 7 - .../block/bamboo_door_top_right_open.json | 7 - .../quark/models/block/bamboo_fence_gate.json | 7 - .../models/block/bamboo_fence_gate_open.json | 7 - .../models/block/bamboo_fence_gate_wall.json | 7 - .../block/bamboo_fence_gate_wall_open.json | 7 - .../models/block/bamboo_fence_inventory.json | 6 - .../quark/models/block/bamboo_fence_post.json | 7 - .../models/block/bamboo_fence_side_east.json | 6 - .../models/block/bamboo_fence_side_north.json | 6 - .../models/block/bamboo_fence_side_south.json | 6 - .../models/block/bamboo_fence_side_west.json | 6 - .../quark/models/block/bamboo_mosaic.json | 6 - .../quark/models/block/bamboo_planks.json | 6 - .../models/block/bamboo_planks_slab.json | 8 -- .../models/block/bamboo_planks_slab_top.json | 8 -- .../models/block/bamboo_planks_stairs.json | 8 -- .../block/bamboo_planks_stairs_inner.json | 8 -- .../block/bamboo_planks_stairs_outer.json | 8 -- .../models/block/bamboo_pressure_plate.json | 6 - .../block/bamboo_pressure_plate_down.json | 6 - .../quark/models/block/bamboo_sign.json | 5 - .../models/block/bamboo_trapdoor_bottom.json | 6 - .../models/block/bamboo_trapdoor_open.json | 6 - .../models/block/bamboo_trapdoor_top.json | 6 - .../block/pink_blossom_hedge_extend.json | 6 - .../models/block/pink_blossom_hedge_post.json | 7 - .../models/block/pink_blossom_hedge_side.json | 6 - .../block/pink_blossom_leaf_carpet.json | 6 - .../models/block/pink_blossom_leaves.json | 6 - .../models/block/pink_blossom_sapling.json | 6 - .../block/potted_pink_blossom_sapling.json | 6 - .../models/block/stripped_bamboo_block.json | 7 - .../quark/models/item/bamboo_block.json | 3 - .../quark/models/item/bamboo_button.json | 6 - .../assets/quark/models/item/bamboo_door.json | 6 - .../quark/models/item/bamboo_fence.json | 3 - .../quark/models/item/bamboo_fence_gate.json | 3 - .../quark/models/item/bamboo_mosaic.json | 3 - .../quark/models/item/bamboo_planks.json | 3 - .../quark/models/item/bamboo_planks_slab.json | 3 - .../models/item/bamboo_planks_stairs.json | 3 - .../models/item/bamboo_pressure_plate.json | 3 - .../assets/quark/models/item/bamboo_sign.json | 6 - .../quark/models/item/bamboo_trapdoor.json | 3 - .../quark/models/item/pink_blossom_hedge.json | 3 - .../models/item/pink_blossom_leaf_carpet.json | 3 - .../models/item/pink_blossom_leaves.json | 3 - .../models/item/pink_blossom_sapling.json | 6 - .../models/item/stripped_bamboo_block.json | 3 - .../quark/textures/block/bamboo_block.png | Bin 299 -> 0 bytes .../quark/textures/block/bamboo_block_top.png | Bin 198 -> 0 bytes .../textures/block/bamboo_door_bottom.png | Bin 327 -> 0 bytes .../quark/textures/block/bamboo_door_top.png | Bin 304 -> 0 bytes .../quark/textures/block/bamboo_fence.png | Bin 295 -> 0 bytes .../textures/block/bamboo_fence_gate.png | Bin 289 -> 0 bytes .../block/bamboo_fence_gate_particle.png | Bin 213 -> 0 bytes .../textures/block/bamboo_fence_particle.png | Bin 213 -> 0 bytes .../quark/textures/block/bamboo_mosaic.png | Bin 303 -> 0 bytes .../quark/textures/block/bamboo_planks.png | Bin 274 -> 0 bytes .../quark/textures/block/bamboo_trapdoor.png | Bin 323 -> 0 bytes .../textures/block/pink_blossom_leaves.png | Bin 576 -> 0 bytes .../textures/block/pink_blossom_sapling.png | Bin 524 -> 0 bytes .../textures/block/stripped_bamboo_block.png | Bin 289 -> 0 bytes .../block/stripped_bamboo_block_top.png | Bin 221 -> 0 bytes .../quark/textures/entity/signs/bamboo.png | Bin 933 -> 0 bytes .../quark/textures/item/bamboo_door.png | Bin 237 -> 0 bytes .../quark/textures/item/bamboo_sign.png | Bin 263 -> 0 bytes .../tags/blocks/storage_blocks/bamboo.json | 6 - .../tags/items/storage_blocks/bamboo.json | 6 - .../loot_tables/blocks/bamboo_block.json | 19 --- .../loot_tables/blocks/bamboo_bookshelf.json | 47 ------- .../loot_tables/blocks/bamboo_button.json | 19 --- .../loot_tables/blocks/bamboo_chest.json | 25 ---- .../quark/loot_tables/blocks/bamboo_door.json | 28 ---- .../loot_tables/blocks/bamboo_fence.json | 19 --- .../loot_tables/blocks/bamboo_fence_gate.json | 19 --- .../loot_tables/blocks/bamboo_ladder.json | 19 --- .../quark/loot_tables/blocks/bamboo_mat.json | 19 --- .../loot_tables/blocks/bamboo_mat_carpet.json | 19 --- .../loot_tables/blocks/bamboo_mosaic.json | 19 --- .../loot_tables/blocks/bamboo_planks.json | 19 --- .../blocks/bamboo_planks_slab.json | 32 ----- .../blocks/bamboo_planks_stairs.json | 19 --- .../blocks/bamboo_planks_vertical_slab.json | 32 ----- .../quark/loot_tables/blocks/bamboo_post.json | 19 --- .../blocks/bamboo_pressure_plate.json | 19 --- .../quark/loot_tables/blocks/bamboo_sign.json | 19 --- .../loot_tables/blocks/bamboo_trapdoor.json | 19 --- .../blocks/bamboo_trapped_chest.json | 25 ---- .../loot_tables/blocks/bamboo_wall_sign.json | 19 --- .../blocks/lootr_bamboo_chest.json | 25 ---- .../blocks/lootr_bamboo_trapped_chest.json | 25 ---- .../blocks/pink_blossom_hedge.json | 19 --- .../blocks/pink_blossom_leaf_carpet.json | 19 --- .../blocks/pink_blossom_leaves.json | 65 --------- .../blocks/pink_blossom_sapling.json | 19 --- .../blocks/potted_pink_blossom_sapling.json | 33 ----- .../blocks/stripped_bamboo_block.json | 19 --- .../blocks/stripped_bamboo_post.json | 19 --- .../blocks/vertical_bamboo_planks.json | 19 --- .../recipes/building/crafting/bamboo_mat.json | 26 ---- .../building/crafting/bamboo_mat_carpet.json | 21 --- .../crafting/compressed/bamboo_block.json | 22 ---- .../compressed/bamboo_block_uncompress.json | 30 ----- .../building/crafting/pink_blossom_hedge.json | 34 ----- .../crafting/pink_blossom_leaf_carpet.json | 30 ----- .../crafting/slabs/bamboo_planks_slab.json | 21 --- .../crafting/stairs/bamboo_planks_stairs.json | 23 ---- .../vertplanks/vertical_bamboo_planks.json | 32 ----- .../vertical_bamboo_planks_revert.json | 27 ---- .../bamboo_planks_vertical_slab.json | 23 ---- .../bamboo_planks_vertical_slab_revert.json | 18 --- .../crafting/woodsets/bamboo/bookshelf.json | 35 ----- .../crafting/woodsets/bamboo/button.json | 18 --- .../crafting/woodsets/bamboo/chest.json | 33 ----- .../crafting/woodsets/bamboo/chest_wood.json | 37 ------ .../crafting/woodsets/bamboo/door.json | 24 ---- .../crafting/woodsets/bamboo/fence.json | 26 ---- .../crafting/woodsets/bamboo/fence_gate.json | 25 ---- .../crafting/woodsets/bamboo/ladder.json | 35 ----- .../crafting/woodsets/bamboo/mosaic.json | 21 --- .../crafting/woodsets/bamboo/planks.json | 28 ---- .../woodsets/bamboo/planks_from_item.json | 37 ------ .../crafting/woodsets/bamboo/post.json | 32 ----- .../woodsets/bamboo/pressure_plate.json | 21 --- .../crafting/woodsets/bamboo/sign.json | 27 ---- .../woodsets/bamboo/stripped_post.json | 32 ----- .../crafting/woodsets/bamboo/trapdoor.json | 23 ---- .../woodsets/bamboo/trapped_chest.json | 29 ---- .../utility/misc/easy_sticks_bamboo.json | 31 ----- .../data/quark/tags/blocks/bamboo_logs.json | 7 - .../data/quark/tags/items/bamboo_logs.json | 7 - .../structure/bamboo_chest_structures.json | 4 - 171 files changed, 37 insertions(+), 2656 deletions(-) delete mode 100644 src/main/java/org/violetmoon/quark/base/network/message/EditSignMessage.java delete mode 100644 src/main/java/org/violetmoon/quark/content/building/module/BambooBackportModule.java rename src/main/java/org/violetmoon/quark/content/tweaks/module/{SpongeOnWaterPlacementModule.java => ImprovedSpongesModule.java} (60%) delete mode 100644 src/main/java/org/violetmoon/quark/content/tweaks/module/SignEditingModule.java delete mode 100644 src/main/java/org/violetmoon/quark/content/tweaks/module/SpongesBetterModule.java delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_block.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_button.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_door.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_fence.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_fence_gate.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_mosaic.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_planks.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_planks_slab.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_planks_stairs.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_pressure_plate.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_sign.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_trapdoor.json delete mode 100644 src/main/resources/assets/quark/blockstates/bamboo_wall_sign.json delete mode 100644 src/main/resources/assets/quark/blockstates/pink_blossom_hedge.json delete mode 100644 src/main/resources/assets/quark/blockstates/pink_blossom_leaf_carpet.json delete mode 100644 src/main/resources/assets/quark/blockstates/pink_blossom_leaves.json delete mode 100644 src/main/resources/assets/quark/blockstates/pink_blossom_sapling.json delete mode 100644 src/main/resources/assets/quark/blockstates/potted_pink_blossom_sapling.json delete mode 100644 src/main/resources/assets/quark/blockstates/stripped_bamboo_block.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_block.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_button.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_button_pressed.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_door_bottom_left.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_door_bottom_left_open.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_door_bottom_right.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_door_bottom_right_open.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_door_top_left.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_door_top_left_open.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_door_top_right.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_door_top_right_open.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_gate.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_gate_open.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_gate_wall.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_gate_wall_open.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_inventory.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_post.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_side_east.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_side_north.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_side_south.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_fence_side_west.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_mosaic.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_planks.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_planks_slab.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_planks_slab_top.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_planks_stairs.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_planks_stairs_inner.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_planks_stairs_outer.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_pressure_plate.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_pressure_plate_down.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_sign.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_trapdoor_bottom.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_trapdoor_open.json delete mode 100644 src/main/resources/assets/quark/models/block/bamboo_trapdoor_top.json delete mode 100644 src/main/resources/assets/quark/models/block/pink_blossom_hedge_extend.json delete mode 100644 src/main/resources/assets/quark/models/block/pink_blossom_hedge_post.json delete mode 100644 src/main/resources/assets/quark/models/block/pink_blossom_hedge_side.json delete mode 100644 src/main/resources/assets/quark/models/block/pink_blossom_leaf_carpet.json delete mode 100644 src/main/resources/assets/quark/models/block/pink_blossom_leaves.json delete mode 100644 src/main/resources/assets/quark/models/block/pink_blossom_sapling.json delete mode 100644 src/main/resources/assets/quark/models/block/potted_pink_blossom_sapling.json delete mode 100644 src/main/resources/assets/quark/models/block/stripped_bamboo_block.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_block.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_button.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_door.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_fence.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_fence_gate.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_mosaic.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_planks.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_planks_slab.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_planks_stairs.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_pressure_plate.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_sign.json delete mode 100644 src/main/resources/assets/quark/models/item/bamboo_trapdoor.json delete mode 100644 src/main/resources/assets/quark/models/item/pink_blossom_hedge.json delete mode 100644 src/main/resources/assets/quark/models/item/pink_blossom_leaf_carpet.json delete mode 100644 src/main/resources/assets/quark/models/item/pink_blossom_leaves.json delete mode 100644 src/main/resources/assets/quark/models/item/pink_blossom_sapling.json delete mode 100644 src/main/resources/assets/quark/models/item/stripped_bamboo_block.json delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_block.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_block_top.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_door_bottom.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_door_top.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_fence.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_fence_gate.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_fence_gate_particle.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_fence_particle.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_mosaic.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_planks.png delete mode 100644 src/main/resources/assets/quark/textures/block/bamboo_trapdoor.png delete mode 100644 src/main/resources/assets/quark/textures/block/pink_blossom_leaves.png delete mode 100644 src/main/resources/assets/quark/textures/block/pink_blossom_sapling.png delete mode 100644 src/main/resources/assets/quark/textures/block/stripped_bamboo_block.png delete mode 100644 src/main/resources/assets/quark/textures/block/stripped_bamboo_block_top.png delete mode 100644 src/main/resources/assets/quark/textures/entity/signs/bamboo.png delete mode 100644 src/main/resources/assets/quark/textures/item/bamboo_door.png delete mode 100644 src/main/resources/assets/quark/textures/item/bamboo_sign.png delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks/bamboo.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks/bamboo.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_block.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_bookshelf.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_button.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_chest.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_door.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_fence.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_fence_gate.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_ladder.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_mat.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_mat_carpet.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_mosaic.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_planks.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_planks_slab.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_planks_stairs.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_planks_vertical_slab.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_post.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_pressure_plate.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_sign.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_trapdoor.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_trapped_chest.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/bamboo_wall_sign.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/lootr_bamboo_chest.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/lootr_bamboo_trapped_chest.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/pink_blossom_hedge.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/pink_blossom_leaf_carpet.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/pink_blossom_leaves.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/pink_blossom_sapling.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/potted_pink_blossom_sapling.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/stripped_bamboo_block.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/stripped_bamboo_post.json delete mode 100644 src/main/resources/data/quark/loot_tables/blocks/vertical_bamboo_planks.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/bamboo_mat.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/bamboo_mat_carpet.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/compressed/bamboo_block.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/compressed/bamboo_block_uncompress.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/pink_blossom_hedge.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/pink_blossom_leaf_carpet.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/slabs/bamboo_planks_slab.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/stairs/bamboo_planks_stairs.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/vertplanks/vertical_bamboo_planks.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/vertplanks/vertical_bamboo_planks_revert.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/vertslabs/bamboo_planks_vertical_slab.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/vertslabs/bamboo_planks_vertical_slab_revert.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/bookshelf.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/button.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/chest.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/chest_wood.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/door.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/fence.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/fence_gate.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/ladder.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/mosaic.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/planks.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/planks_from_item.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/post.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/pressure_plate.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/sign.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/stripped_post.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/trapdoor.json delete mode 100644 src/main/resources/data/quark/recipes/building/crafting/woodsets/bamboo/trapped_chest.json delete mode 100644 src/main/resources/data/quark/recipes/tweaks/crafting/utility/misc/easy_sticks_bamboo.json delete mode 100644 src/main/resources/data/quark/tags/blocks/bamboo_logs.json delete mode 100644 src/main/resources/data/quark/tags/items/bamboo_logs.json delete mode 100644 src/main/resources/data/quark/tags/worldgen/structure/bamboo_chest_structures.json diff --git a/src/main/java/org/violetmoon/quark/base/network/QuarkNetwork.java b/src/main/java/org/violetmoon/quark/base/network/QuarkNetwork.java index 016636bd88..166d55fc14 100644 --- a/src/main/java/org/violetmoon/quark/base/network/QuarkNetwork.java +++ b/src/main/java/org/violetmoon/quark/base/network/QuarkNetwork.java @@ -74,7 +74,6 @@ public static void setup(ZCommonSetup event) { // Clientbound network.register(DoEmoteMessage.class, ZetaNetworkDirection.PLAY_TO_CLIENT); - network.register(EditSignMessage.class, ZetaNetworkDirection.PLAY_TO_CLIENT); network.register(UpdateTridentMessage.class, ZetaNetworkDirection.PLAY_TO_CLIENT); // Flag Syncing diff --git a/src/main/java/org/violetmoon/quark/base/network/message/EditSignMessage.java b/src/main/java/org/violetmoon/quark/base/network/message/EditSignMessage.java deleted file mode 100644 index 35eae538fd..0000000000 --- a/src/main/java/org/violetmoon/quark/base/network/message/EditSignMessage.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.violetmoon.quark.base.network.message; - -import net.minecraft.core.BlockPos; - -import java.io.Serial; - -import org.violetmoon.quark.content.tweaks.module.SignEditingModule; -import org.violetmoon.zeta.network.IZetaMessage; -import org.violetmoon.zeta.network.IZetaNetworkEventContext; - -public class EditSignMessage implements IZetaMessage { - - @Serial - private static final long serialVersionUID = -329145938273036832L; - - public BlockPos pos; - - public EditSignMessage() {} - - public EditSignMessage(BlockPos pos) { - this.pos = pos; - } - - @Override - public boolean receive(IZetaNetworkEventContext context) { - context.enqueueWork(() -> SignEditingModule.Client.openSignGuiClient(pos)); - - return true; - } - -} diff --git a/src/main/java/org/violetmoon/quark/content/building/module/BambooBackportModule.java b/src/main/java/org/violetmoon/quark/content/building/module/BambooBackportModule.java deleted file mode 100644 index 6d9e8d6af7..0000000000 --- a/src/main/java/org/violetmoon/quark/content/building/module/BambooBackportModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.violetmoon.quark.content.building.module; - -import org.violetmoon.quark.base.block.QuarkBlock; -import org.violetmoon.quark.base.handler.WoodSetHandler; -import org.violetmoon.quark.base.handler.WoodSetHandler.WoodSet; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MaterialColor; - -@ZetaLoadModule(category = "building") -public class BambooBackportModule extends ZetaModule { - - public static WoodSet woodSet; - - @LoadEvent - public final void register(ZRegister event) { - woodSet = WoodSetHandler.addWoodSet(this, "bamboo", MaterialColor.COLOR_YELLOW, MaterialColor.COLOR_YELLOW, false, false, true); - - new QuarkBlock("bamboo_mosaic", this, CreativeModeTab.TAB_BUILDING_BLOCKS, BlockBehaviour.Properties.copy(woodSet.planks)); - } - -} diff --git a/src/main/java/org/violetmoon/quark/content/building/module/CompressedBlocksModule.java b/src/main/java/org/violetmoon/quark/content/building/module/CompressedBlocksModule.java index 04a252c3aa..ff5a6fc7ca 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/CompressedBlocksModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/CompressedBlocksModule.java @@ -44,13 +44,8 @@ public class CompressedBlocksModule extends ZetaModule { @Config.Min(0) public static int stickBlockFuelTime = 900; - @Config(name = "Bamboo Block Fuel Time") - @Config.Min(0) - public static int bambooBundleFuelTime = 500; - @Config(flag = "charcoal_block") public static boolean enableCharcoalBlock = true; @Config(flag = "sugar_cane_block") public static boolean enableSugarCaneBlock = true; - @Config(flag = "bamboo_block") public static boolean enableBambooBlock = true; @Config(flag = "cactus_block") public static boolean enableCactusBlock = true; @Config(flag = "chorus_fruit_block") public static boolean enableChorusFruitBlock = true; @Config(flag = "stick_block") public static boolean enableStickBlock = true; @@ -77,7 +72,6 @@ public class CompressedBlocksModule extends ZetaModule { @Hint("golden_apple_crate") public static Block golden_apple_crate; public static Block stick_block; - public static Block bamboo_bundle; private final List compostable = Lists.newArrayList(); @@ -90,9 +84,7 @@ public final void register(ZRegister event) { .sound(SoundType.STONE)) .setCondition(() -> enableCharcoalBlock); - bamboo_bundle = pillar("sugar_cane", MaterialColor.COLOR_LIGHT_GREEN, true, () -> enableSugarCaneBlock, 200); - Block bamboo = pillar("bamboo", MaterialColor.COLOR_GREEN, false, () -> enableBambooBlock, 200); - Block stripped_bamboo = pillar("stripped_bamboo", MaterialColor.COLOR_YELLOW, false, () -> enableBambooBlock, 200); + pillar("sugar_cane", MaterialColor.COLOR_LIGHT_GREEN, true, () -> enableSugarCaneBlock, 200); pillar("cactus", MaterialColor.COLOR_GREEN, true, () -> enableCactusBlock, 50); pillar("chorus_fruit", MaterialColor.COLOR_PURPLE, false, () -> enableChorusFruitBlock, 10); stick_block = pillar("stick", MaterialColor.WOOD, false, () -> enableStickBlock, 300); @@ -126,8 +118,6 @@ public final void register(ZRegister event) { .strength(0.4F) .sound(SoundType.WOOL)) .setCondition(() -> enableBondedRabbitHide); - - ToolInteractionHandler.registerInteraction(ToolActions.AXE_STRIP, bamboo, stripped_bamboo); } @LoadEvent @@ -141,7 +131,6 @@ public void loadComplete(ZLoadComplete event) { FuelHandler.addFuel(stick_block, stickBlockFuelTime); FuelHandler.addFuel(charcoal_block, charcoalBlockFuelTime); FuelHandler.addFuel(blaze_lantern, blazeLanternFuelTime); - FuelHandler.addFuel(bamboo_bundle, bambooBundleFuelTime); } private Block pillar(String name, MaterialColor color, boolean compost, BooleanSupplier cond, int flammability) { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/SpongeOnWaterPlacementModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/ImprovedSpongesModule.java similarity index 60% rename from src/main/java/org/violetmoon/quark/content/tweaks/module/SpongeOnWaterPlacementModule.java rename to src/main/java/org/violetmoon/quark/content/tweaks/module/ImprovedSpongesModule.java index 9433e4685e..bf24274c03 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/SpongeOnWaterPlacementModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/ImprovedSpongesModule.java @@ -1,5 +1,7 @@ package org.violetmoon.quark.content.tweaks.module; +import org.violetmoon.quark.base.Quark; +import org.violetmoon.quark.base.module.config.Config; import org.violetmoon.zeta.event.bus.PlayEvent; import org.violetmoon.zeta.event.play.entity.player.ZRightClickItem; import org.violetmoon.zeta.module.ZetaLoadModule; @@ -20,12 +22,26 @@ import net.minecraft.world.phys.BlockHitResult; @ZetaLoadModule(category = "tweaks") -public class SpongeOnWaterPlacementModule extends ZetaModule { +public class ImprovedSpongesModule extends ZetaModule { + @Config(description = "The maximum number of water tiles that a sponge can soak up. Vanilla default is 64.") + @Config.Min(64) + public static int maximumWaterDrain = 256; + + @Config(description = "The maximum number of water tiles that a sponge can 'crawl along' for draining. Vanilla default is 6.") + @Config.Min(6) + public static int maximumCrawlDistance = 10; + + @Config + public static boolean enablePlacingOnWater = true; + @Hint Item sponge = Items.SPONGE; @PlayEvent public void onUse(ZRightClickItem event) { + if(!enablePlacingOnWater) + return; + ItemStack stack = event.getItemStack(); if(stack.is(Items.SPONGE)) { Player player = event.getEntity(); @@ -45,5 +61,21 @@ public void onUse(ZRightClickItem event) { } } } + + public static int drainLimit(int previous) { + if (Quark.ZETA.modules.isEnabled(ImprovedSpongesModule.class)) { + // Additive to not directly conflict with other mods + return maximumWaterDrain - 64 + previous; + } + return previous; + } + + public static int crawlLimit(int previous) { + if (Quark.ZETA.modules.isEnabled(ImprovedSpongesModule.class)) { + // Additive to not directly conflict with other mods + return maximumCrawlDistance - 6 + previous; + } + return previous; + } } diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/SignEditingModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/SignEditingModule.java deleted file mode 100644 index 30add77e8d..0000000000 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/SignEditingModule.java +++ /dev/null @@ -1,97 +0,0 @@ -package org.violetmoon.quark.content.tweaks.module; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.module.config.Config; -import org.violetmoon.quark.base.network.QuarkNetwork; -import org.violetmoon.quark.base.network.message.EditSignMessage; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.bus.ZResult; -import org.violetmoon.zeta.event.play.entity.player.ZRightClickBlock; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - -import net.minecraft.client.Minecraft; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; -import net.minecraft.network.chat.ClickEvent; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.Style; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.DyeItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.SignBlockEntity; - -@ZetaLoadModule(category = "tweaks") -public class SignEditingModule extends ZetaModule { - - @Hint(key = "sign_editing") TagKey signs = ItemTags.SIGNS; - - @Config public static boolean requiresEmptyHand = false; - - @PlayEvent - public void onInteract(ZRightClickBlock event) { - if(event.getUseBlock() == ZResult.DENY) - return; - - BlockEntity tile = event.getLevel().getBlockEntity(event.getPos()); - Player player = event.getPlayer(); - ItemStack stack = player.getMainHandItem(); - - if(player instanceof ServerPlayer serverPlayer - && tile instanceof SignBlockEntity sign - && !doesSignHaveCommand(sign) - && (!requiresEmptyHand || stack.isEmpty()) - && !(stack.getItem() instanceof DyeItem) - && !(stack.getItem() == Items.GLOW_INK_SAC) - && !Registry.BLOCK.getKey(tile.getBlockState().getBlock()).getNamespace().equals("signbutton") - && player.mayUseItemAt(event.getPos(), event.getFace(), event.getItemStack()) - && !event.getEntity().isDiscrete()) { - - sign.setAllowedPlayerEditor(player.getUUID()); - sign.isEditable = true; - - QuarkNetwork.sendToPlayer(new EditSignMessage(event.getPos()), serverPlayer); - - event.setCanceled(true); - event.setCancellationResult(InteractionResult.SUCCESS); - } - } - - private boolean doesSignHaveCommand(SignBlockEntity sign) { - for(Component itextcomponent : sign.messages) { - Style style = itextcomponent == null ? null : itextcomponent.getStyle(); - if (style != null && style.getClickEvent() != null) { - ClickEvent clickevent = style.getClickEvent(); - if (clickevent.getAction() == ClickEvent.Action.RUN_COMMAND) { - return true; - } - } - } - - return false; - } - - //Not a client replacement module - public static class Client { - - public static void openSignGuiClient(BlockPos pos) { - if(!Quark.ZETA.modules.isEnabled(SignEditingModule.class)) - return; - - Minecraft mc = Minecraft.getInstance(); - BlockEntity tile = mc.level.getBlockEntity(pos); - - if(tile instanceof SignBlockEntity sign) - mc.player.openTextEdit(sign); - } - } - -} diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/SpongesBetterModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/SpongesBetterModule.java deleted file mode 100644 index 7719a321db..0000000000 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/SpongesBetterModule.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.violetmoon.quark.content.tweaks.module; - -import org.violetmoon.quark.base.Quark; -import org.violetmoon.quark.base.module.config.Config; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; - -@ZetaLoadModule(category = "tweaks") -public class SpongesBetterModule extends ZetaModule { - - @Config(description = "The maximum number of water tiles that a sponge can soak up. Vanilla default is 64.") - @Config.Min(64) - public static int maximumWaterDrain = 256; - - @Config(description = "The maximum number of water tiles that a sponge can 'crawl along' for draining. Vanilla default is 6.") - @Config.Min(6) - public static int maximumCrawlDistance = 10; - - public static int drainLimit(int previous) { - if (Quark.ZETA.modules.isEnabled(SpongesBetterModule.class)) { - // Additive to not directly conflict with other mods - return maximumWaterDrain - 64 + previous; - } - return previous; - } - - public static int crawlLimit(int previous) { - if (Quark.ZETA.modules.isEnabled(SpongesBetterModule.class)) { - // Additive to not directly conflict with other mods - return maximumCrawlDistance - 6 + previous; - } - return previous; - } - -} diff --git a/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java b/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java index 065ca85397..23605ea7c7 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java @@ -36,7 +36,6 @@ public class BlossomTreesModule extends ZetaModule { @Config public BlossomTreeConfig blue = new BlossomTreeConfig(200, Tags.Biomes.IS_SNOWY); @Config public BlossomTreeConfig lavender = new BlossomTreeConfig(100, Tags.Biomes.IS_SWAMP); @Config public BlossomTreeConfig orange = new BlossomTreeConfig(100, BiomeTags.IS_SAVANNA); - @Config public BlossomTreeConfig pink = new BlossomTreeConfig(100, BiomeTags.IS_MOUNTAIN); @Config public BlossomTreeConfig yellow = new BlossomTreeConfig(200, Tags.Biomes.IS_PLAINS); @Config public BlossomTreeConfig red = new BlossomTreeConfig(30, BiomeTags.IS_BADLANDS); @@ -53,7 +52,6 @@ public final void register(ZRegister event) { add("blue", MaterialColor.COLOR_LIGHT_BLUE, blue); add("lavender", MaterialColor.COLOR_PINK, lavender); add("orange", MaterialColor.TERRACOTTA_ORANGE, orange); - add("pink", MaterialColor.COLOR_PINK, pink); add("yellow", MaterialColor.COLOR_YELLOW, yellow); add("red", MaterialColor.COLOR_RED, red); } diff --git a/src/main/java/org/violetmoon/quark/mixin/SpongeBlockMixin.java b/src/main/java/org/violetmoon/quark/mixin/SpongeBlockMixin.java index 3e4e825acb..f5c722b2e4 100644 --- a/src/main/java/org/violetmoon/quark/mixin/SpongeBlockMixin.java +++ b/src/main/java/org/violetmoon/quark/mixin/SpongeBlockMixin.java @@ -4,19 +4,19 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; -import org.violetmoon.quark.content.tweaks.module.SpongesBetterModule; +import org.violetmoon.quark.content.tweaks.module.ImprovedSpongesModule; @Mixin(SpongeBlock.class) public class SpongeBlockMixin { @ModifyConstant(method = "removeWaterBreadthFirstSearch", constant = @Constant(intValue = 64)) public int getDrainLimit(int limit) { - return SpongesBetterModule.drainLimit(limit); + return ImprovedSpongesModule.drainLimit(limit); } @ModifyConstant(method = "removeWaterBreadthFirstSearch", constant = @Constant(intValue = 6)) public int getCrawlLimit(int limit) { - return SpongesBetterModule.crawlLimit(limit); + return ImprovedSpongesModule.crawlLimit(limit); } } diff --git a/src/main/resources/assets/quark/blockstates/bamboo_block.json b/src/main/resources/assets/quark/blockstates/bamboo_block.json deleted file mode 100644 index 62ed92b9de..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "axis=y": { "model": "quark:block/bamboo_block" }, - "axis=z": { "model": "quark:block/bamboo_block", "x": 90 }, - "axis=x": { "model": "quark:block/bamboo_block", "x": 90, "y": 90 } - } -} diff --git a/src/main/resources/assets/quark/blockstates/bamboo_button.json b/src/main/resources/assets/quark/blockstates/bamboo_button.json deleted file mode 100644 index 0781dad2ad..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_button.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { "model": "quark:block/bamboo_button", "y": 90 }, - "face=floor,facing=west,powered=false": { "model": "quark:block/bamboo_button", "y": 270 }, - "face=floor,facing=south,powered=false": { "model": "quark:block/bamboo_button", "y": 180 }, - "face=floor,facing=north,powered=false": { "model": "quark:block/bamboo_button" }, - "face=wall,facing=east,powered=false": { "model": "quark:block/bamboo_button", "uvlock": true, "x": 90, "y": 90 }, - "face=wall,facing=west,powered=false": { "model": "quark:block/bamboo_button", "uvlock": true, "x": 90, "y": 270 }, - "face=wall,facing=south,powered=false": { "model": "quark:block/bamboo_button", "uvlock": true, "x": 90, "y": 180 }, - "face=wall,facing=north,powered=false": { "model": "quark:block/bamboo_button", "uvlock": true, "x": 90 }, - "face=ceiling,facing=east,powered=false": { "model": "quark:block/bamboo_button", "x": 180, "y": 270 }, - "face=ceiling,facing=west,powered=false": { "model": "quark:block/bamboo_button", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=false": { "model": "quark:block/bamboo_button", "x": 180 }, - "face=ceiling,facing=north,powered=false": { "model": "quark:block/bamboo_button", "x": 180, "y": 180 }, - "face=floor,facing=east,powered=true": { "model": "quark:block/bamboo_button_pressed", "y": 90 }, - "face=floor,facing=west,powered=true": { "model": "quark:block/bamboo_button_pressed", "y": 270 }, - "face=floor,facing=south,powered=true": { "model": "quark:block/bamboo_button_pressed", "y": 180 }, - "face=floor,facing=north,powered=true": { "model": "quark:block/bamboo_button_pressed" }, - "face=wall,facing=east,powered=true": { "model": "quark:block/bamboo_button_pressed", "uvlock": true, "x": 90, "y": 90 }, - "face=wall,facing=west,powered=true": { "model": "quark:block/bamboo_button_pressed", "uvlock": true, "x": 90, "y": 270 }, - "face=wall,facing=south,powered=true": { "model": "quark:block/bamboo_button_pressed", "uvlock": true, "x": 90, "y": 180 }, - "face=wall,facing=north,powered=true": { "model": "quark:block/bamboo_button_pressed", "uvlock": true, "x": 90 }, - "face=ceiling,facing=east,powered=true": { "model": "quark:block/bamboo_button_pressed", "x": 180, "y": 270 }, - "face=ceiling,facing=west,powered=true": { "model": "quark:block/bamboo_button_pressed", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=true": { "model": "quark:block/bamboo_button_pressed", "x": 180 }, - "face=ceiling,facing=north,powered=true": { "model": "quark:block/bamboo_button_pressed", "x": 180, "y": 180 } - } -} diff --git a/src/main/resources/assets/quark/blockstates/bamboo_door.json b/src/main/resources/assets/quark/blockstates/bamboo_door.json deleted file mode 100644 index a65a18da1e..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "quark:block/bamboo_door_bottom_left" - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "quark:block/bamboo_door_bottom_left_open", - "y": 90 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "quark:block/bamboo_door_bottom_right" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "quark:block/bamboo_door_bottom_right_open", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "quark:block/bamboo_door_top_left" - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "quark:block/bamboo_door_top_left_open", - "y": 90 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "quark:block/bamboo_door_top_right" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "quark:block/bamboo_door_top_right_open", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "quark:block/bamboo_door_bottom_left", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "quark:block/bamboo_door_bottom_left_open" - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "quark:block/bamboo_door_bottom_right", - "y": 270 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "quark:block/bamboo_door_bottom_right_open", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "quark:block/bamboo_door_top_left", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "quark:block/bamboo_door_top_left_open" - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "quark:block/bamboo_door_top_right", - "y": 270 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "quark:block/bamboo_door_top_right_open", - "y": 180 - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "quark:block/bamboo_door_bottom_left", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "quark:block/bamboo_door_bottom_left_open", - "y": 180 - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "quark:block/bamboo_door_bottom_right", - "y": 90 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "quark:block/bamboo_door_bottom_right_open" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "quark:block/bamboo_door_top_left", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "quark:block/bamboo_door_top_left_open", - "y": 180 - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "quark:block/bamboo_door_top_right", - "y": 90 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "quark:block/bamboo_door_top_right_open" - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "quark:block/bamboo_door_bottom_left", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "quark:block/bamboo_door_bottom_left_open", - "y": 270 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "quark:block/bamboo_door_bottom_right", - "y": 180 - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "quark:block/bamboo_door_bottom_right_open", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "quark:block/bamboo_door_top_left", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "quark:block/bamboo_door_top_left_open", - "y": 270 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "quark:block/bamboo_door_top_right", - "y": 180 - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "quark:block/bamboo_door_top_right_open", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/blockstates/bamboo_fence.json b/src/main/resources/assets/quark/blockstates/bamboo_fence.json deleted file mode 100644 index aa3d0050af..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_fence.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "quark:block/bamboo_fence_post" - } - }, - { - "apply": { - "model": "quark:block/bamboo_fence_side_north", - "uvlock": false - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "quark:block/bamboo_fence_side_east", - "uvlock": false - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "quark:block/bamboo_fence_side_south", - "uvlock": false - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "quark:block/bamboo_fence_side_west", - "uvlock": false - }, - "when": { - "west": "true" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/blockstates/bamboo_fence_gate.json b/src/main/resources/assets/quark/blockstates/bamboo_fence_gate.json deleted file mode 100644 index c111c4e886..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "model": "quark:block/bamboo_fence_gate", - "uvlock": false, - "y": 270 - }, - "facing=east,in_wall=false,open=true": { - "model": "quark:block/bamboo_fence_gate_open", - "uvlock": false, - "y": 270 - }, - "facing=east,in_wall=true,open=false": { - "model": "quark:block/bamboo_fence_gate_wall", - "uvlock": false, - "y": 270 - }, - "facing=east,in_wall=true,open=true": { - "model": "quark:block/bamboo_fence_gate_wall_open", - "uvlock": false, - "y": 270 - }, - "facing=north,in_wall=false,open=false": { - "model": "quark:block/bamboo_fence_gate", - "uvlock": false, - "y": 180 - }, - "facing=north,in_wall=false,open=true": { - "model": "quark:block/bamboo_fence_gate_open", - "uvlock": false, - "y": 180 - }, - "facing=north,in_wall=true,open=false": { - "model": "quark:block/bamboo_fence_gate_wall", - "uvlock": false, - "y": 180 - }, - "facing=north,in_wall=true,open=true": { - "model": "quark:block/bamboo_fence_gate_wall_open", - "uvlock": false, - "y": 180 - }, - "facing=south,in_wall=false,open=false": { - "model": "quark:block/bamboo_fence_gate", - "uvlock": false - }, - "facing=south,in_wall=false,open=true": { - "model": "quark:block/bamboo_fence_gate_open", - "uvlock": false - }, - "facing=south,in_wall=true,open=false": { - "model": "quark:block/bamboo_fence_gate_wall", - "uvlock": false - }, - "facing=south,in_wall=true,open=true": { - "model": "quark:block/bamboo_fence_gate_wall_open", - "uvlock": false - }, - "facing=west,in_wall=false,open=false": { - "model": "quark:block/bamboo_fence_gate", - "uvlock": false, - "y": 90 - }, - "facing=west,in_wall=false,open=true": { - "model": "quark:block/bamboo_fence_gate_open", - "uvlock": false, - "y": 90 - }, - "facing=west,in_wall=true,open=false": { - "model": "quark:block/bamboo_fence_gate_wall", - "uvlock": false, - "y": 90 - }, - "facing=west,in_wall=true,open=true": { - "model": "quark:block/bamboo_fence_gate_wall_open", - "uvlock": false, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/blockstates/bamboo_mosaic.json b/src/main/resources/assets/quark/blockstates/bamboo_mosaic.json deleted file mode 100644 index be550f9562..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_mosaic.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/bamboo_mosaic" } - } -} diff --git a/src/main/resources/assets/quark/blockstates/bamboo_planks.json b/src/main/resources/assets/quark/blockstates/bamboo_planks.json deleted file mode 100644 index 5e0a58c626..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_planks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/bamboo_planks" } - } -} diff --git a/src/main/resources/assets/quark/blockstates/bamboo_planks_slab.json b/src/main/resources/assets/quark/blockstates/bamboo_planks_slab.json deleted file mode 100644 index 0654f3e05f..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_planks_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=bottom": { "model": "quark:block/bamboo_planks_slab" }, - "type=top": { "model": "quark:block/bamboo_planks_slab_top" }, - "type=double": { "model": "quark:block/bamboo_planks" } - } -} diff --git a/src/main/resources/assets/quark/blockstates/bamboo_planks_stairs.json b/src/main/resources/assets/quark/blockstates/bamboo_planks_stairs.json deleted file mode 100644 index 2fc543ca76..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_planks_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "quark:block/bamboo_planks_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "quark:block/bamboo_planks_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "quark:block/bamboo_planks_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "quark:block/bamboo_planks_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "quark:block/bamboo_planks_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "quark:block/bamboo_planks_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "quark:block/bamboo_planks_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "quark:block/bamboo_planks_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "quark:block/bamboo_planks_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "quark:block/bamboo_planks_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "quark:block/bamboo_planks_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "quark:block/bamboo_planks_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "quark:block/bamboo_planks_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "quark:block/bamboo_planks_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "quark:block/bamboo_planks_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "quark:block/bamboo_planks_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "quark:block/bamboo_planks_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "quark:block/bamboo_planks_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "quark:block/bamboo_planks_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "quark:block/bamboo_planks_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "quark:block/bamboo_planks_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "quark:block/bamboo_planks_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "quark:block/bamboo_planks_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "quark:block/bamboo_planks_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "quark:block/bamboo_planks_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "quark:block/bamboo_planks_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "quark:block/bamboo_planks_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "quark:block/bamboo_planks_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "quark:block/bamboo_planks_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "quark:block/bamboo_planks_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "quark:block/bamboo_planks_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "quark:block/bamboo_planks_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "quark:block/bamboo_planks_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "quark:block/bamboo_planks_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "quark:block/bamboo_planks_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "quark:block/bamboo_planks_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "quark:block/bamboo_planks_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "quark:block/bamboo_planks_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "quark:block/bamboo_planks_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "quark:block/bamboo_planks_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/quark/blockstates/bamboo_pressure_plate.json b/src/main/resources/assets/quark/blockstates/bamboo_pressure_plate.json deleted file mode 100644 index 31f4642944..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "powered=false": { "model": "quark:block/bamboo_pressure_plate" }, - "powered=true": { "model": "quark:block/bamboo_pressure_plate_down" } - } -} diff --git a/src/main/resources/assets/quark/blockstates/bamboo_sign.json b/src/main/resources/assets/quark/blockstates/bamboo_sign.json deleted file mode 100644 index 00ef689a02..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "quark:block/bamboo_sign" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/blockstates/bamboo_trapdoor.json b/src/main/resources/assets/quark/blockstates/bamboo_trapdoor.json deleted file mode 100644 index 7d01e88ccd..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "quark:block/bamboo_trapdoor_bottom", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "quark:block/bamboo_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "quark:block/bamboo_trapdoor_top", - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "quark:block/bamboo_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "quark:block/bamboo_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "quark:block/bamboo_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "quark:block/bamboo_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "quark:block/bamboo_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "quark:block/bamboo_trapdoor_bottom", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "quark:block/bamboo_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "quark:block/bamboo_trapdoor_top", - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "quark:block/bamboo_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=west,half=bottom,open=false": { - "model": "quark:block/bamboo_trapdoor_bottom", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "quark:block/bamboo_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "quark:block/bamboo_trapdoor_top", - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "quark:block/bamboo_trapdoor_open", - "x": 180, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/blockstates/bamboo_wall_sign.json b/src/main/resources/assets/quark/blockstates/bamboo_wall_sign.json deleted file mode 100644 index 00ef689a02..0000000000 --- a/src/main/resources/assets/quark/blockstates/bamboo_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "quark:block/bamboo_sign" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/blockstates/pink_blossom_hedge.json b/src/main/resources/assets/quark/blockstates/pink_blossom_hedge.json deleted file mode 100644 index c3d69617fc..0000000000 --- a/src/main/resources/assets/quark/blockstates/pink_blossom_hedge.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "multipart": [ - { - "when": { - "extend": "false" - }, - "apply": { - "model": "quark:block/pink_blossom_hedge_post" - } - }, - { - "when": { - "extend": "true" - }, - "apply": { - "model": "quark:block/pink_blossom_hedge_extend" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "quark:block/pink_blossom_hedge_side", - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "quark:block/pink_blossom_hedge_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "quark:block/pink_blossom_hedge_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "quark:block/pink_blossom_hedge_side", - "y": 270, - "uvlock": true - } - } - ] -} diff --git a/src/main/resources/assets/quark/blockstates/pink_blossom_leaf_carpet.json b/src/main/resources/assets/quark/blockstates/pink_blossom_leaf_carpet.json deleted file mode 100644 index 618c8f0e1f..0000000000 --- a/src/main/resources/assets/quark/blockstates/pink_blossom_leaf_carpet.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/pink_blossom_leaf_carpet" } - } -} diff --git a/src/main/resources/assets/quark/blockstates/pink_blossom_leaves.json b/src/main/resources/assets/quark/blockstates/pink_blossom_leaves.json deleted file mode 100644 index d71dcb2a3d..0000000000 --- a/src/main/resources/assets/quark/blockstates/pink_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/pink_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/quark/blockstates/pink_blossom_sapling.json b/src/main/resources/assets/quark/blockstates/pink_blossom_sapling.json deleted file mode 100644 index 497e62a6c3..0000000000 --- a/src/main/resources/assets/quark/blockstates/pink_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/pink_blossom_sapling" } - } -} diff --git a/src/main/resources/assets/quark/blockstates/potted_pink_blossom_sapling.json b/src/main/resources/assets/quark/blockstates/potted_pink_blossom_sapling.json deleted file mode 100644 index e6b76ae947..0000000000 --- a/src/main/resources/assets/quark/blockstates/potted_pink_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/potted_pink_blossom_sapling" } - } -} diff --git a/src/main/resources/assets/quark/blockstates/stripped_bamboo_block.json b/src/main/resources/assets/quark/blockstates/stripped_bamboo_block.json deleted file mode 100644 index 36a1068135..0000000000 --- a/src/main/resources/assets/quark/blockstates/stripped_bamboo_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "axis=y": { "model": "quark:block/stripped_bamboo_block" }, - "axis=z": { "model": "quark:block/stripped_bamboo_block", "x": 90 }, - "axis=x": { "model": "quark:block/stripped_bamboo_block", "x": 90, "y": 90 } - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_block.json b/src/main/resources/assets/quark/models/block/bamboo_block.json deleted file mode 100644 index 68921b2317..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "quark:block/bamboo_block_top", - "side": "quark:block/bamboo_block" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_button.json b/src/main/resources/assets/quark/models/block/bamboo_button.json deleted file mode 100644 index ed34c92286..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_button_pressed.json b/src/main/resources/assets/quark/models/block/bamboo_button_pressed.json deleted file mode 100644 index 2912028513..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_door_bottom_left.json b/src/main/resources/assets/quark/models/block/bamboo_door_bottom_left.json deleted file mode 100644 index 477aa8c6e5..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "top": "quark:block/bamboo_door_top", - "bottom": "quark:block/bamboo_door_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_door_bottom_left_open.json b/src/main/resources/assets/quark/models/block/bamboo_door_bottom_left_open.json deleted file mode 100644 index 90c0a69f57..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "top": "quark:block/bamboo_door_top", - "bottom": "quark:block/bamboo_door_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_door_bottom_right.json b/src/main/resources/assets/quark/models/block/bamboo_door_bottom_right.json deleted file mode 100644 index 5f0ecafbbc..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "top": "quark:block/bamboo_door_top", - "bottom": "quark:block/bamboo_door_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_door_bottom_right_open.json b/src/main/resources/assets/quark/models/block/bamboo_door_bottom_right_open.json deleted file mode 100644 index cfcd05e40c..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "top": "quark:block/bamboo_door_top", - "bottom": "quark:block/bamboo_door_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_door_top_left.json b/src/main/resources/assets/quark/models/block/bamboo_door_top_left.json deleted file mode 100644 index beb77b982a..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "top": "quark:block/bamboo_door_top", - "bottom": "quark:block/bamboo_door_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_door_top_left_open.json b/src/main/resources/assets/quark/models/block/bamboo_door_top_left_open.json deleted file mode 100644 index 5913dbeafd..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "top": "quark:block/bamboo_door_top", - "bottom": "quark:block/bamboo_door_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_door_top_right.json b/src/main/resources/assets/quark/models/block/bamboo_door_top_right.json deleted file mode 100644 index c106791cb5..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "top": "quark:block/bamboo_door_top", - "bottom": "quark:block/bamboo_door_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_door_top_right_open.json b/src/main/resources/assets/quark/models/block/bamboo_door_top_right_open.json deleted file mode 100644 index 5408ea7e61..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "top": "quark:block/bamboo_door_top", - "bottom": "quark:block/bamboo_door_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_gate.json b/src/main/resources/assets/quark/models/block/bamboo_fence_gate.json deleted file mode 100644 index 317d3a7b93..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_gate.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_gate", - "textures": { - "particle": "quark:block/bamboo_fence_gate_particle", - "texture": "quark:block/bamboo_fence_gate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_gate_open.json b/src/main/resources/assets/quark/models/block/bamboo_fence_gate_open.json deleted file mode 100644 index 97d62d61a3..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_gate_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_gate_open", - "textures": { - "particle": "quark:block/bamboo_fence_gate_particle", - "texture": "quark:block/bamboo_fence_gate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_gate_wall.json b/src/main/resources/assets/quark/models/block/bamboo_fence_gate_wall.json deleted file mode 100644 index 7ef7002635..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_gate_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_gate_wall", - "textures": { - "particle": "quark:block/bamboo_fence_gate_particle", - "texture": "quark:block/bamboo_fence_gate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_gate_wall_open.json b/src/main/resources/assets/quark/models/block/bamboo_fence_gate_wall_open.json deleted file mode 100644 index a395eddf91..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_gate_wall_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_gate_wall_open", - "textures": { - "particle": "quark:block/bamboo_fence_gate_particle", - "texture": "quark:block/bamboo_fence_gate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_inventory.json b/src/main/resources/assets/quark/models/block/bamboo_fence_inventory.json deleted file mode 100644 index e4fc218781..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_inventory", - "textures": { - "texture": "quark:block/bamboo_fence" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_post.json b/src/main/resources/assets/quark/models/block/bamboo_fence_post.json deleted file mode 100644 index 258a9e41d4..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_post", - "textures": { - "particle": "quark:block/bamboo_fence_particle", - "texture": "quark:block/bamboo_fence" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_side_east.json b/src/main/resources/assets/quark/models/block/bamboo_fence_side_east.json deleted file mode 100644 index c10aec1569..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_side_east.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_side_east", - "textures": { - "texture": "quark:block/bamboo_fence" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_side_north.json b/src/main/resources/assets/quark/models/block/bamboo_fence_side_north.json deleted file mode 100644 index 31c4df2477..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_side_north.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_side_north", - "textures": { - "texture": "quark:block/bamboo_fence" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_side_south.json b/src/main/resources/assets/quark/models/block/bamboo_fence_side_south.json deleted file mode 100644 index 6c5a31c69a..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_side_south.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_side_south", - "textures": { - "texture": "quark:block/bamboo_fence" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_fence_side_west.json b/src/main/resources/assets/quark/models/block/bamboo_fence_side_west.json deleted file mode 100644 index a5f52fd0aa..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_fence_side_west.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "quark:block/template/custom_fence_side_west", - "textures": { - "texture": "quark:block/bamboo_fence" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_mosaic.json b/src/main/resources/assets/quark/models/block/bamboo_mosaic.json deleted file mode 100644 index 4314b6ae13..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_mosaic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "quark:block/bamboo_mosaic" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_planks.json b/src/main/resources/assets/quark/models/block/bamboo_planks.json deleted file mode 100644 index 22bcb0f3e1..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_planks_slab.json b/src/main/resources/assets/quark/models/block/bamboo_planks_slab.json deleted file mode 100644 index 67f88943c9..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_planks_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "quark:block/bamboo_planks", - "top": "quark:block/bamboo_planks", - "side": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_planks_slab_top.json b/src/main/resources/assets/quark/models/block/bamboo_planks_slab_top.json deleted file mode 100644 index bee2059e3a..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_planks_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "quark:block/bamboo_planks", - "top": "quark:block/bamboo_planks", - "side": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_planks_stairs.json b/src/main/resources/assets/quark/models/block/bamboo_planks_stairs.json deleted file mode 100644 index 02d1e79c22..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_planks_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "quark:block/bamboo_planks", - "top": "quark:block/bamboo_planks", - "side": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_planks_stairs_inner.json b/src/main/resources/assets/quark/models/block/bamboo_planks_stairs_inner.json deleted file mode 100644 index 3387f6491e..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_planks_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "quark:block/bamboo_planks", - "top": "quark:block/bamboo_planks", - "side": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_planks_stairs_outer.json b/src/main/resources/assets/quark/models/block/bamboo_planks_stairs_outer.json deleted file mode 100644 index e7d5229266..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_planks_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "quark:block/bamboo_planks", - "top": "quark:block/bamboo_planks", - "side": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_pressure_plate.json b/src/main/resources/assets/quark/models/block/bamboo_pressure_plate.json deleted file mode 100644 index 0e2530c8b9..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_pressure_plate_down.json b/src/main/resources/assets/quark/models/block/bamboo_pressure_plate_down.json deleted file mode 100644 index dcc1a182f5..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/block/bamboo_sign.json b/src/main/resources/assets/quark/models/block/bamboo_sign.json deleted file mode 100644 index 7c9dba19df..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "quark:block/bamboo_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_trapdoor_bottom.json b/src/main/resources/assets/quark/models/block/bamboo_trapdoor_bottom.json deleted file mode 100644 index bbaa95e19b..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "quark:block/bamboo_trapdoor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_trapdoor_open.json b/src/main/resources/assets/quark/models/block/bamboo_trapdoor_open.json deleted file mode 100644 index e98dbbb0ef..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "quark:block/bamboo_trapdoor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/bamboo_trapdoor_top.json b/src/main/resources/assets/quark/models/block/bamboo_trapdoor_top.json deleted file mode 100644 index 399936c55e..0000000000 --- a/src/main/resources/assets/quark/models/block/bamboo_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "quark:block/bamboo_trapdoor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/pink_blossom_hedge_extend.json b/src/main/resources/assets/quark/models/block/pink_blossom_hedge_extend.json deleted file mode 100644 index 5db096eae4..0000000000 --- a/src/main/resources/assets/quark/models/block/pink_blossom_hedge_extend.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "quark:block/hedge_extend", - "textures": { - "leaf": "quark:block/pink_blossom_leaves" - } -} diff --git a/src/main/resources/assets/quark/models/block/pink_blossom_hedge_post.json b/src/main/resources/assets/quark/models/block/pink_blossom_hedge_post.json deleted file mode 100644 index b2c78d714c..0000000000 --- a/src/main/resources/assets/quark/models/block/pink_blossom_hedge_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "quark:block/hedge_post", - "textures": { - "log": "quark:block/blossom_log", - "leaf": "quark:block/pink_blossom_leaves" - } -} diff --git a/src/main/resources/assets/quark/models/block/pink_blossom_hedge_side.json b/src/main/resources/assets/quark/models/block/pink_blossom_hedge_side.json deleted file mode 100644 index a66d0d587d..0000000000 --- a/src/main/resources/assets/quark/models/block/pink_blossom_hedge_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "quark:block/hedge_side", - "textures": { - "leaf": "quark:block/pink_blossom_leaves" - } -} diff --git a/src/main/resources/assets/quark/models/block/pink_blossom_leaf_carpet.json b/src/main/resources/assets/quark/models/block/pink_blossom_leaf_carpet.json deleted file mode 100644 index bc1d928ccb..0000000000 --- a/src/main/resources/assets/quark/models/block/pink_blossom_leaf_carpet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "quark:block/leaf_carpet", - "textures": { - "all": "quark:block/pink_blossom_leaves" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/block/pink_blossom_leaves.json b/src/main/resources/assets/quark/models/block/pink_blossom_leaves.json deleted file mode 100644 index 72ecf0251f..0000000000 --- a/src/main/resources/assets/quark/models/block/pink_blossom_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/leaves", - "textures": { - "all": "quark:block/pink_blossom_leaves" - } -} diff --git a/src/main/resources/assets/quark/models/block/pink_blossom_sapling.json b/src/main/resources/assets/quark/models/block/pink_blossom_sapling.json deleted file mode 100644 index 1e3d172202..0000000000 --- a/src/main/resources/assets/quark/models/block/pink_blossom_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "quark:block/pink_blossom_sapling" - } -} diff --git a/src/main/resources/assets/quark/models/block/potted_pink_blossom_sapling.json b/src/main/resources/assets/quark/models/block/potted_pink_blossom_sapling.json deleted file mode 100644 index 9718937aa1..0000000000 --- a/src/main/resources/assets/quark/models/block/potted_pink_blossom_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/flower_pot_cross", - "textures": { - "plant": "quark:block/pink_blossom_sapling" - } -} diff --git a/src/main/resources/assets/quark/models/block/stripped_bamboo_block.json b/src/main/resources/assets/quark/models/block/stripped_bamboo_block.json deleted file mode 100644 index 2f54e35731..0000000000 --- a/src/main/resources/assets/quark/models/block/stripped_bamboo_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "quark:block/stripped_bamboo_block_top", - "side": "quark:block/stripped_bamboo_block" - } -} diff --git a/src/main/resources/assets/quark/models/item/bamboo_block.json b/src/main/resources/assets/quark/models/item/bamboo_block.json deleted file mode 100644 index abd81fc7b1..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/bamboo_button.json b/src/main/resources/assets/quark/models/item/bamboo_button.json deleted file mode 100644 index 944fdb8fe4..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "quark:block/bamboo_planks" - } -} diff --git a/src/main/resources/assets/quark/models/item/bamboo_door.json b/src/main/resources/assets/quark/models/item/bamboo_door.json deleted file mode 100644 index 248ef1a744..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "quark:item/bamboo_door" - } -} diff --git a/src/main/resources/assets/quark/models/item/bamboo_fence.json b/src/main/resources/assets/quark/models/item/bamboo_fence.json deleted file mode 100644 index b682dfae50..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_fence_inventory" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/bamboo_fence_gate.json b/src/main/resources/assets/quark/models/item/bamboo_fence_gate.json deleted file mode 100644 index 26f9012d47..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_fence_gate" -} diff --git a/src/main/resources/assets/quark/models/item/bamboo_mosaic.json b/src/main/resources/assets/quark/models/item/bamboo_mosaic.json deleted file mode 100644 index a350eeddff..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_mosaic.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_mosaic" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/bamboo_planks.json b/src/main/resources/assets/quark/models/item/bamboo_planks.json deleted file mode 100644 index 76f6a206b5..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_planks" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/bamboo_planks_slab.json b/src/main/resources/assets/quark/models/item/bamboo_planks_slab.json deleted file mode 100644 index f9ecea2ad9..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_planks_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_planks_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/bamboo_planks_stairs.json b/src/main/resources/assets/quark/models/item/bamboo_planks_stairs.json deleted file mode 100644 index 2067af2973..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_planks_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_planks_stairs" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/bamboo_pressure_plate.json b/src/main/resources/assets/quark/models/item/bamboo_pressure_plate.json deleted file mode 100644 index 1e0d5b2386..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_pressure_plate" -} diff --git a/src/main/resources/assets/quark/models/item/bamboo_sign.json b/src/main/resources/assets/quark/models/item/bamboo_sign.json deleted file mode 100644 index 12059c37aa..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "quark:item/bamboo_sign" - } -} diff --git a/src/main/resources/assets/quark/models/item/bamboo_trapdoor.json b/src/main/resources/assets/quark/models/item/bamboo_trapdoor.json deleted file mode 100644 index 25f0cc87ac..0000000000 --- a/src/main/resources/assets/quark/models/item/bamboo_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/bamboo_trapdoor_bottom" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/pink_blossom_hedge.json b/src/main/resources/assets/quark/models/item/pink_blossom_hedge.json deleted file mode 100644 index 153c7ec58f..0000000000 --- a/src/main/resources/assets/quark/models/item/pink_blossom_hedge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/pink_blossom_hedge_post" -} diff --git a/src/main/resources/assets/quark/models/item/pink_blossom_leaf_carpet.json b/src/main/resources/assets/quark/models/item/pink_blossom_leaf_carpet.json deleted file mode 100644 index eac83d9271..0000000000 --- a/src/main/resources/assets/quark/models/item/pink_blossom_leaf_carpet.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/pink_blossom_leaf_carpet" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/pink_blossom_leaves.json b/src/main/resources/assets/quark/models/item/pink_blossom_leaves.json deleted file mode 100644 index 10a7afb0d6..0000000000 --- a/src/main/resources/assets/quark/models/item/pink_blossom_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/pink_blossom_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/models/item/pink_blossom_sapling.json b/src/main/resources/assets/quark/models/item/pink_blossom_sapling.json deleted file mode 100644 index 26041f2312..0000000000 --- a/src/main/resources/assets/quark/models/item/pink_blossom_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "quark:block/pink_blossom_sapling" - } -} diff --git a/src/main/resources/assets/quark/models/item/stripped_bamboo_block.json b/src/main/resources/assets/quark/models/item/stripped_bamboo_block.json deleted file mode 100644 index 29becd2441..0000000000 --- a/src/main/resources/assets/quark/models/item/stripped_bamboo_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "quark:block/stripped_bamboo_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/quark/textures/block/bamboo_block.png b/src/main/resources/assets/quark/textures/block/bamboo_block.png deleted file mode 100644 index 330987e8718df52335b111de1ca876ed90d8d814..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmV+`0o4A9P)Vx3z3LK(1`=+6iSVYILwoIGMoA1e^I^c+uhlj*)109 zPCDO5X?g6Y$-I@yO*hB8%OK6lcK$zIhdK5<;sO9DKp`7YfIq}&V4eU3M7~%ZJ`+%| z-S^V%IZlt)G{1;B@h5;5fDw{-m2wlq08ouCi4*G>h6Dnz0sk5^?+n94bsdZxfD&~; zmcTVSfSbk!XBZyP6rJb|h;?fjz)kTr`4)6*A)#(<4&ZSxP!DKQohOv|b;^1N|Lk2Q xRsg8UZ{H>Afbc*Yd_vP2D<*n_GV%sD@eLcSN9U48xSs$3002ovPDHLkV1im|dHVnW diff --git a/src/main/resources/assets/quark/textures/block/bamboo_block_top.png b/src/main/resources/assets/quark/textures/block/bamboo_block_top.png deleted file mode 100644 index f4814392ee446ee6bc3c119b1c35f87c6fc320c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`y`CSS$9V>&CgG(Ac5FN=q{I2RnMdVFI)k8spVvOQ8w@iVk9<1F)*zw4 zlXQ3wv#|1!bcHAGPKiexPV~1N>S&xG&)F)-tY|O9rOX!e*T;az!&jVV$*-9S5))?W waV%qYN^~)h72r~Cdf5;lA?U;2a)^T=XJc6P)3Zl^0UgHR>FVdQ&MBb@0IZ@$*#H0l diff --git a/src/main/resources/assets/quark/textures/block/bamboo_door_bottom.png b/src/main/resources/assets/quark/textures/block/bamboo_door_bottom.png deleted file mode 100644 index c079a2c1e832f0ea1e91d3023d7f467c8a135716..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmV-N0l5B&P)nA*r^jWMZpTUXpZ7&E_F|vcHXE^E`}Ht2o7Et1NX9snEMg?$Uv}f(r)gd>FfSpNoKk`}7^Ef&7%?v? z1OO7?tFUYI<14Eg)Cepumgznds44({3|7R55ra<-ekmae<=#2KR|5qub3lK)T_B)4 zg Z_+Pzp&1=aYw@d&4002ovPDHLkV1jkogRTGo diff --git a/src/main/resources/assets/quark/textures/block/bamboo_door_top.png b/src/main/resources/assets/quark/textures/block/bamboo_door_top.png deleted file mode 100644 index b016b2884bd40b45a49be0176d602cd8d4357e2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmV-00nh%4P)?qns!w0OG`3&WDkK;mgz1%;%_)W<~*31wzbQK+h*o zjv8v|v3h9$IwRq`DEOL40RT^-PXkeiw*ZR2*S-n71~vgdzup41EdWtK^*#-fJ@A|O z*B*EgrNOs*5GnA-Yw&3gS^%%dHldJz!ufZQUt5Bq|C-aotrEbW~R}03!sxxfgvUcY+Q}R$@E(w!fVow_U!T zR(a^R`Ep$3^p@_h44+OZKD|k!D6YRrP7DC#lP%>FNdQpnIqW|G_ihux{=6=arSj{f zg2*_Ek|`cYx_AZNg8Lkxw4^d9hX>w5WbvMjg8+a$Cy~;n_)5=KK|>-OD5$#>fYNh4 z1s@{-Q&X54W7zchZ4YV=NRob)**#F%Q~;_!Y{pjaftLz#EYJUiF{&-LQa-j8(r1NH niYy;3_7qnQaf}b10K$F&fLp&f10gA-00000NkvXXu0mjfDba7? diff --git a/src/main/resources/assets/quark/textures/block/bamboo_fence_gate_particle.png b/src/main/resources/assets/quark/textures/block/bamboo_fence_gate_particle.png deleted file mode 100644 index 2c5e7eddb90e631fb8981815ac2481723ee70366..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-%o-U3d z7N_4%GURG7;BhUsbv!Cu!QiiEVcF3{%UP$mEX diff --git a/src/main/resources/assets/quark/textures/block/bamboo_fence_particle.png b/src/main/resources/assets/quark/textures/block/bamboo_fence_particle.png deleted file mode 100644 index 2c5e7eddb90e631fb8981815ac2481723ee70366..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-%o-U3d z7N_4%GURG7;BhUsbv!Cu!QiiEVcF3{%UP$mEX diff --git a/src/main/resources/assets/quark/textures/block/bamboo_mosaic.png b/src/main/resources/assets/quark/textures/block/bamboo_mosaic.png deleted file mode 100644 index 1b1d9ff2ab0d1da6f51bdf4415f9d241f906c170..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq-5P)R1Al9uy;817|GUQM4CZA>&QMxVLKmGsj#Bg4g z_qZ*O>#7|0vy$ukWl_f4x`k?b%AtYJb5{pWhxreH>esNTwca6A6Ojj$^^yiv>lF1A z>JjupKLTI?002cpc`Dil06@t%P){LHGSAT)a6mMe(jhe9D+Ay)I%NJ;1O2I{GPZe* z20Uj?BKw{XP*Jf6x`;>zPc7@(7P)?8ua|0(!lSI>MzVewV93&+${hA002ovPDHLkV1hNC BeGLEr diff --git a/src/main/resources/assets/quark/textures/block/bamboo_planks.png b/src/main/resources/assets/quark/textures/block/bamboo_planks.png deleted file mode 100644 index 2085be49cf9a3122fb2505114e6e4a29a11a3372..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmV+t0qy>YP)5cVu973y$}w1qFK!z9a(G-< zB{1B#6UaZW!;Ev^br^?z3B(7)yWf@X*j4Tt1)jgT63U1&-%~W Y54Z)s5ec(EeEAxsp7lV3+RgP`47@f};p7+2qkqI<(Nyr9vhH zb*dm4@`8~k#KFWMG-`v=AV`kG&3)}lz3_&2?|=XQ-2XpEwAxkxS(p(3?W)oPjym*r z_5qmM-4ylI;BsPc)wXJ_fvD?i|NWa&pzEs+TF68aR#V6|b76c1!T`r>TMBUL)*Ow! z19A^GAQOdnB2Wxf7b75chUJPzO3N}VR}|p;pCh~%FUi--A@a-XEAX*1qDlZTELSvQ z*(0T8Y3vbkt%M}Ce zo+0p5wc0kH>j(SijPz6;SzLm*pTZ}je;u@tLKc9}_n#}k_1BM1Q#tBzE~3D++xJWo zHxl$8Zv*h-=U?WYJq)D~87BY}rw&@k!i=2lgI{01LJa7QJaK(>tU)wSjKjrr5UDkk z)fDs~pA*qn8%idM)*475i&M{+l;(+1TwFpu)u3H%SN2jyc_g5&uTscDJb^PgI}MpA z(o6=RU}d66+?XuIbnp}@rlp=Q>E!IRakri?sm=L#Z7azBf3evau*rl{u$_1F;#H=0 zHw8??07xNg-aU~FRpX40^W7&;AqKj>qWztH4&NOze`nqdR$;6n*VljaeKkFLO@?;> O0000n>cl=iKxE=fCH_@Lw*mMZ^}7)dLA~ zs|O;sNV(`V)wV=~a?wF-5xgoS0mIZ}Rz)yO@T!bn%QTUwzdPeq!7z0q3GDfCG!JZS z?W){VmbL(FRkU2ggpv!HcJTZ-2@oOisw}>pY*rw)NYJrC1RAvaLlgSoM>FH<)tY^F z1{@KBlm0mh_Hzph+re-H0yU@rpC#ocba8+uhWj&-3!@2YsJuXSCiXfOg^J z{+v*90m#pek%-5b>6@gtyOZhdHzeXQ9=aC$-U%;;9)xpgxKJ)S{Qk5o*;tCiNP+z9 z7yv!SMQT5P@#WhwpP#H#+gt&_sUOmM>z>L@WkUnXMJL#6cb*EsL~cNGms2t^bQO8O z6XgH7qTlq!@D)j?x}?zGb8fvl?;@S*lFp6`9DhFr;8MIpt+@MV>iz(9_tF6kqcIWy O0000 z@B5Tr_g%hpt32GcrTz?ud_Awr`!pU)?S0e<1Q@^|0T{p=Y5>?L0SVDh<6|EKWdBWF z`J(3AB7qLzA~f;UljklB0@dh}xUqF%NFV_Lc-NYJzc5Tx*TL=tl&A}e1jgtDZW;l8 zVR%4ObfW`MYifnSP4SpK1x+m^v|@7tuj2ysfF`v(p+qIDJW#+=?kce&peFs1TDj|j n@IV2+VJ^nXLBe=>Px# diff --git a/src/main/resources/assets/quark/textures/entity/signs/bamboo.png b/src/main/resources/assets/quark/textures/entity/signs/bamboo.png deleted file mode 100644 index 264d9a7d7aa8f24338e8a9c5680d02a1f3dad9ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 933 zcmV;W16urvP)!VIpjFPS_oiCP{oW74s{fzDd;RLgvVVSJBV)YkVqYZo$!zMpzP_X_{Yve8{oPNcPJ+-8 zSsQzQd&kZF5SI^Zc{ysO1^&X%5xH;IrSk;IrI^g1J^DkqLJZtfQ> z{5t^J@(3o6R(PsD6&9QMHUEybJhHUNeVV}s(ljNGGlruFqLx>wozf1_i;tPA6e&Z_ zPRBHZlY-E`=EZclID4Y_(8tQ6}?>sIOQ3caq*ZFy9X5xGyVzt-)x!K&<( zcEFp#fG0cs?8R@m9B|B!Rc@hPDk>Wv8?Q;-;`g zP|9%CtJ6a6fyuwS;w{XP+003^#=W6MEswVJE4NbyR@>`WFO~pjr}}+V_D=m@g?$Y^ zf7ai7wLS@rB)I_eW|QQCIF5;0o~7#!5k_5}Khs1Qb+_78 z-65`qzjO6C1EAL#0jyqXxuxrjMl(1@x4r<1B#oKGPGUb z5ZYk_^uJm4BX!ucU*Tgqzt!e0BDCCLJbh+F96mT zpG~^X5Fc+p@cvdmKl|tU$eV8|L)RHw_W(B~4j~2p$D!j-MAOLQ*$B8o00000NkvXX Hu0mjf`MSVQ diff --git a/src/main/resources/assets/quark/textures/item/bamboo_door.png b/src/main/resources/assets/quark/textures/item/bamboo_door.png deleted file mode 100644 index 3bd7d8ea5f1b05687359055b5d0818033286f559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`TRdGHLo7}wCrE@O1T}yCFDzYq z@W-cj3G>f4OhMJ)rv;JYD@<);T3K0RYD1T4VqK diff --git a/src/main/resources/assets/quark/textures/item/bamboo_sign.png b/src/main/resources/assets/quark/textures/item/bamboo_sign.png deleted file mode 100644 index 9da0fe13229c209f17c49a5935826305001e894d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`=R92;Lo7}wCrFq)c(!oI|NiqS zg1wHf0(lrXt!8xpvEO)6yoW#c>+kx?a)udeHBR$RWB!