From e3408fd7a3115cb8ea58eca4fdda121e89dab8b8 Mon Sep 17 00:00:00 2001 From: kirderf1 Date: Thu, 18 Apr 2024 19:17:54 +0200 Subject: [PATCH] Preliminary update to neoforge 20.4 --- build.gradle | 8 +- gradle.properties | 20 +- .../assets/minestuck/lang/en_us.json | 2 +- .../advancements/minestuck/alchemy.json | 4 - .../advancements/minestuck/all_modi.json | 3 - .../advancements/minestuck/big_one_mil.json | 3 - .../advancements/minestuck/bugs.json | 4 - .../advancements/minestuck/buy_out_shop.json | 4 - .../advancements/minestuck/commune.json | 4 - .../advancements/minestuck/connect.json | 4 - .../advancements/minestuck/double_digits.json | 4 - .../advancements/minestuck/dungeon.json | 4 - .../advancements/minestuck/entry.json | 4 - .../advancements/minestuck/first_step.json | 4 - .../advancements/minestuck/french_fry.json | 4 - .../advancements/minestuck/gold_seeds.json | 4 - .../advancements/minestuck/halfway_point.json | 4 - .../advancements/minestuck/intellibeam.json | 4 - .../advancements/minestuck/kill_ogre.json | 4 - .../minestuck/legendary_weapon.json | 4 - .../minestuck/long_time_coming.json | 4 - .../minestuck/melon_overload.json | 3 - .../advancements/minestuck/new_modus.json | 4 - .../advancements/minestuck/return_node.json | 4 - .../advancements/minestuck/root.json | 2 - .../advancements/minestuck/searching.json | 4 - .../advancements/minestuck/shady_buyer.json | 4 - .../advancements/minestuck/tree_modus.json | 4 - .../black_chess_brick_slab.json | 3 +- ..._from_black_chess_bricks_stonecutting.json | 3 +- .../black_chess_brick_smooth_button.json | 3 +- ...ack_chess_brick_smooth_pressure_plate.json | 3 +- .../black_chess_brick_smooth_slab.json | 3 +- ...s_brick_smooth_slab_from_stonecutting.json | 3 +- .../black_chess_brick_smooth_stairs.json | 3 +- ...brick_smooth_stairs_from_stonecutting.json | 3 +- .../black_chess_brick_smooth_wall.json | 3 +- ...s_brick_smooth_wall_from_stonecutting.json | 3 +- .../black_chess_brick_stairs.json | 3 +- ..._from_black_chess_bricks_stonecutting.json | 3 +- .../black_chess_brick_wall.json | 3 +- .../black_chess_stairs_from_stonecutting.json | 3 +- .../black_cobblestone_slab.json | 3 +- ...ck_cobblestone_slab_from_stonecutting.json | 3 +- .../black_cobblestone_stairs.json | 3 +- ..._cobblestone_stairs_from_stonecutting.json | 3 +- .../black_cobblestone_wall.json | 3 +- ...ck_cobblestone_wall_from_stonecutting.json | 3 +- .../recipes/building_blocks/black_stone.json | 3 +- .../black_stone_brick_slab.json | 3 +- ..._from_black_stone_bricks_stonecutting.json | 3 +- .../black_stone_brick_stairs.json | 3 +- ..._from_black_stone_bricks_stonecutting.json | 3 +- .../black_stone_brick_wall.json | 3 +- ...ck_stone_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/black_stone_bricks.json | 3 +- ..._bricks_from_black_stone_stonecutting.json | 3 +- .../building_blocks/black_stone_button.json | 3 +- .../building_blocks/black_stone_column.json | 3 +- ..._from_black_stone_bricks_stonecutting.json | 3 +- .../black_stone_pressure_plate.json | 3 +- .../building_blocks/black_stone_slab.json | 3 +- ...ne_slab_from_black_stone_stonecutting.json | 3 +- .../building_blocks/black_stone_stairs.json | 3 +- ..._stairs_from_black_stone_stonecutting.json | 3 +- .../building_blocks/black_stone_wall.json | 3 +- .../black_stone_wall_from_stonecutting.json | 3 +- .../blood_aspect_bookshelf.json | 3 +- .../building_blocks/blood_aspect_button.json | 3 +- .../blood_aspect_carved_planks.json | 3 +- .../building_blocks/blood_aspect_door.json | 3 +- .../building_blocks/blood_aspect_fence.json | 3 +- .../blood_aspect_fence_gate.json | 3 +- .../building_blocks/blood_aspect_planks.json | 3 +- ...blood_aspect_planks_from_stripped_log.json | 3 +- ...lood_aspect_planks_from_stripped_wood.json | 3 +- .../blood_aspect_planks_from_wood.json | 3 +- .../blood_aspect_pressure_plate.json | 3 +- .../building_blocks/blood_aspect_slab.json | 3 +- .../building_blocks/blood_aspect_stairs.json | 3 +- .../blood_aspect_stripped_wood.json | 3 +- .../blood_aspect_trapdoor.json | 3 +- .../building_blocks/blood_aspect_wood.json | 3 +- .../blood_shade_brick_slab.json | 3 +- ...od_shade_brick_slab_from_stonecutting.json | 3 +- .../blood_shade_brick_stairs.json | 3 +- ..._shade_brick_stairs_from_stonecutting.json | 3 +- .../blood_shade_brick_wall.json | 3 +- ...od_shade_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/blood_shade_bricks.json | 3 +- .../breath_aspect_bookshelf.json | 3 +- .../building_blocks/breath_aspect_button.json | 3 +- .../breath_aspect_carved_planks.json | 3 +- .../building_blocks/breath_aspect_door.json | 3 +- .../building_blocks/breath_aspect_fence.json | 3 +- .../breath_aspect_fence_gate.json | 3 +- .../building_blocks/breath_aspect_planks.json | 3 +- ...reath_aspect_planks_from_stripped_log.json | 3 +- ...eath_aspect_planks_from_stripped_wood.json | 3 +- .../breath_aspect_planks_from_wood.json | 3 +- .../breath_aspect_pressure_plate.json | 3 +- .../building_blocks/breath_aspect_slab.json | 3 +- .../building_blocks/breath_aspect_stairs.json | 3 +- .../breath_aspect_stripped_wood.json | 3 +- .../breath_aspect_trapdoor.json | 3 +- .../building_blocks/breath_aspect_wood.json | 3 +- .../brown_stone_brick_slab.json | 3 +- ..._from_brown_stone_bricks_stonecutting.json | 3 +- .../brown_stone_brick_stairs.json | 3 +- ..._from_brown_stone_bricks_stonecutting.json | 3 +- .../brown_stone_brick_wall.json | 3 +- ...wn_stone_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/brown_stone_bricks.json | 3 +- ..._bricks_from_brown_stone_stonecutting.json | 3 +- ...rom_polished_brown_stone_stonecutting.json | 3 +- .../building_blocks/brown_stone_button.json | 3 +- .../building_blocks/brown_stone_column.json | 3 +- ..._from_brown_stone_bricks_stonecutting.json | 3 +- .../brown_stone_pressure_plate.json | 3 +- .../building_blocks/brown_stone_slab.json | 3 +- ...ne_slab_from_brown_stone_stonecutting.json | 3 +- .../building_blocks/brown_stone_stairs.json | 3 +- ..._stairs_from_brown_stone_stonecutting.json | 3 +- .../building_blocks/brown_stone_wall.json | 3 +- .../brown_stone_wall_from_stonecutting.json | 3 +- .../carved_bush_from_uncarved_wood.json | 3 +- .../building_blocks/carved_button.json | 3 +- .../recipes/building_blocks/carved_door.json | 3 +- .../recipes/building_blocks/carved_fence.json | 3 +- .../building_blocks/carved_fence_gate.json | 3 +- .../carved_heavy_plank_slab.json | 3 +- .../carved_heavy_plank_stairs.json | 3 +- ...arved_heavy_planks_from_uncarved_wood.json | 3 +- ...arved_knotted_wood_from_uncarved_wood.json | 3 +- ...rved_log_from_lacquered_uncarved_wood.json | 3 +- .../carved_planks_from_uncarved_wood.json | 3 +- .../carved_pressure_plate.json | 3 +- .../recipes/building_blocks/carved_slab.json | 3 +- .../building_blocks/carved_stairs.json | 3 +- .../building_blocks/carved_trapdoor.json | 3 +- ...den_leaf_from_lacquered_uncarved_wood.json | 3 +- .../building_blocks/cast_iron_button.json | 3 +- .../cast_iron_frame_from_stonecutting.json | 3 +- .../cast_iron_pressure_plate.json | 3 +- ...ron_sheet_from_cast_iron_stonecutting.json | 3 +- ...ast_iron_sheet_slab_from_stonecutting.json | 3 +- ...et_stairs_from_cast_iron_stonecutting.json | 3 +- .../building_blocks/cast_iron_slab.json | 3 +- .../cast_iron_slab_from_stonecutting.json | 3 +- .../building_blocks/cast_iron_stairs.json | 3 +- .../cast_iron_stairs_from_stonecutting.json | 3 +- .../building_blocks/cast_iron_tile.json | 3 +- ...iron_tile_from_cast_iron_stonecutting.json | 3 +- .../building_blocks/cast_iron_tile_slab.json | 3 +- ...cast_iron_tile_slab_from_stonecutting.json | 3 +- .../cast_iron_tile_stairs.json | 3 +- ...le_stairs_from_cast_iron_stonecutting.json | 3 +- .../building_blocks/cast_iron_wall.json | 3 +- .../cast_iron_wall_from_stonecutting.json | 3 +- .../building_blocks/chalk_brick_slab.json | 3 +- ...k_slab_from_chalk_bricks_stonecutting.json | 3 +- .../building_blocks/chalk_brick_stairs.json | 3 +- ...stairs_from_chalk_bricks_stonecutting.json | 3 +- .../building_blocks/chalk_brick_wall.json | 3 +- .../chalk_brick_wall_from_stonecutting.json | 3 +- .../recipes/building_blocks/chalk_bricks.json | 3 +- .../chalk_bricks_from_chalk_stonecutting.json | 3 +- ...icks_from_polished_chalk_stonecutting.json | 3 +- .../recipes/building_blocks/chalk_button.json | 3 +- .../recipes/building_blocks/chalk_column.json | 3 +- ...column_from_chalk_bricks_stonecutting.json | 3 +- .../building_blocks/chalk_pressure_plate.json | 3 +- .../recipes/building_blocks/chalk_slab.json | 3 +- .../chalk_slab_from_chalk_stonecutting.json | 3 +- .../recipes/building_blocks/chalk_stairs.json | 3 +- .../chalk_stairs_from_chalk_stonecutting.json | 3 +- .../recipes/building_blocks/chalk_wall.json | 3 +- .../chalk_wall_from_stonecutting.json | 3 +- .../building_blocks/chipboard_button.json | 3 +- .../building_blocks/chipboard_fence.json | 3 +- .../building_blocks/chipboard_fence_gate.json | 3 +- .../chipboard_pressure_plate.json | 3 +- .../building_blocks/chipboard_slab.json | 3 +- .../building_blocks/chipboard_stairs.json | 3 +- .../chiseled_black_stone_bricks.json | 3 +- ..._from_black_stone_bricks_stonecutting.json | 3 +- ...cast_iron_from_cast_iron_stonecutting.json | 3 +- .../chiseled_chalk_bricks.json | 3 +- ...bricks_from_chalk_bricks_stonecutting.json | 3 +- .../chiseled_coarse_stone.json | 3 +- .../chiseled_coarse_stone_bricks.json | 3 +- ...from_coarse_stone_bricks_stonecutting.json | 3 +- ..._stone_from_coarse_stone_stonecutting.json | 3 +- .../chiseled_cruxite_block.json | 3 +- ...ruxite_block_from_bricks_stonecutting.json | 3 +- ...seled_cruxite_block_from_stonecutting.json | 3 +- .../chiseled_frost_bricks.json | 3 +- ...bricks_from_frost_bricks_stonecutting.json | 3 +- .../building_blocks/chiseled_frost_tile.json | 3 +- ...ost_tile_from_frost_tile_stonecutting.json | 3 +- ...rom_polished_green_stone_stonecutting.json | 3 +- .../chiseled_igneous_stone.json | 3 +- ..._polished_igneous_bricks_stonecutting.json | 3 +- .../chiseled_mycelium_bricks.json | 3 +- ...cks_from_mycelium_bricks_stonecutting.json | 3 +- .../chiseled_pink_stone_bricks.json | 3 +- ...s_from_pink_stone_bricks_stonecutting.json | 3 +- .../chiseled_red_sandstone_column.json | 3 +- .../chiseled_sandstone_column.json | 3 +- .../chiseled_shade_bricks.json | 3 +- ...bricks_from_shade_bricks_stonecutting.json | 3 +- .../building_blocks/cindered_button.json | 3 +- .../building_blocks/cindered_door.json | 3 +- .../building_blocks/cindered_fence.json | 3 +- .../building_blocks/cindered_fence_gate.json | 3 +- .../building_blocks/cindered_planks.json | 3 +- .../cindered_pressure_plate.json | 3 +- .../building_blocks/cindered_slab.json | 3 +- .../building_blocks/cindered_stairs.json | 3 +- .../building_blocks/cindered_trapdoor.json | 3 +- .../building_blocks/cindered_wood.json | 3 +- .../coarse_stone_brick_slab.json | 3 +- ...from_coarse_stone_bricks_stonecutting.json | 3 +- .../coarse_stone_brick_stairs.json | 3 +- ...from_coarse_stone_bricks_stonecutting.json | 3 +- .../coarse_stone_brick_wall.json | 3 +- ...se_stone_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/coarse_stone_bricks.json | 3 +- ...bricks_from_coarse_stone_stonecutting.json | 3 +- .../building_blocks/coarse_stone_button.json | 3 +- .../building_blocks/coarse_stone_column.json | 3 +- ...from_coarse_stone_bricks_stonecutting.json | 3 +- .../coarse_stone_pressure_plate.json | 3 +- .../building_blocks/coarse_stone_slab.json | 3 +- ...e_slab_from_coarse_stone_stonecutting.json | 3 +- .../building_blocks/coarse_stone_stairs.json | 3 +- ...stairs_from_coarse_stone_stonecutting.json | 3 +- .../building_blocks/coarse_stone_wall.json | 3 +- .../coarse_stone_wall_from_stonecutting.json | 3 +- .../cracked_black_stone_bricks.json | 3 +- .../cracked_brown_stone_bricks.json | 3 +- .../cracked_coarse_stone_bricks.json | 3 +- .../building_blocks/cracked_frost_bricks.json | 3 +- .../cracked_mycelium_bricks.json | 3 +- .../cracked_pink_stone_bricks.json | 3 +- .../cracked_polished_igneous_bricks.json | 3 +- .../building_blocks/cracked_shade_bricks.json | 3 +- .../building_blocks/cruxite_block.json | 3 +- .../building_blocks/cruxite_brick_slab.json | 3 +- ...e_brick_slab_from_bricks_stonecutting.json | 3 +- .../cruxite_brick_slab_from_stonecutting.json | 3 +- .../building_blocks/cruxite_brick_stairs.json | 3 +- ...brick_stairs_from_bricks_stonecutting.json | 3 +- ...ruxite_brick_stairs_from_stonecutting.json | 3 +- .../building_blocks/cruxite_brick_wall.json | 3 +- ...e_brick_wall_from_bricks_stonecutting.json | 3 +- .../cruxite_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/cruxite_bricks.json | 3 +- .../cruxite_bricks_from_stonecutting.json | 3 +- .../building_blocks/cruxite_button.json | 3 +- .../recipes/building_blocks/cruxite_door.json | 3 +- .../recipes/building_blocks/cruxite_lamp.json | 3 +- .../building_blocks/cruxite_pillar.json | 3 +- .../cruxite_pillar_from_stonecutting.json | 3 +- .../cruxite_pressure_plate.json | 3 +- .../recipes/building_blocks/cruxite_slab.json | 3 +- .../cruxite_slab_from_stonecutting.json | 3 +- .../building_blocks/cruxite_stairs.json | 3 +- .../cruxite_stairs_from_stonecutting.json | 3 +- .../building_blocks/cruxite_trapdoor.json | 3 +- .../recipes/building_blocks/cruxite_wall.json | 3 +- .../cruxite_wall_from_stonecutting.json | 3 +- .../dark_gray_chess_brick_slab.json | 3 +- ...m_dark_gray_chess_bricks_stonecutting.json | 3 +- .../dark_gray_chess_brick_smooth_button.json | 3 +- ...ray_chess_brick_smooth_pressure_plate.json | 3 +- .../dark_gray_chess_brick_smooth_slab.json | 3 +- ...s_brick_smooth_slab_from_stonecutting.json | 3 +- .../dark_gray_chess_brick_smooth_stairs.json | 3 +- ...brick_smooth_stairs_from_stonecutting.json | 3 +- .../dark_gray_chess_brick_smooth_wall.json | 3 +- ...s_brick_smooth_wall_from_stonecutting.json | 3 +- .../dark_gray_chess_brick_stairs.json | 3 +- ...m_dark_gray_chess_bricks_stonecutting.json | 3 +- .../dark_gray_chess_brick_wall.json | 3 +- ...ay_chess_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/dead_bookshelf.json | 3 +- .../recipes/building_blocks/dead_button.json | 3 +- .../recipes/building_blocks/dead_door.json | 3 +- .../recipes/building_blocks/dead_fence.json | 3 +- .../building_blocks/dead_fence_gate.json | 3 +- .../recipes/building_blocks/dead_planks.json | 3 +- .../building_blocks/dead_planks_slab.json | 3 +- .../building_blocks/dead_planks_stairs.json | 3 +- .../building_blocks/dead_pressure_plate.json | 3 +- .../building_blocks/dead_trapdoor.json | 3 +- .../recipes/building_blocks/dead_wood.json | 3 +- .../decrepit_stone_brick_slab.json | 3 +- ...it_stone_brick_slab_from_stonecutting.json | 3 +- .../decrepit_stone_brick_stairs.json | 3 +- ..._stone_brick_stairs_from_stonecutting.json | 3 +- .../decrepit_stone_brick_wall.json | 3 +- ...it_stone_brick_wall_from_stonecutting.json | 3 +- ...bricks_from_stone_bricks_stonecutting.json | 3 +- .../doom_aspect_bookshelf.json | 3 +- .../building_blocks/doom_aspect_button.json | 3 +- .../doom_aspect_carved_planks.json | 3 +- .../building_blocks/doom_aspect_door.json | 3 +- .../building_blocks/doom_aspect_fence.json | 3 +- .../doom_aspect_fence_gate.json | 3 +- .../building_blocks/doom_aspect_planks.json | 3 +- .../doom_aspect_planks_from_stripped_log.json | 3 +- ...doom_aspect_planks_from_stripped_wood.json | 3 +- .../doom_aspect_planks_from_wood.json | 3 +- .../doom_aspect_pressure_plate.json | 3 +- .../building_blocks/doom_aspect_slab.json | 3 +- .../building_blocks/doom_aspect_stairs.json | 3 +- .../doom_aspect_stripped_wood.json | 3 +- .../building_blocks/doom_aspect_trapdoor.json | 3 +- .../building_blocks/doom_aspect_wood.json | 3 +- .../building_blocks/end_bookshelf.json | 3 +- .../recipes/building_blocks/end_button.json | 3 +- .../recipes/building_blocks/end_door.json | 3 +- .../recipes/building_blocks/end_fence.json | 3 +- .../building_blocks/end_fence_gate.json | 3 +- .../recipes/building_blocks/end_planks.json | 3 +- .../building_blocks/end_planks_slab.json | 3 +- .../building_blocks/end_planks_stairs.json | 3 +- .../building_blocks/end_pressure_plate.json | 3 +- .../recipes/building_blocks/end_trapdoor.json | 3 +- .../recipes/building_blocks/end_wood.json | 3 +- .../flowery_chalk_brick_slab.json | 3 +- ...ry_chalk_brick_slab_from_stonecutting.json | 3 +- .../flowery_chalk_brick_stairs.json | 3 +- ..._chalk_brick_stairs_from_stonecutting.json | 3 +- .../flowery_chalk_brick_wall.json | 3 +- ...ry_chalk_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/flowery_chalk_bricks.json | 3 +- .../flowery_frost_brick_slab.json | 3 +- ...ry_frost_brick_slab_from_stonecutting.json | 3 +- .../flowery_frost_brick_stairs.json | 3 +- ..._frost_brick_stairs_from_stonecutting.json | 3 +- .../flowery_frost_brick_wall.json | 3 +- ...ry_frost_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/flowery_frost_bricks.json | 3 +- .../flowery_mossy_cobblestone_slab.json | 3 +- ...sy_cobblestone_slab_from_stonecutting.json | 3 +- .../flowery_mossy_cobblestone_stairs.json | 3 +- ..._cobblestone_stairs_from_stonecutting.json | 3 +- .../flowery_mossy_cobblestone_wall.json | 3 +- ...sy_cobblestone_wall_from_stonecutting.json | 3 +- .../flowery_mossy_stone_brick_slab.json | 3 +- .../flowery_mossy_stone_brick_stairs.json | 3 +- .../flowery_mossy_stone_brick_wall.json | 3 +- .../flowery_mossy_stone_bricks.json | 3 +- .../flowery_mycelium_brick_slab.json | 3 +- ...mycelium_brick_slab_from_stonecutting.json | 3 +- .../flowery_mycelium_brick_stairs.json | 3 +- ...celium_brick_stairs_from_stonecutting.json | 3 +- .../flowery_mycelium_brick_wall.json | 3 +- ...mycelium_brick_wall_from_stonecutting.json | 3 +- .../flowery_mycelium_bricks.json | 3 +- .../building_blocks/flowery_vine_wood.json | 3 +- ...fragile_stone_from_stone_stonecutting.json | 3 +- .../building_blocks/frost_bookshelf.json | 3 +- .../building_blocks/frost_brick_slab.json | 3 +- ...k_slab_from_frost_bricks_stonecutting.json | 3 +- .../building_blocks/frost_brick_stairs.json | 3 +- ...stairs_from_frost_bricks_stonecutting.json | 3 +- .../building_blocks/frost_brick_wall.json | 3 +- .../frost_brick_wall_from_stonecutting.json | 3 +- .../recipes/building_blocks/frost_bricks.json | 3 +- ...t_bricks_from_frost_tile_stonecutting.json | 3 +- .../recipes/building_blocks/frost_button.json | 3 +- .../recipes/building_blocks/frost_column.json | 3 +- ...column_from_frost_bricks_stonecutting.json | 3 +- .../recipes/building_blocks/frost_door.json | 3 +- .../recipes/building_blocks/frost_fence.json | 3 +- .../building_blocks/frost_fence_gate.json | 3 +- .../recipes/building_blocks/frost_planks.json | 3 +- .../building_blocks/frost_pressure_plate.json | 3 +- .../recipes/building_blocks/frost_slab.json | 3 +- .../recipes/building_blocks/frost_stairs.json | 3 +- .../building_blocks/frost_tile_slab.json | 3 +- ...ile_slab_from_frost_tile_stonecutting.json | 3 +- .../building_blocks/frost_tile_stairs.json | 3 +- ...e_stairs_from_frost_tile_stonecutting.json | 3 +- .../building_blocks/frost_tile_wall.json | 3 +- .../frost_tile_wall_from_stonecutting.json | 3 +- .../building_blocks/frost_trapdoor.json | 3 +- .../recipes/building_blocks/frost_wood.json | 3 +- .../generic_slab_from_stonecutting.json | 3 +- .../generic_stairs_from_stonecutting.json | 3 +- .../generic_wall_from_stonecutting.json | 3 +- .../building_blocks/glowing_bookshelf.json | 3 +- .../building_blocks/glowing_button.json | 3 +- .../recipes/building_blocks/glowing_door.json | 3 +- .../building_blocks/glowing_fence.json | 3 +- .../building_blocks/glowing_fence_gate.json | 3 +- .../building_blocks/glowing_planks.json | 3 +- .../glowing_pressure_plate.json | 3 +- .../recipes/building_blocks/glowing_slab.json | 3 +- .../building_blocks/glowing_stairs.json | 3 +- .../building_blocks/glowing_trapdoor.json | 3 +- .../recipes/building_blocks/glowing_wood.json | 3 +- .../green_stone_brick_embedded_ladder.json | 3 +- .../green_stone_brick_slab.json | 3 +- ..._from_green_stone_bricks_stonecutting.json | 3 +- .../green_stone_brick_stairs.json | 3 +- ..._from_green_stone_bricks_stonecutting.json | 3 +- ..._from_green_stone_bricks_stonecutting.json | 3 +- .../green_stone_brick_wall.json | 3 +- ...en_stone_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/green_stone_bricks.json | 3 +- ...rom_polished_green_stone_stonecutting.json | 3 +- .../building_blocks/green_stone_button.json | 3 +- .../building_blocks/green_stone_column.json | 3 +- ..._from_green_stone_bricks_stonecutting.json | 3 +- .../green_stone_pressure_plate.json | 3 +- .../building_blocks/green_stone_slab.json | 3 +- ...ne_slab_from_green_stone_stonecutting.json | 3 +- .../building_blocks/green_stone_stairs.json | 3 +- ..._stairs_from_green_stone_stonecutting.json | 3 +- .../building_blocks/green_stone_wall.json | 3 +- .../green_stone_wall_from_stonecutting.json | 3 +- .../heart_aspect_bookshelf.json | 3 +- .../building_blocks/heart_aspect_button.json | 3 +- .../heart_aspect_carved_planks.json | 3 +- .../building_blocks/heart_aspect_door.json | 3 +- .../building_blocks/heart_aspect_fence.json | 3 +- .../heart_aspect_fence_gate.json | 3 +- .../building_blocks/heart_aspect_planks.json | 3 +- ...heart_aspect_planks_from_stripped_log.json | 3 +- ...eart_aspect_planks_from_stripped_wood.json | 3 +- .../heart_aspect_planks_from_wood.json | 3 +- .../heart_aspect_pressure_plate.json | 3 +- .../building_blocks/heart_aspect_slab.json | 3 +- .../building_blocks/heart_aspect_stairs.json | 3 +- .../heart_aspect_stripped_wood.json | 3 +- .../heart_aspect_trapdoor.json | 3 +- .../building_blocks/heart_aspect_wood.json | 3 +- .../recipes/building_blocks/heat_lamp.json | 3 +- .../hope_aspect_bookshelf.json | 3 +- .../building_blocks/hope_aspect_button.json | 3 +- .../hope_aspect_carved_planks.json | 3 +- .../building_blocks/hope_aspect_door.json | 3 +- .../building_blocks/hope_aspect_fence.json | 3 +- .../hope_aspect_fence_gate.json | 3 +- .../building_blocks/hope_aspect_planks.json | 3 +- .../hope_aspect_planks_from_stripped_log.json | 3 +- ...hope_aspect_planks_from_stripped_wood.json | 3 +- .../hope_aspect_planks_from_wood.json | 3 +- .../hope_aspect_pressure_plate.json | 3 +- .../building_blocks/hope_aspect_slab.json | 3 +- .../building_blocks/hope_aspect_stairs.json | 3 +- .../hope_aspect_stripped_wood.json | 3 +- .../building_blocks/hope_aspect_trapdoor.json | 3 +- .../building_blocks/hope_aspect_wood.json | 3 +- .../horizontal_green_stone_brick_slab.json | 3 +- ...en_stone_brick_slab_from_stonecutting.json | 3 +- .../horizontal_green_stone_brick_stairs.json | 3 +- ..._stone_brick_stairs_from_stonecutting.json | 3 +- .../horizontal_green_stone_brick_wall.json | 3 +- ...en_stone_brick_wall_from_stonecutting.json | 3 +- .../horizontal_green_stone_bricks.json | 3 +- ...rom_polished_green_stone_stonecutting.json | 3 +- .../building_blocks/igneous_stone_button.json | 3 +- .../igneous_stone_pressure_plate.json | 3 +- .../building_blocks/igneous_stone_slab.json | 3 +- ..._slab_from_igneous_stone_stonecutting.json | 3 +- .../building_blocks/igneous_stone_stairs.json | 3 +- ...tairs_from_igneous_stone_stonecutting.json | 3 +- .../building_blocks/igneous_stone_wall.json | 3 +- .../igneous_stone_wall_from_stonecutting.json | 3 +- .../building_blocks/lacquered_button.json | 3 +- ...ted_wood_from_lacquered_uncarved_wood.json | 3 +- .../lacquered_chipboard_button.json | 3 +- .../lacquered_chipboard_fence.json | 3 +- .../lacquered_chipboard_fence_gate.json | 3 +- .../lacquered_chipboard_pressure_plate.json | 3 +- .../lacquered_chipboard_slab.json | 3 +- .../lacquered_chipboard_stairs.json | 3 +- .../building_blocks/lacquered_door.json | 3 +- .../building_blocks/lacquered_fence.json | 3 +- .../building_blocks/lacquered_fence_gate.json | 3 +- .../lacquered_heavy_plank_slab.json | 3 +- .../lacquered_heavy_plank_stairs.json | 3 +- ...y_planks_from_lacquered_uncarved_wood.json | 3 +- ...d_planks_from_lacquered_uncarved_wood.json | 3 +- .../lacquered_pressure_plate.json | 3 +- .../building_blocks/lacquered_slab.json | 3 +- .../building_blocks/lacquered_stairs.json | 3 +- .../building_blocks/lacquered_trapdoor.json | 3 +- .../lacquered_uncarved_wood_button.json | 3 +- .../lacquered_uncarved_wood_fence.json | 3 +- .../lacquered_uncarved_wood_fence_gate.json | 3 +- ...acquered_uncarved_wood_pressure_plate.json | 3 +- .../lacquered_uncarved_wood_slab.json | 3 +- .../lacquered_uncarved_wood_stairs.json | 3 +- .../life_aspect_bookshelf.json | 3 +- .../building_blocks/life_aspect_button.json | 3 +- .../life_aspect_carved_planks.json | 3 +- .../building_blocks/life_aspect_door.json | 3 +- .../building_blocks/life_aspect_fence.json | 3 +- .../life_aspect_fence_gate.json | 3 +- .../building_blocks/life_aspect_planks.json | 3 +- .../life_aspect_planks_from_stripped_log.json | 3 +- ...life_aspect_planks_from_stripped_wood.json | 3 +- .../life_aspect_planks_from_wood.json | 3 +- .../life_aspect_pressure_plate.json | 3 +- .../building_blocks/life_aspect_slab.json | 3 +- .../building_blocks/life_aspect_stairs.json | 3 +- .../life_aspect_stripped_wood.json | 3 +- .../building_blocks/life_aspect_trapdoor.json | 3 +- .../building_blocks/life_aspect_wood.json | 3 +- .../light_aspect_bookshelf.json | 3 +- .../building_blocks/light_aspect_button.json | 3 +- .../light_aspect_carved_planks.json | 3 +- .../building_blocks/light_aspect_door.json | 3 +- .../building_blocks/light_aspect_fence.json | 3 +- .../light_aspect_fence_gate.json | 3 +- .../building_blocks/light_aspect_planks.json | 3 +- ...light_aspect_planks_from_stripped_log.json | 3 +- ...ight_aspect_planks_from_stripped_wood.json | 3 +- .../light_aspect_planks_from_wood.json | 3 +- .../light_aspect_pressure_plate.json | 3 +- .../building_blocks/light_aspect_slab.json | 3 +- .../building_blocks/light_aspect_stairs.json | 3 +- .../light_aspect_stripped_wood.json | 3 +- .../light_aspect_trapdoor.json | 3 +- .../building_blocks/light_aspect_wood.json | 3 +- .../light_gray_chess_brick_slab.json | 3 +- ..._light_gray_chess_bricks_stonecutting.json | 3 +- .../light_gray_chess_brick_smooth_button.json | 3 +- ...ray_chess_brick_smooth_pressure_plate.json | 3 +- .../light_gray_chess_brick_smooth_slab.json | 3 +- ...s_brick_smooth_slab_from_stonecutting.json | 3 +- .../light_gray_chess_brick_smooth_stairs.json | 3 +- ...brick_smooth_stairs_from_stonecutting.json | 3 +- .../light_gray_chess_brick_smooth_wall.json | 3 +- ...s_brick_smooth_wall_from_stonecutting.json | 3 +- .../light_gray_chess_brick_stairs.json | 3 +- ..._light_gray_chess_bricks_stonecutting.json | 3 +- .../light_gray_chess_brick_wall.json | 3 +- ...ay_chess_brick_wall_from_stonecutting.json | 3 +- .../magmatic_black_stone_brick_slab.json | 3 +- ...matic_black_stone_bricks_stonecutting.json | 3 +- .../magmatic_black_stone_brick_stairs.json | 3 +- ...matic_black_stone_bricks_stonecutting.json | 3 +- .../magmatic_black_stone_brick_wall.json | 3 +- ...ck_stone_brick_wall_from_stonecutting.json | 3 +- .../magmatic_black_stone_bricks.json | 3 +- .../magmatic_polished_igneous_brick_slab.json | 3 +- ...agmatic_polished_igneous_brick_stairs.json | 3 +- .../magmatic_polished_igneous_brick_wall.json | 3 +- ..._igneous_brick_wall_from_stonecutting.json | 3 +- .../magmatic_polished_igneous_bricks.json | 3 +- ...ic_polished_igneous_bricks_from_magma.json | 3 +- .../mind_aspect_bookshelf.json | 3 +- .../building_blocks/mind_aspect_button.json | 3 +- .../mind_aspect_carved_planks.json | 3 +- .../building_blocks/mind_aspect_door.json | 3 +- .../building_blocks/mind_aspect_fence.json | 3 +- .../mind_aspect_fence_gate.json | 3 +- .../building_blocks/mind_aspect_planks.json | 3 +- .../mind_aspect_planks_from_stripped_log.json | 3 +- ...mind_aspect_planks_from_stripped_wood.json | 3 +- .../mind_aspect_planks_from_wood.json | 3 +- .../mind_aspect_pressure_plate.json | 3 +- .../building_blocks/mind_aspect_slab.json | 3 +- .../building_blocks/mind_aspect_stairs.json | 3 +- .../mind_aspect_stripped_wood.json | 3 +- .../building_blocks/mind_aspect_trapdoor.json | 3 +- .../building_blocks/mind_aspect_wood.json | 3 +- .../mossy_chalk_brick_slab.json | 3 +- ...sy_chalk_brick_slab_from_stonecutting.json | 3 +- .../mossy_chalk_brick_stairs.json | 3 +- ..._chalk_brick_stairs_from_stonecutting.json | 3 +- .../mossy_chalk_brick_wall.json | 3 +- ...sy_chalk_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/mossy_chalk_bricks.json | 3 +- .../mossy_coarse_stone_bricks.json | 3 +- .../mossy_decrepit_stone_brick_slab.json | 3 +- ...it_stone_brick_slab_from_stonecutting.json | 3 +- .../mossy_decrepit_stone_brick_stairs.json | 3 +- ..._stone_brick_stairs_from_stonecutting.json | 3 +- .../mossy_decrepit_stone_brick_wall.json | 3 +- ...it_stone_brick_wall_from_stonecutting.json | 3 +- .../mossy_decrepit_stone_bricks.json | 3 +- .../mossy_mycelium_brick_slab.json | 3 +- ...mycelium_brick_slab_from_stonecutting.json | 3 +- .../mossy_mycelium_brick_stairs.json | 3 +- ...celium_brick_stairs_from_stonecutting.json | 3 +- .../mossy_mycelium_brick_wall.json | 3 +- ...mycelium_brick_wall_from_stonecutting.json | 3 +- .../mossy_mycelium_bricks.json | 3 +- .../mossy_pink_stone_brick_slab.json | 3 +- ...nk_stone_brick_slab_from_stonecutting.json | 3 +- .../mossy_pink_stone_brick_stairs.json | 3 +- ..._stone_brick_stairs_from_stonecutting.json | 3 +- .../mossy_pink_stone_brick_wall.json | 3 +- ...nk_stone_brick_wall_from_stonecutting.json | 3 +- .../mossy_pink_stone_bricks.json | 3 +- .../mossy_shade_brick_slab.json | 3 +- ...sy_shade_brick_slab_from_stonecutting.json | 3 +- .../mossy_shade_brick_stairs.json | 3 +- ..._shade_brick_stairs_from_stonecutting.json | 3 +- .../mossy_shade_brick_wall.json | 3 +- ...sy_shade_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/mossy_shade_bricks.json | 3 +- .../building_blocks/mycelium_brick_slab.json | 3 +- ...lab_from_mycelium_bricks_stonecutting.json | 3 +- .../mycelium_brick_stairs.json | 3 +- ...irs_from_mycelium_bricks_stonecutting.json | 3 +- .../building_blocks/mycelium_brick_wall.json | 3 +- ...mycelium_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/mycelium_bricks.json | 3 +- ...icks_from_mycelium_stone_stonecutting.json | 3 +- .../mycelium_cobblestone_slab.json | 3 +- ...um_cobblestone_slab_from_stonecutting.json | 3 +- .../mycelium_cobblestone_stairs.json | 3 +- ..._cobblestone_stairs_from_stonecutting.json | 3 +- .../mycelium_cobblestone_wall.json | 3 +- ...um_cobblestone_wall_from_stonecutting.json | 3 +- .../building_blocks/mycelium_column.json | 3 +- ...umn_from_mycelium_bricks_stonecutting.json | 3 +- .../building_blocks/mycelium_slab.json | 3 +- ...slab_from_mycelium_stone_stonecutting.json | 3 +- .../building_blocks/mycelium_stairs.json | 3 +- ...airs_from_mycelium_stone_stonecutting.json | 3 +- .../building_blocks/mycelium_stone.json | 3 +- .../mycelium_stone_button.json | 3 +- .../mycelium_stone_pressure_plate.json | 3 +- .../building_blocks/mycelium_stone_wall.json | 3 +- ...mycelium_stone_wall_from_stonecutting.json | 3 +- .../perfectly_generic_button.json | 3 +- .../perfectly_generic_door.json | 3 +- .../perfectly_generic_fence.json | 3 +- .../perfectly_generic_fence_gate.json | 3 +- .../perfectly_generic_pressure_plate.json | 3 +- .../perfectly_generic_slab.json | 3 +- .../perfectly_generic_stairs.json | 3 +- .../perfectly_generic_trapdoor.json | 3 +- .../perfectly_generic_wall.json | 3 +- .../building_blocks/petrified_wood.json | 3 +- .../pink_stone_brick_slab.json | 3 +- ...b_from_pink_stone_bricks_stonecutting.json | 3 +- .../pink_stone_brick_stairs.json | 3 +- ...s_from_pink_stone_bricks_stonecutting.json | 3 +- .../pink_stone_brick_wall.json | 3 +- ...nk_stone_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/pink_stone_bricks.json | 3 +- ...e_bricks_from_pink_stone_stonecutting.json | 3 +- .../building_blocks/pink_stone_button.json | 3 +- .../building_blocks/pink_stone_column.json | 3 +- ...n_from_pink_stone_bricks_stonecutting.json | 3 +- .../pink_stone_pressure_plate.json | 3 +- .../building_blocks/pink_stone_slab.json | 3 +- ...one_slab_from_pink_stone_stonecutting.json | 3 +- .../building_blocks/pink_stone_stairs.json | 3 +- ...e_stairs_from_pink_stone_stonecutting.json | 3 +- .../building_blocks/pink_stone_wall.json | 3 +- .../pink_stone_wall_from_stonecutting.json | 3 +- .../building_blocks/polished_black_stone.json | 3 +- .../polished_black_stone_slab.json | 3 +- ...ed_black_stone_slab_from_stonecutting.json | 3 +- .../polished_black_stone_stairs.json | 3 +- ..._black_stone_stairs_from_stonecutting.json | 3 +- .../polished_black_stone_wall.json | 3 +- ...ed_black_stone_wall_from_stonecutting.json | 3 +- .../building_blocks/polished_brown_stone.json | 3 +- .../polished_brown_stone_slab.json | 3 +- ...ed_brown_stone_slab_from_stonecutting.json | 3 +- .../polished_brown_stone_stairs.json | 3 +- ..._brown_stone_stairs_from_stonecutting.json | 3 +- .../polished_brown_stone_wall.json | 3 +- ...ed_brown_stone_wall_from_stonecutting.json | 3 +- .../building_blocks/polished_chalk.json | 3 +- ...olished_chalk_from_chalk_stonecutting.json | 3 +- .../building_blocks/polished_chalk_slab.json | 3 +- ...polished_chalk_slab_from_stonecutting.json | 3 +- .../polished_chalk_stairs.json | 3 +- ...lished_chalk_stairs_from_stonecutting.json | 3 +- .../building_blocks/polished_chalk_wall.json | 3 +- ...polished_chalk_wall_from_stonecutting.json | 3 +- .../polished_cruxite_block.json | 3 +- ...ruxite_block_from_smooth_stonecutting.json | 3 +- .../polished_cruxite_slab.json | 3 +- ...cruxite_slab_from_smooth_stonecutting.json | 3 +- ...lished_cruxite_slab_from_stonecutting.json | 3 +- .../polished_cruxite_stairs.json | 3 +- ...uxite_stairs_from_smooth_stonecutting.json | 3 +- ...shed_cruxite_stairs_from_stonecutting.json | 3 +- .../polished_cruxite_wall.json | 3 +- ...cruxite_wall_from_smooth_stonecutting.json | 3 +- ...lished_cruxite_wall_from_stonecutting.json | 3 +- .../building_blocks/polished_green_stone.json | 3 +- ...n_stone_from_green_stone_stonecutting.json | 3 +- .../polished_green_stone_slab.json | 3 +- ...ed_green_stone_slab_from_stonecutting.json | 3 +- .../polished_green_stone_stairs.json | 3 +- ..._green_stone_stairs_from_stonecutting.json | 3 +- .../polished_green_stone_wall.json | 3 +- ...ed_green_stone_wall_from_stonecutting.json | 3 +- .../polished_igneous_brick_slab.json | 3 +- ..._polished_igneous_bricks_stonecutting.json | 3 +- .../polished_igneous_brick_stairs.json | 3 +- ..._polished_igneous_bricks_stonecutting.json | 3 +- .../polished_igneous_brick_wall.json | 3 +- ..._igneous_brick_wall_from_stonecutting.json | 3 +- .../polished_igneous_bricks.json | 3 +- ...ricks_from_igneous_stone_stonecutting.json | 3 +- .../polished_igneous_pillar.json | 3 +- ..._polished_igneous_bricks_stonecutting.json | 3 +- ...lished_igneous_slab_from_stonecutting.json | 3 +- ...shed_igneous_stairs_from_stonecutting.json | 3 +- .../polished_igneous_stone.json | 3 +- .../polished_igneous_stone_slab.json | 3 +- .../polished_igneous_stone_stairs.json | 3 +- .../polished_igneous_stone_wall.json | 3 +- ...lished_igneous_wall_from_stonecutting.json | 3 +- .../polished_lacquered_uncarved_slab.json | 3 +- .../polished_lacquered_uncarved_stairs.json | 3 +- ...ved_wood_from_lacquered_uncarved_wood.json | 3 +- .../polished_mycelium_stone.json | 3 +- .../polished_mycelium_stone_slab.json | 3 +- ...mycelium_stone_slab_from_stonecutting.json | 3 +- .../polished_mycelium_stone_stairs.json | 3 +- ...celium_stone_stairs_from_stonecutting.json | 3 +- .../polished_mycelium_stone_wall.json | 3 +- ...mycelium_stone_wall_from_stonecutting.json | 3 +- .../building_blocks/polished_pink_stone.json | 3 +- .../polished_pink_stone_slab.json | 3 +- ...hed_pink_stone_slab_from_stonecutting.json | 3 +- .../polished_pink_stone_stairs.json | 3 +- ...d_pink_stone_stairs_from_stonecutting.json | 3 +- .../polished_pink_stone_wall.json | 3 +- ...hed_pink_stone_wall_from_stonecutting.json | 3 +- .../polished_treated_uncarved_slab.json | 3 +- .../polished_treated_uncarved_stairs.json | 3 +- ...arved_wood_from_treated_uncarved_wood.json | 3 +- .../polished_uncarved_slab.json | 3 +- .../polished_uncarved_stairs.json | 3 +- ...shed_uncarved_wood_from_uncarved_wood.json | 3 +- .../building_blocks/pumice_brick_slab.json | 3 +- .../pumice_brick_slab_from_stonecutting.json | 3 +- .../building_blocks/pumice_brick_stairs.json | 3 +- ...pumice_brick_stairs_from_stonecutting.json | 3 +- .../building_blocks/pumice_brick_wall.json | 3 +- .../pumice_brick_wall_from_stonecutting.json | 3 +- .../building_blocks/pumice_bricks.json | 3 +- .../building_blocks/pumice_stone_button.json | 3 +- .../pumice_stone_pressure_plate.json | 3 +- .../building_blocks/pumice_stone_slab.json | 3 +- .../pumice_stone_slab_from_stonecutting.json | 3 +- .../building_blocks/pumice_stone_stairs.json | 3 +- ...pumice_stone_stairs_from_stonecutting.json | 3 +- .../building_blocks/pumice_stone_wall.json | 3 +- .../pumice_stone_wall_from_stonecutting.json | 3 +- .../building_blocks/pumice_tile_slab.json | 3 +- .../pumice_tile_slab_from_stonecutting.json | 3 +- .../building_blocks/pumice_tile_stairs.json | 3 +- .../pumice_tile_stairs_from_stonecutting.json | 3 +- .../building_blocks/pumice_tile_wall.json | 3 +- .../pumice_tile_wall_from_stonecutting.json | 3 +- .../recipes/building_blocks/pumice_tiles.json | 3 +- ..._block_from_stone_bricks_stonecutting.json | 3 +- .../rage_aspect_bookshelf.json | 3 +- .../building_blocks/rage_aspect_button.json | 3 +- .../rage_aspect_carved_planks.json | 3 +- .../building_blocks/rage_aspect_door.json | 3 +- .../building_blocks/rage_aspect_fence.json | 3 +- .../rage_aspect_fence_gate.json | 3 +- .../building_blocks/rage_aspect_planks.json | 3 +- .../rage_aspect_planks_from_stripped_log.json | 3 +- ...rage_aspect_planks_from_stripped_wood.json | 3 +- .../rage_aspect_planks_from_wood.json | 3 +- .../rage_aspect_pressure_plate.json | 3 +- .../building_blocks/rage_aspect_slab.json | 3 +- .../building_blocks/rage_aspect_stairs.json | 3 +- .../rage_aspect_stripped_wood.json | 3 +- .../building_blocks/rage_aspect_trapdoor.json | 3 +- .../building_blocks/rage_aspect_wood.json | 3 +- .../building_blocks/rainbow_bookshelf.json | 3 +- .../building_blocks/rainbow_button.json | 3 +- .../recipes/building_blocks/rainbow_door.json | 3 +- .../building_blocks/rainbow_fence.json | 3 +- .../building_blocks/rainbow_fence_gate.json | 3 +- .../building_blocks/rainbow_planks.json | 3 +- .../building_blocks/rainbow_planks_slab.json | 3 +- .../rainbow_planks_stairs.json | 3 +- .../rainbow_pressure_plate.json | 3 +- .../building_blocks/rainbow_trapdoor.json | 3 +- .../recipes/building_blocks/rainbow_wood.json | 3 +- .../building_blocks/red_sandstone_column.json | 3 +- .../building_blocks/rotted_shadewood.json | 3 +- .../building_blocks/sandstone_column.json | 3 +- .../building_blocks/scarred_shadewood.json | 3 +- .../building_blocks/shade_brick_slab.json | 3 +- ...k_slab_from_shade_bricks_stonecutting.json | 3 +- .../building_blocks/shade_brick_stairs.json | 3 +- ...stairs_from_shade_bricks_stonecutting.json | 3 +- .../building_blocks/shade_brick_wall.json | 3 +- .../shade_brick_wall_from_stonecutting.json | 3 +- .../recipes/building_blocks/shade_bricks.json | 3 +- ..._bricks_from_shade_stone_stonecutting.json | 3 +- .../recipes/building_blocks/shade_button.json | 3 +- .../recipes/building_blocks/shade_column.json | 3 +- ...column_from_shade_bricks_stonecutting.json | 3 +- .../building_blocks/shade_pressure_plate.json | 3 +- .../recipes/building_blocks/shade_slab.json | 3 +- ...de_slab_from_shade_stone_stonecutting.json | 3 +- .../recipes/building_blocks/shade_stairs.json | 3 +- ..._stairs_from_shade_stone_stonecutting.json | 3 +- .../recipes/building_blocks/shade_wall.json | 3 +- .../shade_wall_from_stonecutting.json | 3 +- .../recipes/building_blocks/shadewood.json | 3 +- .../building_blocks/shadewood_button.json | 3 +- .../building_blocks/shadewood_door.json | 3 +- .../building_blocks/shadewood_fence.json | 3 +- .../building_blocks/shadewood_fence_gate.json | 3 +- .../building_blocks/shadewood_planks.json | 3 +- .../shadewood_pressure_plate.json | 3 +- .../building_blocks/shadewood_slab.json | 3 +- .../building_blocks/shadewood_stairs.json | 3 +- .../building_blocks/shadewood_trapdoor.json | 3 +- .../building_blocks/smooth_cruxite_block.json | 3 +- .../building_blocks/smooth_shade_stone.json | 3 +- .../smooth_shade_stone_slab.json | 3 +- ...th_shade_stone_slab_from_stonecutting.json | 3 +- .../smooth_shade_stone_stairs.json | 3 +- ..._shade_stone_stairs_from_stonecutting.json | 3 +- .../smooth_shade_stone_wall.json | 3 +- ...th_shade_stone_wall_from_stonecutting.json | 3 +- .../space_aspect_bookshelf.json | 3 +- .../building_blocks/space_aspect_button.json | 3 +- .../space_aspect_carved_planks.json | 3 +- .../building_blocks/space_aspect_door.json | 3 +- .../building_blocks/space_aspect_fence.json | 3 +- .../space_aspect_fence_gate.json | 3 +- .../building_blocks/space_aspect_planks.json | 3 +- ...space_aspect_planks_from_stripped_log.json | 3 +- ...pace_aspect_planks_from_stripped_wood.json | 3 +- .../space_aspect_planks_from_wood.json | 3 +- .../space_aspect_pressure_plate.json | 3 +- .../building_blocks/space_aspect_slab.json | 3 +- .../building_blocks/space_aspect_stairs.json | 3 +- .../space_aspect_stripped_wood.json | 3 +- .../space_aspect_trapdoor.json | 3 +- .../building_blocks/space_aspect_wood.json | 3 +- .../steep_green_stone_brick_stairs_base.json | 3 +- .../steep_green_stone_brick_stairs_top.json | 3 +- .../recipes/building_blocks/strawberry.json | 3 +- .../stripped_rotted_shadewood.json | 3 +- .../stripped_scarred_shadewood.json | 3 +- .../building_blocks/stripped_shadewood.json | 3 +- .../recipes/building_blocks/sugar_cube.json | 3 +- .../building_blocks/tar_shade_brick_slab.json | 3 +- ...ar_shade_brick_slab_from_stonecutting.json | 3 +- .../tar_shade_brick_stairs.json | 3 +- ..._shade_brick_stairs_from_stonecutting.json | 3 +- .../building_blocks/tar_shade_brick_wall.json | 3 +- ...ar_shade_brick_wall_from_stonecutting.json | 3 +- .../time_aspect_bookshelf.json | 3 +- .../building_blocks/time_aspect_button.json | 3 +- .../time_aspect_carved_planks.json | 3 +- .../building_blocks/time_aspect_door.json | 3 +- .../building_blocks/time_aspect_fence.json | 3 +- .../time_aspect_fence_gate.json | 3 +- .../building_blocks/time_aspect_planks.json | 3 +- .../time_aspect_planks_from_stripped_log.json | 3 +- ...time_aspect_planks_from_stripped_wood.json | 3 +- .../time_aspect_planks_from_wood.json | 3 +- .../time_aspect_pressure_plate.json | 3 +- .../building_blocks/time_aspect_slab.json | 3 +- .../building_blocks/time_aspect_stairs.json | 3 +- .../time_aspect_stripped_wood.json | 3 +- .../building_blocks/time_aspect_trapdoor.json | 3 +- .../building_blocks/time_aspect_wood.json | 3 +- .../building_blocks/treated_bookshelf.json | 3 +- .../building_blocks/treated_button.json | 3 +- ...otted_wood_from_treated_uncarved_wood.json | 3 +- .../treated_chipboard_button.json | 3 +- .../treated_chipboard_fence.json | 3 +- .../treated_chipboard_fence_gate.json | 3 +- .../treated_chipboard_pressure_plate.json | 3 +- .../treated_chipboard_slab.json | 3 +- .../treated_chipboard_stairs.json | 3 +- .../recipes/building_blocks/treated_door.json | 3 +- .../building_blocks/treated_fence.json | 3 +- .../building_blocks/treated_fence_gate.json | 3 +- .../treated_heavy_plank_slab.json | 3 +- .../treated_heavy_plank_stairs.json | 3 +- ...avy_planks_from_treated_uncarved_wood.json | 3 +- ...ted_planks_from_treated_uncarved_wood.json | 3 +- .../building_blocks/treated_planks_slab.json | 3 +- .../treated_planks_stairs.json | 3 +- .../treated_pressure_plate.json | 3 +- .../building_blocks/treated_trapdoor.json | 3 +- .../treated_uncarved_wood_button.json | 3 +- .../treated_uncarved_wood_fence.json | 3 +- .../treated_uncarved_wood_fence_gate.json | 3 +- .../treated_uncarved_wood_pressure_plate.json | 3 +- .../treated_uncarved_wood_slab.json | 3 +- .../treated_uncarved_wood_stairs.json | 3 +- .../building_blocks/uncarved_wood_button.json | 3 +- .../building_blocks/uncarved_wood_fence.json | 3 +- .../uncarved_wood_fence_gate.json | 3 +- .../uncarved_wood_pressure_plate.json | 3 +- .../building_blocks/uncarved_wood_slab.json | 3 +- .../building_blocks/uncarved_wood_stairs.json | 3 +- .../building_blocks/uranium_block.json | 3 +- .../building_blocks/uranium_button.json | 3 +- .../uranium_pressure_plate.json | 3 +- .../recipes/building_blocks/uranium_slab.json | 3 +- .../uranium_slab_from_stonecutting.json | 3 +- .../building_blocks/uranium_stairs.json | 3 +- .../uranium_stairs_from_stonecutting.json | 3 +- .../recipes/building_blocks/uranium_wall.json | 3 +- .../uranium_wall_from_stonecutting.json | 3 +- .../vertical_green_stone_brick_slab.json | 3 +- ...en_stone_brick_slab_from_stonecutting.json | 3 +- .../vertical_green_stone_brick_stairs.json | 3 +- ..._stone_brick_stairs_from_stonecutting.json | 3 +- .../vertical_green_stone_brick_wall.json | 3 +- ...en_stone_brick_wall_from_stonecutting.json | 3 +- .../vertical_green_stone_bricks.json | 3 +- ...rom_polished_green_stone_stonecutting.json | 3 +- .../recipes/building_blocks/vine_wood.json | 3 +- .../void_aspect_bookshelf.json | 3 +- .../building_blocks/void_aspect_button.json | 3 +- .../void_aspect_carved_planks.json | 3 +- .../building_blocks/void_aspect_door.json | 3 +- .../building_blocks/void_aspect_fence.json | 3 +- .../void_aspect_fence_gate.json | 3 +- .../building_blocks/void_aspect_planks.json | 3 +- .../void_aspect_planks_from_stripped_log.json | 3 +- ...void_aspect_planks_from_stripped_wood.json | 3 +- .../void_aspect_planks_from_wood.json | 3 +- .../void_aspect_pressure_plate.json | 3 +- .../building_blocks/void_aspect_slab.json | 3 +- .../building_blocks/void_aspect_stairs.json | 3 +- .../void_aspect_stripped_wood.json | 3 +- .../building_blocks/void_aspect_trapdoor.json | 3 +- .../building_blocks/void_aspect_wood.json | 3 +- .../white_chess_brick_slab.json | 3 +- ..._from_white_chess_bricks_stonecutting.json | 3 +- .../white_chess_brick_smooth_button.json | 3 +- ...ite_chess_brick_smooth_pressure_plate.json | 3 +- .../white_chess_brick_smooth_slab.json | 3 +- ...s_brick_smooth_slab_from_stonecutting.json | 3 +- .../white_chess_brick_smooth_stairs.json | 3 +- ...brick_smooth_stairs_from_stonecutting.json | 3 +- .../white_chess_brick_smooth_wall.json | 3 +- ...s_brick_smooth_wall_from_stonecutting.json | 3 +- .../white_chess_brick_stairs.json | 3 +- ..._from_white_chess_bricks_stonecutting.json | 3 +- .../white_chess_brick_wall.json | 3 +- ...te_chess_brick_wall_from_stonecutting.json | 3 +- .../recipes/combat/bear_poking_stick.json | 3 +- .../advancements/recipes/combat/cane.json | 3 +- .../recipes/combat/claw_hammer.json | 3 +- .../advancements/recipes/combat/dagger.json | 3 +- .../recipes/combat/deuce_club.json | 3 +- .../advancements/recipes/combat/fan.json | 3 +- .../advancements/recipes/combat/fork.json | 3 +- .../recipes/combat/house_key.json | 3 +- .../recipes/combat/iron_cane.json | 3 +- .../advancements/recipes/combat/katana.json | 3 +- .../recipes/combat/knitting_needle.json | 3 +- .../recipes/combat/macuahuitl.json | 3 +- .../recipes/combat/makeshift_claws_drawn.json | 3 +- .../recipes/combat/obsidian_axe_knife.json | 3 +- .../recipes/combat/pointy_stick.json | 3 +- .../advancements/recipes/combat/shuriken.json | 3 +- .../advancements/recipes/combat/sickle.json | 3 +- .../recipes/combat/sledge_hammer.json | 3 +- .../recipes/combat/steak_sword.json | 3 +- .../steak_sword_from_campfire_cooking.json | 3 +- .../combat/steak_sword_from_smoking.json | 3 +- .../advancements/recipes/combat/umbrella.json | 3 +- .../recipes/combat/wooden_lance.json | 3 +- .../recipes/combat/wooden_spoon.json | 3 +- .../blood_aspect_hanging_sign.json | 3 +- .../decorations/blood_aspect_ladder.json | 3 +- .../decorations/blood_aspect_sign.json | 3 +- .../breath_aspect_hanging_sign.json | 3 +- .../decorations/breath_aspect_ladder.json | 3 +- .../decorations/breath_aspect_sign.json | 3 +- .../decorations/carved_hanging_sign.json | 3 +- .../recipes/decorations/carved_sign.json | 3 +- .../recipes/decorations/chessboard_black.json | 3 +- .../recipes/decorations/chessboard_white.json | 3 +- .../decorations/cindered_hanging_sign.json | 3 +- .../recipes/decorations/cindered_sign.json | 3 +- .../recipes/decorations/computer.json | 3 +- .../decorations/dead_hanging_sign.json | 3 +- .../recipes/decorations/dead_ladder.json | 3 +- .../recipes/decorations/dead_sign.json | 3 +- .../decorations/doom_aspect_hanging_sign.json | 3 +- .../decorations/doom_aspect_ladder.json | 3 +- .../recipes/decorations/doom_aspect_sign.json | 3 +- .../recipes/decorations/end_hanging_sign.json | 3 +- .../recipes/decorations/end_ladder.json | 3 +- .../recipes/decorations/end_sign.json | 3 +- .../decorations/frost_hanging_sign.json | 3 +- .../recipes/decorations/frost_ladder.json | 3 +- .../recipes/decorations/frost_sign.json | 3 +- .../decorations/glowing_hanging_sign.json | 3 +- .../recipes/decorations/glowing_ladder.json | 3 +- .../recipes/decorations/glowing_sign.json | 3 +- .../heart_aspect_hanging_sign.json | 3 +- .../decorations/heart_aspect_ladder.json | 3 +- .../decorations/heart_aspect_sign.json | 3 +- .../decorations/hope_aspect_hanging_sign.json | 3 +- .../decorations/hope_aspect_ladder.json | 3 +- .../recipes/decorations/hope_aspect_sign.json | 3 +- .../decorations/lacquered_hanging_sign.json | 3 +- .../recipes/decorations/lacquered_sign.json | 3 +- .../decorations/life_aspect_hanging_sign.json | 3 +- .../decorations/life_aspect_ladder.json | 3 +- .../recipes/decorations/life_aspect_sign.json | 3 +- .../light_aspect_hanging_sign.json | 3 +- .../decorations/light_aspect_ladder.json | 3 +- .../decorations/light_aspect_sign.json | 3 +- .../decorations/mind_aspect_hanging_sign.json | 3 +- .../decorations/mind_aspect_ladder.json | 3 +- .../recipes/decorations/mind_aspect_sign.json | 3 +- .../perfectly_generic_hanging_sign.json | 3 +- .../decorations/perfectly_generic_sign.json | 3 +- .../decorations/rage_aspect_hanging_sign.json | 3 +- .../decorations/rage_aspect_ladder.json | 3 +- .../recipes/decorations/rage_aspect_sign.json | 3 +- .../decorations/rainbow_hanging_sign.json | 3 +- .../recipes/decorations/rainbow_ladder.json | 3 +- .../recipes/decorations/rainbow_sign.json | 3 +- .../decorations/shadewood_hanging_sign.json | 3 +- .../recipes/decorations/shadewood_sign.json | 3 +- .../recipes/decorations/skaianet_denier.json | 3 +- .../space_aspect_hanging_sign.json | 3 +- .../decorations/space_aspect_ladder.json | 3 +- .../decorations/space_aspect_sign.json | 3 +- .../spruce_planks_from_wooden_cactus.json | 3 +- .../decorations/time_aspect_hanging_sign.json | 3 +- .../decorations/time_aspect_ladder.json | 3 +- .../recipes/decorations/time_aspect_sign.json | 3 +- .../recipes/decorations/trans_portalizer.json | 3 +- .../decorations/treated_hanging_sign.json | 3 +- .../recipes/decorations/treated_ladder.json | 3 +- .../recipes/decorations/treated_sign.json | 3 +- .../recipes/decorations/uranium_cooker.json | 3 +- .../decorations/void_aspect_hanging_sign.json | 3 +- .../decorations/void_aspect_ladder.json | 3 +- .../recipes/decorations/void_aspect_sign.json | 3 +- .../advancements/recipes/food/apple_cake.json | 3 +- .../advancements/recipes/food/bug_mac.json | 3 +- .../recipes/food/bug_on_a_stick.json | 3 +- .../recipes/food/cake_from_mix.json | 3 +- .../advancements/recipes/food/grub_sauce.json | 3 +- .../advancements/recipes/food/salad.json | 3 +- .../recipes/food/strawberry_chunk.json | 3 +- .../advancements/recipes/misc/bi_dye.json | 3 +- .../advancements/recipes/misc/blank_disk.json | 3 +- .../recipes/misc/captcha_card.json | 3 +- .../misc/charcoal_from_wooden_cactus.json | 3 +- .../recipes/misc/clothes_iron.json | 3 +- .../recipes/misc/coal_from_blasting.json | 3 +- .../recipes/misc/coal_from_smelting.json | 3 +- .../recipes/misc/diamond_from_blasting.json | 3 +- .../recipes/misc/diamond_from_smelting.json | 3 +- .../recipes/misc/emerald_from_blasting.json | 3 +- .../recipes/misc/emerald_from_smelting.json | 3 +- .../recipes/misc/energy_core.json | 3 +- .../misc/gold_ingot_from_blasting.json | 3 +- .../misc/gold_ingot_from_smelting.json | 3 +- .../recipes/misc/gold_nugget_from_seeds.json | 3 +- .../recipes/misc/gutter_thumb_drive.json | 3 +- .../advancements/recipes/misc/horn.json | 3 +- .../misc/iron_ingot_from_blasting.json | 3 +- .../misc/iron_ingot_from_smelting.json | 3 +- .../misc/lapis_lazuli_from_blasting.json | 3 +- .../misc/lapis_lazuli_from_smelting.json | 3 +- .../advancements/recipes/misc/lip_balm.json | 3 +- .../advancements/recipes/misc/mailbox.json | 3 +- .../recipes/misc/plutonium_core.json | 3 +- .../recipes/misc/quartz_from_blasting.json | 3 +- .../recipes/misc/quartz_from_smelting.json | 3 +- .../recipes/misc/queue_modus_card.json | 3 +- .../misc/raw_cruxite_from_blasting.json | 3 +- .../recipes/misc/raw_cruxite_from_block.json | 3 +- .../recipes/misc/raw_cruxite_from_dowel.json | 3 +- .../misc/raw_cruxite_from_smelting.json | 3 +- .../misc/raw_uranium_from_blasting.json | 3 +- .../recipes/misc/raw_uranium_from_block.json | 3 +- .../misc/raw_uranium_from_smelting.json | 3 +- .../recipes/misc/redstone_from_blasting.json | 3 +- .../recipes/misc/redstone_from_smelting.json | 3 +- .../recipes/misc/stack_modus_card.json | 3 +- .../recipes/misc/sugar_from_cube.json | 3 +- .../recipes/misc/temple_scanner.json | 3 +- .../redstone/block_pressure_plate.json | 3 +- .../recipes/redstone/item_magnet.json | 3 +- ...ne_second_interval_timed_solid_switch.json | 3 +- .../recipes/redstone/redstone_clock.json | 3 +- .../recipes/redstone/remote_comparator.json | 3 +- .../recipes/redstone/retractable_spikes.json | 3 +- .../recipes/redstone/rotator.json | 3 +- .../recipes/redstone/solid_switch.json | 3 +- .../advancements/recipes/redstone/spikes.json | 3 +- .../recipes/redstone/toggler.json | 3 +- ...wo_second_interval_timed_solid_switch.json | 3 +- .../redstone/variable_solid_switch.json | 3 +- .../redstone/wireless_redstone_receiver.json | 3 +- .../wireless_redstone_transmitter.json | 3 +- .../data/minestuck/recipes/apple_cake.json | 3 +- .../minestuck/recipes/bear_poking_stick.json | 3 +- .../recipes/black_chess_brick_slab.json | 3 +- ...ack_chess_brick_smooth_pressure_plate.json | 3 +- .../black_chess_brick_smooth_slab.json | 3 +- .../black_chess_brick_smooth_stairs.json | 3 +- .../black_chess_brick_smooth_wall.json | 3 +- .../recipes/black_chess_brick_stairs.json | 3 +- .../recipes/black_chess_brick_wall.json | 3 +- .../recipes/black_cobblestone_slab.json | 3 +- .../recipes/black_cobblestone_stairs.json | 3 +- .../recipes/black_cobblestone_wall.json | 3 +- .../recipes/black_stone_brick_slab.json | 3 +- .../recipes/black_stone_brick_stairs.json | 3 +- .../recipes/black_stone_brick_wall.json | 3 +- .../minestuck/recipes/black_stone_bricks.json | 3 +- .../minestuck/recipes/black_stone_column.json | 3 +- .../recipes/black_stone_pressure_plate.json | 3 +- .../minestuck/recipes/black_stone_slab.json | 3 +- .../minestuck/recipes/black_stone_stairs.json | 3 +- .../minestuck/recipes/black_stone_wall.json | 3 +- .../data/minestuck/recipes/blank_disk.json | 3 +- .../recipes/block_pressure_plate.json | 3 +- .../recipes/blood_aspect_bookshelf.json | 3 +- .../recipes/blood_aspect_carved_planks.json | 3 +- .../minestuck/recipes/blood_aspect_door.json | 3 +- .../minestuck/recipes/blood_aspect_fence.json | 3 +- .../recipes/blood_aspect_fence_gate.json | 3 +- .../recipes/blood_aspect_hanging_sign.json | 3 +- .../recipes/blood_aspect_ladder.json | 3 +- .../recipes/blood_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/blood_aspect_sign.json | 3 +- .../minestuck/recipes/blood_aspect_slab.json | 3 +- .../recipes/blood_aspect_stairs.json | 3 +- .../recipes/blood_aspect_stripped_wood.json | 3 +- .../recipes/blood_aspect_trapdoor.json | 3 +- .../minestuck/recipes/blood_aspect_wood.json | 3 +- .../recipes/blood_shade_brick_slab.json | 3 +- .../recipes/blood_shade_brick_stairs.json | 3 +- .../recipes/blood_shade_brick_wall.json | 3 +- .../recipes/breath_aspect_bookshelf.json | 3 +- .../recipes/breath_aspect_carved_planks.json | 3 +- .../minestuck/recipes/breath_aspect_door.json | 3 +- .../recipes/breath_aspect_fence.json | 3 +- .../recipes/breath_aspect_fence_gate.json | 3 +- .../recipes/breath_aspect_hanging_sign.json | 3 +- .../recipes/breath_aspect_ladder.json | 3 +- .../recipes/breath_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/breath_aspect_sign.json | 3 +- .../minestuck/recipes/breath_aspect_slab.json | 3 +- .../recipes/breath_aspect_stairs.json | 3 +- .../recipes/breath_aspect_stripped_wood.json | 3 +- .../recipes/breath_aspect_trapdoor.json | 3 +- .../minestuck/recipes/breath_aspect_wood.json | 3 +- .../recipes/brown_stone_brick_slab.json | 3 +- .../recipes/brown_stone_brick_stairs.json | 3 +- .../recipes/brown_stone_brick_wall.json | 3 +- .../minestuck/recipes/brown_stone_bricks.json | 3 +- .../minestuck/recipes/brown_stone_column.json | 3 +- .../recipes/brown_stone_pressure_plate.json | 3 +- .../minestuck/recipes/brown_stone_slab.json | 3 +- .../minestuck/recipes/brown_stone_stairs.json | 3 +- .../minestuck/recipes/brown_stone_wall.json | 3 +- .../data/minestuck/recipes/cane.json | 3 +- .../data/minestuck/recipes/captcha_card.json | 3 +- .../data/minestuck/recipes/carved_door.json | 3 +- .../data/minestuck/recipes/carved_fence.json | 3 +- .../minestuck/recipes/carved_fence_gate.json | 3 +- .../recipes/carved_hanging_sign.json | 3 +- .../recipes/carved_heavy_plank_slab.json | 3 +- .../recipes/carved_heavy_plank_stairs.json | 3 +- .../recipes/carved_pressure_plate.json | 3 +- .../data/minestuck/recipes/carved_sign.json | 3 +- .../data/minestuck/recipes/carved_slab.json | 3 +- .../data/minestuck/recipes/carved_stairs.json | 3 +- .../minestuck/recipes/carved_trapdoor.json | 3 +- .../recipes/cast_iron_pressure_plate.json | 3 +- .../minestuck/recipes/cast_iron_slab.json | 3 +- .../minestuck/recipes/cast_iron_stairs.json | 3 +- .../minestuck/recipes/cast_iron_tile.json | 3 +- .../recipes/cast_iron_tile_slab.json | 3 +- .../recipes/cast_iron_tile_stairs.json | 3 +- .../minestuck/recipes/cast_iron_wall.json | 3 +- .../minestuck/recipes/chalk_brick_slab.json | 3 +- .../minestuck/recipes/chalk_brick_stairs.json | 3 +- .../minestuck/recipes/chalk_brick_wall.json | 3 +- .../data/minestuck/recipes/chalk_bricks.json | 3 +- .../data/minestuck/recipes/chalk_column.json | 3 +- .../recipes/chalk_pressure_plate.json | 3 +- .../data/minestuck/recipes/chalk_slab.json | 3 +- .../data/minestuck/recipes/chalk_stairs.json | 3 +- .../data/minestuck/recipes/chalk_wall.json | 3 +- .../minestuck/recipes/chessboard_black.json | 3 +- .../minestuck/recipes/chessboard_white.json | 3 +- .../minestuck/recipes/chipboard_fence.json | 3 +- .../recipes/chipboard_fence_gate.json | 3 +- .../recipes/chipboard_pressure_plate.json | 3 +- .../minestuck/recipes/chipboard_slab.json | 3 +- .../minestuck/recipes/chipboard_stairs.json | 3 +- .../recipes/chiseled_black_stone_bricks.json | 3 +- .../recipes/chiseled_chalk_bricks.json | 3 +- .../recipes/chiseled_coarse_stone.json | 3 +- .../recipes/chiseled_coarse_stone_bricks.json | 3 +- .../recipes/chiseled_cruxite_block.json | 3 +- .../recipes/chiseled_frost_bricks.json | 3 +- .../recipes/chiseled_frost_tile.json | 3 +- .../recipes/chiseled_igneous_stone.json | 3 +- .../recipes/chiseled_mycelium_bricks.json | 3 +- .../recipes/chiseled_pink_stone_bricks.json | 3 +- .../chiseled_red_sandstone_column.json | 3 +- .../recipes/chiseled_sandstone_column.json | 3 +- .../recipes/chiseled_shade_bricks.json | 3 +- .../data/minestuck/recipes/cindered_door.json | 3 +- .../minestuck/recipes/cindered_fence.json | 3 +- .../recipes/cindered_fence_gate.json | 3 +- .../recipes/cindered_hanging_sign.json | 3 +- .../recipes/cindered_pressure_plate.json | 3 +- .../data/minestuck/recipes/cindered_sign.json | 3 +- .../data/minestuck/recipes/cindered_slab.json | 3 +- .../minestuck/recipes/cindered_stairs.json | 3 +- .../minestuck/recipes/cindered_trapdoor.json | 3 +- .../data/minestuck/recipes/cindered_wood.json | 3 +- .../data/minestuck/recipes/claw_hammer.json | 3 +- .../data/minestuck/recipes/clothes_iron.json | 3 +- .../recipes/coarse_stone_brick_slab.json | 3 +- .../recipes/coarse_stone_brick_stairs.json | 3 +- .../recipes/coarse_stone_brick_wall.json | 3 +- .../recipes/coarse_stone_bricks.json | 3 +- .../recipes/coarse_stone_column.json | 3 +- .../recipes/coarse_stone_pressure_plate.json | 3 +- .../minestuck/recipes/coarse_stone_slab.json | 3 +- .../recipes/coarse_stone_stairs.json | 3 +- .../minestuck/recipes/coarse_stone_wall.json | 3 +- .../recipes/combinations/cactus.json | 2 +- .../recipes/combinations/crimson_roots.json | 2 +- ...s.json => dead_bush_from_short_grass.json} | 2 +- ...json => grass_block_from_short_grass.json} | 2 +- .../recipes/combinations/moss_block.json | 2 +- .../recipes/combinations/moss_carpet.json | 2 +- .../recipes/combinations/shears.json | 2 +- .../recipes/combinations/warped_roots.json | 2 +- .../recipes/combinations/wooden_grass.json | 2 +- .../data/minestuck/recipes/cruxite_block.json | 3 +- .../minestuck/recipes/cruxite_brick_slab.json | 3 +- .../recipes/cruxite_brick_stairs.json | 3 +- .../minestuck/recipes/cruxite_brick_wall.json | 3 +- .../minestuck/recipes/cruxite_bricks.json | 3 +- .../data/minestuck/recipes/cruxite_door.json | 3 +- .../data/minestuck/recipes/cruxite_lamp.json | 3 +- .../minestuck/recipes/cruxite_pillar.json | 3 +- .../recipes/cruxite_pressure_plate.json | 3 +- .../data/minestuck/recipes/cruxite_slab.json | 3 +- .../minestuck/recipes/cruxite_stairs.json | 3 +- .../minestuck/recipes/cruxite_trapdoor.json | 3 +- .../data/minestuck/recipes/cruxite_wall.json | 3 +- .../data/minestuck/recipes/dagger.json | 3 +- .../recipes/dark_gray_chess_brick_slab.json | 3 +- ...ray_chess_brick_smooth_pressure_plate.json | 3 +- .../dark_gray_chess_brick_smooth_slab.json | 3 +- .../dark_gray_chess_brick_smooth_stairs.json | 3 +- .../dark_gray_chess_brick_smooth_wall.json | 3 +- .../recipes/dark_gray_chess_brick_stairs.json | 3 +- .../recipes/dark_gray_chess_brick_wall.json | 3 +- .../minestuck/recipes/dead_bookshelf.json | 3 +- .../data/minestuck/recipes/dead_door.json | 3 +- .../data/minestuck/recipes/dead_fence.json | 3 +- .../minestuck/recipes/dead_fence_gate.json | 3 +- .../minestuck/recipes/dead_hanging_sign.json | 3 +- .../data/minestuck/recipes/dead_ladder.json | 3 +- .../minestuck/recipes/dead_planks_slab.json | 3 +- .../minestuck/recipes/dead_planks_stairs.json | 3 +- .../recipes/dead_pressure_plate.json | 3 +- .../data/minestuck/recipes/dead_sign.json | 3 +- .../data/minestuck/recipes/dead_trapdoor.json | 3 +- .../data/minestuck/recipes/dead_wood.json | 3 +- .../recipes/decrepit_stone_brick_slab.json | 3 +- .../recipes/decrepit_stone_brick_stairs.json | 3 +- .../recipes/decrepit_stone_brick_wall.json | 3 +- .../data/minestuck/recipes/deuce_club.json | 3 +- .../recipes/doom_aspect_bookshelf.json | 3 +- .../recipes/doom_aspect_carved_planks.json | 3 +- .../minestuck/recipes/doom_aspect_door.json | 3 +- .../minestuck/recipes/doom_aspect_fence.json | 3 +- .../recipes/doom_aspect_fence_gate.json | 3 +- .../recipes/doom_aspect_hanging_sign.json | 3 +- .../minestuck/recipes/doom_aspect_ladder.json | 3 +- .../recipes/doom_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/doom_aspect_sign.json | 3 +- .../minestuck/recipes/doom_aspect_slab.json | 3 +- .../minestuck/recipes/doom_aspect_stairs.json | 3 +- .../recipes/doom_aspect_stripped_wood.json | 3 +- .../recipes/doom_aspect_trapdoor.json | 3 +- .../minestuck/recipes/doom_aspect_wood.json | 3 +- .../data/minestuck/recipes/end_bookshelf.json | 3 +- .../data/minestuck/recipes/end_door.json | 3 +- .../data/minestuck/recipes/end_fence.json | 3 +- .../minestuck/recipes/end_fence_gate.json | 3 +- .../minestuck/recipes/end_hanging_sign.json | 3 +- .../data/minestuck/recipes/end_ladder.json | 3 +- .../minestuck/recipes/end_planks_slab.json | 3 +- .../minestuck/recipes/end_planks_stairs.json | 3 +- .../minestuck/recipes/end_pressure_plate.json | 3 +- .../data/minestuck/recipes/end_sign.json | 3 +- .../data/minestuck/recipes/end_trapdoor.json | 3 +- .../data/minestuck/recipes/end_wood.json | 3 +- .../data/minestuck/recipes/energy_core.json | 3 +- .../resources/data/minestuck/recipes/fan.json | 3 +- .../recipes/flowery_chalk_brick_slab.json | 3 +- .../recipes/flowery_chalk_brick_stairs.json | 3 +- .../recipes/flowery_chalk_brick_wall.json | 3 +- .../recipes/flowery_frost_brick_slab.json | 3 +- .../recipes/flowery_frost_brick_stairs.json | 3 +- .../recipes/flowery_frost_brick_wall.json | 3 +- .../flowery_mossy_cobblestone_slab.json | 3 +- .../flowery_mossy_cobblestone_stairs.json | 3 +- .../flowery_mossy_cobblestone_wall.json | 3 +- .../flowery_mossy_stone_brick_slab.json | 3 +- .../flowery_mossy_stone_brick_stairs.json | 3 +- .../flowery_mossy_stone_brick_wall.json | 3 +- .../recipes/flowery_mycelium_brick_slab.json | 3 +- .../flowery_mycelium_brick_stairs.json | 3 +- .../recipes/flowery_mycelium_brick_wall.json | 3 +- .../minestuck/recipes/flowery_vine_wood.json | 3 +- .../data/minestuck/recipes/fork.json | 3 +- .../minestuck/recipes/frost_bookshelf.json | 3 +- .../minestuck/recipes/frost_brick_slab.json | 3 +- .../minestuck/recipes/frost_brick_stairs.json | 3 +- .../minestuck/recipes/frost_brick_wall.json | 3 +- .../data/minestuck/recipes/frost_bricks.json | 3 +- .../data/minestuck/recipes/frost_column.json | 3 +- .../data/minestuck/recipes/frost_door.json | 3 +- .../data/minestuck/recipes/frost_fence.json | 3 +- .../minestuck/recipes/frost_fence_gate.json | 3 +- .../minestuck/recipes/frost_hanging_sign.json | 3 +- .../data/minestuck/recipes/frost_ladder.json | 3 +- .../recipes/frost_pressure_plate.json | 3 +- .../data/minestuck/recipes/frost_sign.json | 3 +- .../data/minestuck/recipes/frost_slab.json | 3 +- .../data/minestuck/recipes/frost_stairs.json | 3 +- .../minestuck/recipes/frost_tile_slab.json | 3 +- .../minestuck/recipes/frost_tile_stairs.json | 3 +- .../minestuck/recipes/frost_tile_wall.json | 3 +- .../minestuck/recipes/frost_trapdoor.json | 3 +- .../data/minestuck/recipes/frost_wood.json | 3 +- .../minestuck/recipes/glowing_bookshelf.json | 3 +- .../data/minestuck/recipes/glowing_door.json | 3 +- .../data/minestuck/recipes/glowing_fence.json | 3 +- .../minestuck/recipes/glowing_fence_gate.json | 3 +- .../recipes/glowing_hanging_sign.json | 3 +- .../minestuck/recipes/glowing_ladder.json | 3 +- .../recipes/glowing_pressure_plate.json | 3 +- .../data/minestuck/recipes/glowing_sign.json | 3 +- .../data/minestuck/recipes/glowing_slab.json | 3 +- .../minestuck/recipes/glowing_stairs.json | 3 +- .../minestuck/recipes/glowing_trapdoor.json | 3 +- .../data/minestuck/recipes/glowing_wood.json | 3 +- .../green_stone_brick_embedded_ladder.json | 3 +- .../recipes/green_stone_brick_slab.json | 3 +- .../recipes/green_stone_brick_stairs.json | 3 +- .../recipes/green_stone_brick_wall.json | 3 +- .../minestuck/recipes/green_stone_bricks.json | 3 +- .../minestuck/recipes/green_stone_column.json | 3 +- .../recipes/green_stone_pressure_plate.json | 3 +- .../minestuck/recipes/green_stone_slab.json | 3 +- .../minestuck/recipes/green_stone_stairs.json | 3 +- .../minestuck/recipes/green_stone_wall.json | 3 +- .../{grass.json => short_grass.json} | 2 +- .../data/minestuck/recipes/grub_sauce.json | 3 +- .../recipes/heart_aspect_bookshelf.json | 3 +- .../recipes/heart_aspect_carved_planks.json | 3 +- .../minestuck/recipes/heart_aspect_door.json | 3 +- .../minestuck/recipes/heart_aspect_fence.json | 3 +- .../recipes/heart_aspect_fence_gate.json | 3 +- .../recipes/heart_aspect_hanging_sign.json | 3 +- .../recipes/heart_aspect_ladder.json | 3 +- .../recipes/heart_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/heart_aspect_sign.json | 3 +- .../minestuck/recipes/heart_aspect_slab.json | 3 +- .../recipes/heart_aspect_stairs.json | 3 +- .../recipes/heart_aspect_stripped_wood.json | 3 +- .../recipes/heart_aspect_trapdoor.json | 3 +- .../minestuck/recipes/heart_aspect_wood.json | 3 +- .../data/minestuck/recipes/heat_lamp.json | 3 +- .../recipes/hope_aspect_bookshelf.json | 3 +- .../recipes/hope_aspect_carved_planks.json | 3 +- .../minestuck/recipes/hope_aspect_door.json | 3 +- .../minestuck/recipes/hope_aspect_fence.json | 3 +- .../recipes/hope_aspect_fence_gate.json | 3 +- .../recipes/hope_aspect_hanging_sign.json | 3 +- .../minestuck/recipes/hope_aspect_ladder.json | 3 +- .../recipes/hope_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/hope_aspect_sign.json | 3 +- .../minestuck/recipes/hope_aspect_slab.json | 3 +- .../minestuck/recipes/hope_aspect_stairs.json | 3 +- .../recipes/hope_aspect_stripped_wood.json | 3 +- .../recipes/hope_aspect_trapdoor.json | 3 +- .../minestuck/recipes/hope_aspect_wood.json | 3 +- .../horizontal_green_stone_brick_slab.json | 3 +- .../horizontal_green_stone_brick_stairs.json | 3 +- .../horizontal_green_stone_brick_wall.json | 3 +- .../horizontal_green_stone_bricks.json | 3 +- .../data/minestuck/recipes/horn.json | 3 +- .../data/minestuck/recipes/house_key.json | 3 +- .../recipes/igneous_stone_pressure_plate.json | 3 +- .../minestuck/recipes/igneous_stone_slab.json | 3 +- .../recipes/igneous_stone_stairs.json | 3 +- .../minestuck/recipes/igneous_stone_wall.json | 3 +- .../data/minestuck/recipes/iron_cane.json | 3 +- .../data/minestuck/recipes/item_magnet.json | 3 +- .../data/minestuck/recipes/katana.json | 3 +- .../minestuck/recipes/knitting_needle.json | 3 +- .../recipes/lacquered_chipboard_fence.json | 3 +- .../lacquered_chipboard_fence_gate.json | 3 +- .../lacquered_chipboard_pressure_plate.json | 3 +- .../recipes/lacquered_chipboard_slab.json | 3 +- .../recipes/lacquered_chipboard_stairs.json | 3 +- .../minestuck/recipes/lacquered_door.json | 3 +- .../minestuck/recipes/lacquered_fence.json | 3 +- .../recipes/lacquered_fence_gate.json | 3 +- .../recipes/lacquered_hanging_sign.json | 3 +- .../recipes/lacquered_heavy_plank_slab.json | 3 +- .../recipes/lacquered_heavy_plank_stairs.json | 3 +- .../recipes/lacquered_pressure_plate.json | 3 +- .../minestuck/recipes/lacquered_sign.json | 3 +- .../minestuck/recipes/lacquered_slab.json | 3 +- .../minestuck/recipes/lacquered_stairs.json | 3 +- .../minestuck/recipes/lacquered_trapdoor.json | 3 +- .../lacquered_uncarved_wood_fence.json | 3 +- .../lacquered_uncarved_wood_fence_gate.json | 3 +- ...acquered_uncarved_wood_pressure_plate.json | 3 +- .../recipes/lacquered_uncarved_wood_slab.json | 3 +- .../lacquered_uncarved_wood_stairs.json | 3 +- .../recipes/life_aspect_bookshelf.json | 3 +- .../recipes/life_aspect_carved_planks.json | 3 +- .../minestuck/recipes/life_aspect_door.json | 3 +- .../minestuck/recipes/life_aspect_fence.json | 3 +- .../recipes/life_aspect_fence_gate.json | 3 +- .../recipes/life_aspect_hanging_sign.json | 3 +- .../minestuck/recipes/life_aspect_ladder.json | 3 +- .../recipes/life_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/life_aspect_sign.json | 3 +- .../minestuck/recipes/life_aspect_slab.json | 3 +- .../minestuck/recipes/life_aspect_stairs.json | 3 +- .../recipes/life_aspect_stripped_wood.json | 3 +- .../recipes/life_aspect_trapdoor.json | 3 +- .../minestuck/recipes/life_aspect_wood.json | 3 +- .../recipes/light_aspect_bookshelf.json | 3 +- .../recipes/light_aspect_carved_planks.json | 3 +- .../minestuck/recipes/light_aspect_door.json | 3 +- .../minestuck/recipes/light_aspect_fence.json | 3 +- .../recipes/light_aspect_fence_gate.json | 3 +- .../recipes/light_aspect_hanging_sign.json | 3 +- .../recipes/light_aspect_ladder.json | 3 +- .../recipes/light_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/light_aspect_sign.json | 3 +- .../minestuck/recipes/light_aspect_slab.json | 3 +- .../recipes/light_aspect_stairs.json | 3 +- .../recipes/light_aspect_stripped_wood.json | 3 +- .../recipes/light_aspect_trapdoor.json | 3 +- .../minestuck/recipes/light_aspect_wood.json | 3 +- .../recipes/light_gray_chess_brick_slab.json | 3 +- ...ray_chess_brick_smooth_pressure_plate.json | 3 +- .../light_gray_chess_brick_smooth_slab.json | 3 +- .../light_gray_chess_brick_smooth_stairs.json | 3 +- .../light_gray_chess_brick_smooth_wall.json | 3 +- .../light_gray_chess_brick_stairs.json | 3 +- .../recipes/light_gray_chess_brick_wall.json | 3 +- .../data/minestuck/recipes/lip_balm.json | 3 +- .../data/minestuck/recipes/macuahuitl.json | 3 +- .../magmatic_black_stone_brick_slab.json | 3 +- .../magmatic_black_stone_brick_stairs.json | 3 +- .../magmatic_black_stone_brick_wall.json | 3 +- .../recipes/magmatic_black_stone_bricks.json | 3 +- .../magmatic_polished_igneous_brick_slab.json | 3 +- ...agmatic_polished_igneous_brick_stairs.json | 3 +- .../magmatic_polished_igneous_brick_wall.json | 3 +- .../magmatic_polished_igneous_bricks.json | 3 +- ...ic_polished_igneous_bricks_from_magma.json | 3 +- .../data/minestuck/recipes/mailbox.json | 3 +- .../recipes/makeshift_claws_drawn.json | 3 +- .../recipes/mind_aspect_bookshelf.json | 3 +- .../recipes/mind_aspect_carved_planks.json | 3 +- .../minestuck/recipes/mind_aspect_door.json | 3 +- .../minestuck/recipes/mind_aspect_fence.json | 3 +- .../recipes/mind_aspect_fence_gate.json | 3 +- .../recipes/mind_aspect_hanging_sign.json | 3 +- .../minestuck/recipes/mind_aspect_ladder.json | 3 +- .../recipes/mind_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/mind_aspect_sign.json | 3 +- .../minestuck/recipes/mind_aspect_slab.json | 3 +- .../minestuck/recipes/mind_aspect_stairs.json | 3 +- .../recipes/mind_aspect_stripped_wood.json | 3 +- .../recipes/mind_aspect_trapdoor.json | 3 +- .../minestuck/recipes/mind_aspect_wood.json | 3 +- .../recipes/mossy_chalk_brick_slab.json | 3 +- .../recipes/mossy_chalk_brick_stairs.json | 3 +- .../recipes/mossy_chalk_brick_wall.json | 3 +- .../mossy_decrepit_stone_brick_slab.json | 3 +- .../mossy_decrepit_stone_brick_stairs.json | 3 +- .../mossy_decrepit_stone_brick_wall.json | 3 +- .../recipes/mossy_mycelium_brick_slab.json | 3 +- .../recipes/mossy_mycelium_brick_stairs.json | 3 +- .../recipes/mossy_mycelium_brick_wall.json | 3 +- .../recipes/mossy_pink_stone_brick_slab.json | 3 +- .../mossy_pink_stone_brick_stairs.json | 3 +- .../recipes/mossy_pink_stone_brick_wall.json | 3 +- .../recipes/mossy_shade_brick_slab.json | 3 +- .../recipes/mossy_shade_brick_stairs.json | 3 +- .../recipes/mossy_shade_brick_wall.json | 3 +- .../recipes/mycelium_brick_slab.json | 3 +- .../recipes/mycelium_brick_stairs.json | 3 +- .../recipes/mycelium_brick_wall.json | 3 +- .../minestuck/recipes/mycelium_bricks.json | 3 +- .../recipes/mycelium_cobblestone_slab.json | 3 +- .../recipes/mycelium_cobblestone_stairs.json | 3 +- .../recipes/mycelium_cobblestone_wall.json | 3 +- .../minestuck/recipes/mycelium_column.json | 3 +- .../data/minestuck/recipes/mycelium_slab.json | 3 +- .../minestuck/recipes/mycelium_stairs.json | 3 +- .../mycelium_stone_pressure_plate.json | 3 +- .../recipes/mycelium_stone_wall.json | 3 +- .../minestuck/recipes/obsidian_axe_knife.json | 3 +- .../recipes/perfectly_generic_door.json | 3 +- .../recipes/perfectly_generic_fence.json | 3 +- .../recipes/perfectly_generic_fence_gate.json | 3 +- .../perfectly_generic_hanging_sign.json | 3 +- .../perfectly_generic_pressure_plate.json | 3 +- .../recipes/perfectly_generic_sign.json | 3 +- .../recipes/perfectly_generic_slab.json | 3 +- .../recipes/perfectly_generic_stairs.json | 3 +- .../recipes/perfectly_generic_trapdoor.json | 3 +- .../recipes/perfectly_generic_wall.json | 3 +- .../minestuck/recipes/petrified_wood.json | 3 +- .../recipes/pink_stone_brick_slab.json | 3 +- .../recipes/pink_stone_brick_stairs.json | 3 +- .../recipes/pink_stone_brick_wall.json | 3 +- .../minestuck/recipes/pink_stone_bricks.json | 3 +- .../minestuck/recipes/pink_stone_column.json | 3 +- .../recipes/pink_stone_pressure_plate.json | 3 +- .../minestuck/recipes/pink_stone_slab.json | 3 +- .../minestuck/recipes/pink_stone_stairs.json | 3 +- .../minestuck/recipes/pink_stone_wall.json | 3 +- .../minestuck/recipes/plutonium_core.json | 3 +- .../data/minestuck/recipes/pointy_stick.json | 3 +- .../recipes/polished_black_stone_slab.json | 3 +- .../recipes/polished_black_stone_stairs.json | 3 +- .../recipes/polished_black_stone_wall.json | 3 +- .../recipes/polished_brown_stone_slab.json | 3 +- .../recipes/polished_brown_stone_stairs.json | 3 +- .../recipes/polished_brown_stone_wall.json | 3 +- .../minestuck/recipes/polished_chalk.json | 3 +- .../recipes/polished_chalk_slab.json | 3 +- .../recipes/polished_chalk_stairs.json | 3 +- .../recipes/polished_chalk_wall.json | 3 +- .../recipes/polished_cruxite_block.json | 3 +- .../recipes/polished_cruxite_slab.json | 3 +- .../recipes/polished_cruxite_stairs.json | 3 +- .../recipes/polished_cruxite_wall.json | 3 +- .../recipes/polished_green_stone.json | 3 +- .../recipes/polished_green_stone_slab.json | 3 +- .../recipes/polished_green_stone_stairs.json | 3 +- .../recipes/polished_green_stone_wall.json | 3 +- .../recipes/polished_igneous_brick_slab.json | 3 +- .../polished_igneous_brick_stairs.json | 3 +- .../recipes/polished_igneous_brick_wall.json | 3 +- .../recipes/polished_igneous_bricks.json | 3 +- .../recipes/polished_igneous_pillar.json | 3 +- .../recipes/polished_igneous_stone.json | 3 +- .../recipes/polished_igneous_stone_slab.json | 3 +- .../polished_igneous_stone_stairs.json | 3 +- .../recipes/polished_igneous_stone_wall.json | 3 +- .../polished_lacquered_uncarved_slab.json | 3 +- .../polished_lacquered_uncarved_stairs.json | 3 +- .../recipes/polished_mycelium_stone_slab.json | 3 +- .../polished_mycelium_stone_stairs.json | 3 +- .../recipes/polished_mycelium_stone_wall.json | 3 +- .../recipes/polished_pink_stone_slab.json | 3 +- .../recipes/polished_pink_stone_stairs.json | 3 +- .../recipes/polished_pink_stone_wall.json | 3 +- .../polished_treated_uncarved_slab.json | 3 +- .../polished_treated_uncarved_stairs.json | 3 +- .../recipes/polished_uncarved_slab.json | 3 +- .../recipes/polished_uncarved_stairs.json | 3 +- .../minestuck/recipes/pumice_brick_slab.json | 3 +- .../recipes/pumice_brick_stairs.json | 3 +- .../minestuck/recipes/pumice_brick_wall.json | 3 +- .../data/minestuck/recipes/pumice_bricks.json | 3 +- .../recipes/pumice_stone_pressure_plate.json | 3 +- .../minestuck/recipes/pumice_stone_slab.json | 3 +- .../recipes/pumice_stone_stairs.json | 3 +- .../minestuck/recipes/pumice_stone_wall.json | 3 +- .../minestuck/recipes/pumice_tile_slab.json | 3 +- .../minestuck/recipes/pumice_tile_stairs.json | 3 +- .../minestuck/recipes/pumice_tile_wall.json | 3 +- .../data/minestuck/recipes/pumice_tiles.json | 3 +- .../minestuck/recipes/queue_modus_card.json | 3 +- .../recipes/rage_aspect_bookshelf.json | 3 +- .../recipes/rage_aspect_carved_planks.json | 3 +- .../minestuck/recipes/rage_aspect_door.json | 3 +- .../minestuck/recipes/rage_aspect_fence.json | 3 +- .../recipes/rage_aspect_fence_gate.json | 3 +- .../recipes/rage_aspect_hanging_sign.json | 3 +- .../minestuck/recipes/rage_aspect_ladder.json | 3 +- .../recipes/rage_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/rage_aspect_sign.json | 3 +- .../minestuck/recipes/rage_aspect_slab.json | 3 +- .../minestuck/recipes/rage_aspect_stairs.json | 3 +- .../recipes/rage_aspect_stripped_wood.json | 3 +- .../recipes/rage_aspect_trapdoor.json | 3 +- .../minestuck/recipes/rage_aspect_wood.json | 3 +- .../minestuck/recipes/rainbow_bookshelf.json | 3 +- .../data/minestuck/recipes/rainbow_door.json | 3 +- .../data/minestuck/recipes/rainbow_fence.json | 3 +- .../minestuck/recipes/rainbow_fence_gate.json | 3 +- .../recipes/rainbow_hanging_sign.json | 3 +- .../minestuck/recipes/rainbow_ladder.json | 3 +- .../recipes/rainbow_planks_slab.json | 3 +- .../recipes/rainbow_planks_stairs.json | 3 +- .../recipes/rainbow_pressure_plate.json | 3 +- .../data/minestuck/recipes/rainbow_sign.json | 3 +- .../minestuck/recipes/rainbow_trapdoor.json | 3 +- .../data/minestuck/recipes/rainbow_wood.json | 3 +- .../recipes/red_sandstone_column.json | 3 +- .../minestuck/recipes/redstone_clock.json | 3 +- .../minestuck/recipes/remote_comparator.json | 3 +- .../minestuck/recipes/retractable_spikes.json | 3 +- .../data/minestuck/recipes/rotator.json | 3 +- .../minestuck/recipes/rotted_shadewood.json | 3 +- .../minestuck/recipes/sandstone_column.json | 3 +- .../minestuck/recipes/scarred_shadewood.json | 3 +- .../minestuck/recipes/shade_brick_slab.json | 3 +- .../minestuck/recipes/shade_brick_stairs.json | 3 +- .../minestuck/recipes/shade_brick_wall.json | 3 +- .../data/minestuck/recipes/shade_bricks.json | 3 +- .../data/minestuck/recipes/shade_column.json | 3 +- .../recipes/shade_pressure_plate.json | 3 +- .../data/minestuck/recipes/shade_slab.json | 3 +- .../data/minestuck/recipes/shade_stairs.json | 3 +- .../data/minestuck/recipes/shade_wall.json | 3 +- .../data/minestuck/recipes/shadewood.json | 3 +- .../minestuck/recipes/shadewood_door.json | 3 +- .../minestuck/recipes/shadewood_fence.json | 3 +- .../recipes/shadewood_fence_gate.json | 3 +- .../recipes/shadewood_hanging_sign.json | 3 +- .../recipes/shadewood_pressure_plate.json | 3 +- .../minestuck/recipes/shadewood_sign.json | 3 +- .../minestuck/recipes/shadewood_slab.json | 3 +- .../minestuck/recipes/shadewood_stairs.json | 3 +- .../minestuck/recipes/shadewood_trapdoor.json | 3 +- .../data/minestuck/recipes/shuriken.json | 3 +- .../data/minestuck/recipes/sickle.json | 3 +- .../minestuck/recipes/skaianet_denier.json | 3 +- .../data/minestuck/recipes/sledge_hammer.json | 3 +- .../recipes/smooth_shade_stone_slab.json | 3 +- .../recipes/smooth_shade_stone_stairs.json | 3 +- .../recipes/smooth_shade_stone_wall.json | 3 +- .../data/minestuck/recipes/solid_switch.json | 3 +- .../recipes/space_aspect_bookshelf.json | 3 +- .../recipes/space_aspect_carved_planks.json | 3 +- .../minestuck/recipes/space_aspect_door.json | 3 +- .../minestuck/recipes/space_aspect_fence.json | 3 +- .../recipes/space_aspect_fence_gate.json | 3 +- .../recipes/space_aspect_hanging_sign.json | 3 +- .../recipes/space_aspect_ladder.json | 3 +- .../recipes/space_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/space_aspect_sign.json | 3 +- .../minestuck/recipes/space_aspect_slab.json | 3 +- .../recipes/space_aspect_stairs.json | 3 +- .../recipes/space_aspect_stripped_wood.json | 3 +- .../recipes/space_aspect_trapdoor.json | 3 +- .../minestuck/recipes/space_aspect_wood.json | 3 +- .../data/minestuck/recipes/spikes.json | 3 +- .../minestuck/recipes/stack_modus_card.json | 3 +- .../steep_green_stone_brick_stairs_base.json | 3 +- .../steep_green_stone_brick_stairs_top.json | 3 +- .../data/minestuck/recipes/strawberry.json | 3 +- .../recipes/stripped_rotted_shadewood.json | 3 +- .../recipes/stripped_scarred_shadewood.json | 3 +- .../minestuck/recipes/stripped_shadewood.json | 3 +- .../data/minestuck/recipes/sugar_cube.json | 3 +- .../recipes/tar_shade_brick_slab.json | 3 +- .../recipes/tar_shade_brick_stairs.json | 3 +- .../recipes/tar_shade_brick_wall.json | 3 +- .../minestuck/recipes/temple_scanner.json | 3 +- .../recipes/time_aspect_bookshelf.json | 3 +- .../recipes/time_aspect_carved_planks.json | 3 +- .../minestuck/recipes/time_aspect_door.json | 3 +- .../minestuck/recipes/time_aspect_fence.json | 3 +- .../recipes/time_aspect_fence_gate.json | 3 +- .../recipes/time_aspect_hanging_sign.json | 3 +- .../minestuck/recipes/time_aspect_ladder.json | 3 +- .../recipes/time_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/time_aspect_sign.json | 3 +- .../minestuck/recipes/time_aspect_slab.json | 3 +- .../minestuck/recipes/time_aspect_stairs.json | 3 +- .../recipes/time_aspect_stripped_wood.json | 3 +- .../recipes/time_aspect_trapdoor.json | 3 +- .../minestuck/recipes/time_aspect_wood.json | 3 +- .../data/minestuck/recipes/toggler.json | 3 +- .../minestuck/recipes/treated_bookshelf.json | 3 +- .../recipes/treated_chipboard_fence.json | 3 +- .../recipes/treated_chipboard_fence_gate.json | 3 +- .../treated_chipboard_pressure_plate.json | 3 +- .../recipes/treated_chipboard_slab.json | 3 +- .../recipes/treated_chipboard_stairs.json | 3 +- .../data/minestuck/recipes/treated_door.json | 3 +- .../data/minestuck/recipes/treated_fence.json | 3 +- .../minestuck/recipes/treated_fence_gate.json | 3 +- .../recipes/treated_hanging_sign.json | 3 +- .../recipes/treated_heavy_plank_slab.json | 3 +- .../recipes/treated_heavy_plank_stairs.json | 3 +- .../minestuck/recipes/treated_ladder.json | 3 +- .../recipes/treated_planks_slab.json | 3 +- .../recipes/treated_planks_stairs.json | 3 +- .../recipes/treated_pressure_plate.json | 3 +- .../data/minestuck/recipes/treated_sign.json | 3 +- .../minestuck/recipes/treated_trapdoor.json | 3 +- .../recipes/treated_uncarved_wood_fence.json | 3 +- .../treated_uncarved_wood_fence_gate.json | 3 +- .../treated_uncarved_wood_pressure_plate.json | 3 +- .../recipes/treated_uncarved_wood_slab.json | 3 +- .../recipes/treated_uncarved_wood_stairs.json | 3 +- .../data/minestuck/recipes/umbrella.json | 3 +- .../recipes/uncarved_wood_fence.json | 3 +- .../recipes/uncarved_wood_fence_gate.json | 3 +- .../recipes/uncarved_wood_pressure_plate.json | 3 +- .../minestuck/recipes/uncarved_wood_slab.json | 3 +- .../recipes/uncarved_wood_stairs.json | 3 +- .../data/minestuck/recipes/uranium_block.json | 3 +- .../minestuck/recipes/uranium_cooker.json | 3 +- .../recipes/uranium_pressure_plate.json | 3 +- .../data/minestuck/recipes/uranium_slab.json | 3 +- .../minestuck/recipes/uranium_stairs.json | 3 +- .../data/minestuck/recipes/uranium_wall.json | 3 +- .../vertical_green_stone_brick_slab.json | 3 +- .../vertical_green_stone_brick_stairs.json | 3 +- .../vertical_green_stone_brick_wall.json | 3 +- .../recipes/vertical_green_stone_bricks.json | 3 +- .../data/minestuck/recipes/vine_wood.json | 3 +- .../recipes/void_aspect_bookshelf.json | 3 +- .../recipes/void_aspect_carved_planks.json | 3 +- .../minestuck/recipes/void_aspect_door.json | 3 +- .../minestuck/recipes/void_aspect_fence.json | 3 +- .../recipes/void_aspect_fence_gate.json | 3 +- .../recipes/void_aspect_hanging_sign.json | 3 +- .../minestuck/recipes/void_aspect_ladder.json | 3 +- .../recipes/void_aspect_pressure_plate.json | 3 +- .../minestuck/recipes/void_aspect_sign.json | 3 +- .../minestuck/recipes/void_aspect_slab.json | 3 +- .../minestuck/recipes/void_aspect_stairs.json | 3 +- .../recipes/void_aspect_stripped_wood.json | 3 +- .../recipes/void_aspect_trapdoor.json | 3 +- .../minestuck/recipes/void_aspect_wood.json | 3 +- .../recipes/white_chess_brick_slab.json | 3 +- ...ite_chess_brick_smooth_pressure_plate.json | 3 +- .../white_chess_brick_smooth_slab.json | 3 +- .../white_chess_brick_smooth_stairs.json | 3 +- .../white_chess_brick_smooth_wall.json | 3 +- .../recipes/white_chess_brick_stairs.json | 3 +- .../recipes/white_chess_brick_wall.json | 3 +- .../recipes/wireless_redstone_receiver.json | 3 +- .../wireless_redstone_transmitter.json | 3 +- .../data/minestuck/recipes/wooden_lance.json | 3 +- .../data/minestuck/recipes/wooden_spoon.json | 3 +- .../java/com/mraof/minestuck/Minestuck.java | 20 +- .../advancements/CaptchalogueTrigger.java | 56 +- .../advancements/ChangeModusTrigger.java | 47 +- .../advancements/ConsortItemTrigger.java | 62 +- .../advancements/ConsortTalkTrigger.java | 50 +- .../advancements/EcheladderTrigger.java | 40 +- .../minestuck/advancements/EventTrigger.java | 33 +- .../IntellibeamLaserstationTrigger.java | 41 +- .../advancements/MSCriteriaTriggers.java | 50 +- .../advancements/PunchDesignixTrigger.java | 51 +- .../advancements/TreeModusRootTrigger.java | 41 +- .../recipe/RegularCombinationRecipe.java | 3 +- .../recipe/generator/SourceGristCost.java | 27 +- .../recipe/RecipeGeneratedGristCost.java | 7 +- .../minestuck/api/alchemy/GristTypes.java | 9 +- .../recipe/ContainerGristCostBuilder.java | 46 +- .../recipe/GristCostRecipeBuilder.java | 46 +- .../recipe/SourceGristCostBuilder.java | 61 +- .../recipe/UnavailableGristCostBuilder.java | 39 +- .../recipe/WildcardGristCostBuilder.java | 40 +- .../combination/CombinationRecipeBuilder.java | 47 +- .../minestuck/block/AspectTreeBlocks.java | 332 ++--- .../minestuck/block/CruxiteDowelBlock.java | 3 +- .../block/EmergingCruxiteDowelBlock.java | 2 +- .../mraof/minestuck/block/MSBlockSetType.java | 85 +- .../com/mraof/minestuck/block/MSBlocks.java | 1192 +++++++++-------- .../minestuck/block/MSDirectionalBlock.java | 7 + .../minestuck/block/MSHangingSignBlock.java | 4 +- .../block/MSHorizontalDirectionalBlock.java | 16 +- .../minestuck/block/MSStandingSignBlock.java | 4 +- .../block/MSWallHangingSignBlock.java | 4 +- .../minestuck/block/MSWallSignBlock.java | 4 +- .../mraof/minestuck/block/PushableBlock.java | 7 + .../mraof/minestuck/block/SkaiaBlocks.java | 99 +- .../minestuck/block/SkaiaPortalBlock.java | 17 +- .../minestuck/block/SpecialButtonBlock.java | 12 +- .../minestuck/block/StoneTabletBlock.java | 13 +- .../minestuck/block/SulfurBubbleBlock.java | 7 + .../minestuck/block/machine/AnthvilBlock.java | 10 +- .../block/machine/GristCollectorBlock.java | 7 + .../minestuck/block/machine/HolopadBlock.java | 9 +- .../machine/IntellibeamLaserstationBlock.java | 6 +- .../block/machine/MachineProcessBlock.java | 18 +- .../block/machine/PowerHubBlock.java | 7 + .../block/machine/SmallMachineBlock.java | 5 +- .../block/plant/AspectSaplingBlock.java | 4 +- .../block/plant/BurnedFoliageBlock.java | 7 + .../block/plant/DesertFloraBlock.java | 7 + .../block/plant/EndSaplingBlock.java | 15 +- .../block/plant/FrostSaplingBlock.java | 8 +- .../block/plant/GlowingMushroomBlock.java | 7 + .../block/plant/PetrifiedFloraBlock.java | 7 + .../block/plant/RainbowSaplingBlock.java | 7 +- .../block/plant/StrawberryBlock.java | 18 +- .../block/plant/TallEndGrassBlock.java | 9 +- .../block/plant/WoodenFloraBlock.java | 7 + .../block/redstone/AreaEffectBlock.java | 7 + .../block/redstone/LogicGateBlock.java | 7 + .../block/redstone/StructureCoreBlock.java | 7 + .../WirelessRedstoneReceiverBlock.java | 7 + .../WirelessRedstoneTransmitterBlock.java | 9 +- .../blockentity/ReturnNodeBlockEntity.java | 2 +- .../machine/AnthvilBlockEntity.java | 31 +- .../machine/GristWidgetBlockEntity.java | 13 +- .../IntellibeamLaserstationBlockEntity.java | 2 +- .../machine/MachineProcessBlockEntity.java | 16 - .../machine/MiniAlchemiterBlockEntity.java | 22 +- .../machine/MiniCruxtruderBlockEntity.java | 22 +- .../machine/MiniPunchDesignixBlockEntity.java | 25 +- .../machine/MiniTotemLatheBlockEntity.java | 25 +- .../machine/PunchDesignixBlockEntity.java | 6 +- .../machine/SendificatorBlockEntity.java | 33 +- .../machine/UraniumCookerBlockEntity.java | 27 +- .../redstone/AreaEffectBlockEntity.java | 6 +- .../redstone/StatStorerBlockEntity.java | 2 +- .../client/gui/AlchemiterScreen.java | 4 +- .../minestuck/client/gui/AnthvilScreen.java | 5 +- .../client/gui/AreaEffectScreen.java | 4 +- .../minestuck/client/gui/ComputerScreen.java | 2 +- .../client/gui/ComputerThemeScreen.java | 6 +- .../minestuck/client/gui/DialogueButton.java | 11 +- .../minestuck/client/gui/DialogueScreen.java | 6 +- .../client/gui/EditmodeSettingsScreen.java | 4 +- .../mraof/minestuck/client/gui/GoButton.java | 6 +- .../client/gui/GristSelectorScreen.java | 4 +- .../client/gui/PunchDesignixScreen.java | 4 +- .../client/gui/RemoteObserverScreen.java | 4 +- .../client/gui/SendificatorScreen.java | 4 +- .../client/gui/StatStorerScreen.java | 4 +- .../client/gui/StoneTabletScreen.java | 4 +- .../client/gui/StructureCoreScreen.java | 4 +- .../minestuck/client/gui/SummonerScreen.java | 4 +- .../client/gui/TitleSelectorScreen.java | 6 +- .../client/gui/TransportalizerScreen.java | 7 +- .../WirelessRedstoneTransmitterScreen.java | 5 +- .../captchalouge/HashMapSylladexScreen.java | 6 +- .../gui/captchalouge/SylladexScreen.java | 6 +- .../gui/captchalouge/TreeSylladexScreen.java | 4 +- .../gui/playerStats/AtheneumScreen.java | 6 +- .../gui/playerStats/CaptchaDeckScreen.java | 6 +- .../gui/playerStats/DataCheckerScreen.java | 6 +- .../playerStats/InventoryEditmodeScreen.java | 4 +- .../gui/playerStats/PlayerStatsScreen.java | 4 +- .../renderer/blockentity/GateRenderer.java | 4 +- .../blockentity/ReturnNodeRenderer.java | 4 +- .../minestuck/client/util/MSKeyHandler.java | 8 +- .../mraof/minestuck/command/RungCommand.java | 2 +- .../minestuck/computer/ButtonListProgram.java | 4 +- .../mraof/minestuck/computer/DiskBurner.java | 6 +- .../mraof/minestuck/computer/SburbClient.java | 11 +- .../mraof/minestuck/computer/SburbServer.java | 10 +- .../computer/editmode/ClientEditHandler.java | 4 +- .../computer/editmode/ClientEditToolDrag.java | 14 +- .../minestuck/computer/editmode/EditData.java | 8 +- .../editmode/EditToolsCapabilityProvider.java | 35 - .../computer/editmode/IEditTools.java | 2 +- .../computer/editmode/ServerEditHandler.java | 18 +- .../minestuck/data/MSAdvancementProvider.java | 102 +- .../mraof/minestuck/data/MinestuckData.java | 13 +- .../recipe/GeneratedGristCostBuilder.java | 36 +- .../IrradiatingFallbackRecipeBuilder.java | 50 +- .../data/recipe/IrradiatingRecipeBuilder.java | 41 +- .../recipe/MinestuckCombinationsProvider.java | 18 +- .../recipe/MinestuckGristCostsProvider.java | 2 +- .../data/recipe/MinestuckRecipeProvider.java | 6 +- .../data/recipe/NonMirroredRecipeBuilder.java | 41 +- .../effects/CreativeShockEffect.java | 14 +- .../mraof/minestuck/entity/DecoyEntity.java | 17 +- .../minestuck/entity/LotusFlowerEntity.java | 17 +- .../mraof/minestuck/entity/MSEntityTypes.java | 2 +- .../minestuck/entity/ServerCursorEntity.java | 17 +- .../entity/carapacian/PawnEntity.java | 2 +- .../entity/consort/ConsortEntity.java | 2 +- .../entity/dialogue/DialogueComponent.java | 11 +- .../minestuck/entity/dialogue/Trigger.java | 5 +- .../entity/dialogue/condition/Condition.java | 6 +- .../entity/item/BarbasolBombEntity.java | 9 - .../entity/item/BouncingProjectileEntity.java | 9 - .../item/ConsumableProjectileEntity.java | 9 - .../minestuck/entity/item/GristEntity.java | 17 +- .../entity/item/HangingArtEntity.java | 13 +- .../minestuck/entity/item/HologramEntity.java | 9 - .../entity/item/MetalBoatEntity.java | 13 +- .../item/ReturningProjectileEntity.java | 9 - .../entity/item/VitalityGelEntity.java | 13 +- .../mraof/minestuck/entry/EntryProcess.java | 6 +- .../mraof/minestuck/fluid/MSFluidType.java | 2 +- .../minestuck/inventory/AtheneumMenu.java | 4 +- .../inventory/ConsortMerchantInventory.java | 2 +- .../minestuck/inventory/EditmodeMenu.java | 4 +- .../captchalogue/CaptchaDeckHandler.java | 8 +- .../inventory/captchalogue/Modus.java | 4 +- .../inventory/captchalogue/TreeModus.java | 3 +- .../inventory/musicplayer/IMusicPlaying.java | 2 +- .../MusicPlayerItemCapProvider.java | 56 - .../MusicPlayingCapabilityProvider.java | 35 - .../item/crafting/NonMirroredRecipe.java | 34 +- .../item/loot/LandTableLootEntry.java | 8 +- .../item/weapon/DestroyBlockEffect.java | 2 +- .../minestuck/item/weapon/FarmineEffect.java | 2 +- .../item/weapon/MagicAOERightClickEffect.java | 5 +- .../weapon/MagicRangedRightClickEffect.java | 5 +- .../item/weapon/MusicPlayerWeapon.java | 76 +- .../minestuck/item/weapon/OnHitEffect.java | 4 +- .../minestuck/network/AlchemiterPacket.java | 14 +- .../minestuck/network/AnthvilPacket.java | 13 +- .../minestuck/network/AreaEffectPacket.java | 14 +- .../minestuck/network/AtheneumPacket.java | 25 +- .../minestuck/network/CaptchaDeckPacket.java | 16 +- .../minestuck/network/ClientEditPacket.java | 14 +- .../network/ClientMovementPacket.java | 14 +- .../minestuck/network/ColorSelectPacket.java | 16 +- .../minestuck/network/DataCheckerPacket.java | 40 +- .../minestuck/network/DialoguePackets.java | 56 +- .../minestuck/network/EditmodeDragPacket.java | 66 +- .../network/EditmodeInventoryPacket.java | 13 +- .../network/EditmodeTeleportPacket.java | 14 +- .../minestuck/network/EffectTogglePacket.java | 14 +- .../minestuck/network/EntryEffectPackets.java | 26 +- .../network/GristRejectAnimationPacket.java | 14 +- .../minestuck/network/GristToastPacket.java | 18 +- .../network/GristWildcardPacket.java | 14 +- .../minestuck/network/LotusFlowerPacket.java | 14 +- .../com/mraof/minestuck/network/MSPacket.java | 60 +- .../minestuck/network/MSPacketHandler.java | 161 --- .../mraof/minestuck/network/MSPayloads.java | 112 ++ .../minestuck/network/MachinePacket.java | 26 +- .../network/MagicAOEEffectPacket.java | 14 +- .../network/MagicRangedEffectPacket.java | 14 +- .../network/MiscContainerPacket.java | 14 +- .../minestuck/network/MusicPlayerPacket.java | 14 +- .../network/PunchDesignixPacket.java | 14 +- .../network/RGBColorSelectPacket.java | 14 +- .../network/RemoteObserverPacket.java | 14 +- .../minestuck/network/SendificatorPacket.java | 14 +- .../minestuck/network/ServerCursorPacket.java | 14 +- .../minestuck/network/ServerEditPacket.java | 38 +- .../minestuck/network/StatStorerPacket.java | 14 +- .../minestuck/network/StoneTabletPacket.java | 35 +- .../StopCreativeShockEffectPacket.java | 14 +- .../network/StructureCorePacket.java | 14 +- .../minestuck/network/SummonerPacket.java | 14 +- .../minestuck/network/TitleSelectPacket.java | 14 +- .../network/TransportalizerPacket.java | 34 +- .../WirelessRedstoneTransmitterPacket.java | 14 +- .../network/computer/BurnDiskPacket.java | 14 +- .../network/computer/ClearMessagePacket.java | 16 +- .../CloseRemoteSburbConnectionPacket.java | 14 +- .../computer/CloseSburbConnectionPacket.java | 14 +- .../computer/ConnectToSburbServerPacket.java | 14 +- .../computer/OpenSburbServerPacket.java | 14 +- .../computer/ResumeSburbConnectionPacket.java | 14 +- .../network/computer/SkaianetInfoPacket.java | 50 +- .../network/computer/ThemeSelectPacket.java | 13 +- .../network/data/BoondollarDataPacket.java | 14 +- .../network/data/ColorDataPacket.java | 14 +- .../data/ConsortReputationDataPacket.java | 14 +- .../data/DataCheckerPermissionPacket.java | 14 +- .../network/data/EcheladderDataPacket.java | 14 +- .../data/EditmodeCacheLimitPacket.java | 14 +- .../network/data/EditmodeLocationsPacket.java | 20 +- .../network/data/GristCachePacket.java | 14 +- .../network/data/LandTypesDataPacket.java | 14 +- .../network/data/ModusDataPacket.java | 40 +- .../network/data/TitleDataPacket.java | 16 +- .../minestuck/player/ClientPlayerData.java | 6 +- .../mraof/minestuck/player/Echeladder.java | 8 +- .../mraof/minestuck/player/GristCache.java | 4 +- .../mraof/minestuck/player/PlayerData.java | 14 +- .../skaianet/DataCheckerManager.java | 4 +- .../mraof/minestuck/skaianet/InfoTracker.java | 14 +- .../minestuck/skaianet/SburbHandler.java | 2 +- .../minestuck/skaianet/SburbPlayerData.java | 4 +- .../skaianet/TitleSelectionHook.java | 4 +- .../skaianet/client/SkaiaClient.java | 4 +- .../minestuck/util/BoondollarPricing.java | 3 +- .../minestuck/util/DataCheckerPermission.java | 4 +- .../mraof/minestuck/util/MSCapabilities.java | 104 +- .../mraof/minestuck/util/WorldEventUtil.java | 2 +- .../minestuck/world/DynamicDimensions.java | 2 +- .../mraof/minestuck/world/MSDimensions.java | 6 +- .../gen/CustomizableNoiseChunkGenerator.java | 4 +- .../world/gen/feature/OasisFeature.java | 2 +- .../world/gen/feature/tree/EndTree.java | 21 - .../world/gen/feature/tree/FrostTree.java | 19 - .../world/gen/feature/tree/RainbowTree.java | 21 - .../world/gen/feature/tree/ShadewoodTree.java | 22 - .../feature/tree/aspect/BloodAspectTree.java | 19 - .../feature/tree/aspect/BreathAspectTree.java | 19 - .../feature/tree/aspect/DoomAspectTree.java | 19 - .../feature/tree/aspect/HeartAspectTree.java | 19 - .../feature/tree/aspect/HopeAspectTree.java | 19 - .../feature/tree/aspect/LifeAspectTree.java | 19 - .../feature/tree/aspect/LightAspectTree.java | 19 - .../feature/tree/aspect/MindAspectTree.java | 19 - .../feature/tree/aspect/RageAspectTree.java | 19 - .../feature/tree/aspect/SpaceAspectTree.java | 19 - .../feature/tree/aspect/TimeAspectTree.java | 19 - .../feature/tree/aspect/VoidAspectTree.java | 19 - src/main/resources/META-INF/mods.toml | 24 +- src/main/resources/pack.mcmeta | 2 +- 2039 files changed, 4602 insertions(+), 6819 deletions(-) rename src/main/generated/resources/data/minestuck/recipes/combinations/{dead_bush_from_grass.json => dead_bush_from_short_grass.json} (82%) rename src/main/generated/resources/data/minestuck/recipes/combinations/{grass_block_from_grass.json => grass_block_from_short_grass.json} (83%) rename src/main/generated/resources/data/minestuck/recipes/grist_costs/{grass.json => short_grass.json} (74%) delete mode 100644 src/main/java/com/mraof/minestuck/computer/editmode/EditToolsCapabilityProvider.java delete mode 100644 src/main/java/com/mraof/minestuck/inventory/musicplayer/MusicPlayerItemCapProvider.java delete mode 100644 src/main/java/com/mraof/minestuck/inventory/musicplayer/MusicPlayingCapabilityProvider.java delete mode 100644 src/main/java/com/mraof/minestuck/network/MSPacketHandler.java create mode 100644 src/main/java/com/mraof/minestuck/network/MSPayloads.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/EndTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/FrostTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/RainbowTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/ShadewoodTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/BloodAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/BreathAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/DoomAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/HeartAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/HopeAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/LifeAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/LightAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/MindAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/RageAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/SpaceAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/TimeAspectTree.java delete mode 100644 src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/VoidAspectTree.java diff --git a/build.gradle b/build.gradle index ce411c43a2..9c089808e9 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ repositories { } maven { // maven that contains infiniverse - url "https://cubicinterpolation.net/maven/" + url "https://commoble.net/maven/" } } @@ -90,12 +90,12 @@ dependencies { // http://dvs1.progwml6.com/files/maven compileOnly "mezz.jei:jei-${mc_version}-common-api:${mc_jei_version}" - compileOnly "mezz.jei:jei-${mc_version}-forge-api:${mc_jei_version}" - //runtimeOnly "mezz.jei:jei-${mc_version}-forge:${mc_jei_version}" + compileOnly "mezz.jei:jei-${mc_version}-neoforge-api:${mc_jei_version}" + runtimeOnly "mezz.jei:jei-${mc_version}-neoforge:${mc_jei_version}" compileOnly "com.refinedmods:refinedstorage:${mc_refined_storage_version}" implementation "software.bernie.geckolib:geckolib-${mc_gecko_version}" - compileOnly "commoble.infiniverse:${infiniverse_branch}:${infiniverse_version}" + implementation "net.commoble.infiniverse:${infiniverse_branch}:${infiniverse_version}" } sourceSets.main.resources { diff --git a/gradle.properties b/gradle.properties index e30e9e80d2..00b84fbf3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,20 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. org.gradle.daemon=false -mc_version=1.20.1 +mc_version=1.20.4 -mc_ms_version=1.20.2-1.12.0.1 +mc_ms_version=1.20.4-1.12.0.1 -neo_version=20.2.86 +neo_version=20.4.232 -neogradle.subsystems.parchment.minecraftVersion=1.20.2 -neogradle.subsystems.parchment.mappingsVersion=2023.12.10 +neogradle.subsystems.parchment.minecraftVersion=1.20.4 +neogradle.subsystems.parchment.mappingsVersion=2024.04.14 -mc_jei_version=15.2.0.22 +mc_jei_version=17.3.0.49 -mc_gecko_version=neoforge-1.20.2:4.3.1 +mc_gecko_version=neoforge-1.20.4:4.4.4 -mc_refined_storage_version=1.11.4 +mc_refined_storage_version=1.13.0-beta.4 -infiniverse_branch=infiniverse-1.20.1 -infiniverse_version=1.0.0.5 \ No newline at end of file +infiniverse_branch=infiniverse-1.20.4 +infiniverse_version=2.0.0.1 \ No newline at end of file diff --git a/src/main/generated/resources/assets/minestuck/lang/en_us.json b/src/main/generated/resources/assets/minestuck/lang/en_us.json index d494f9809d..4ea4bae7dc 100644 --- a/src/main/generated/resources/assets/minestuck/lang/en_us.json +++ b/src/main/generated/resources/assets/minestuck/lang/en_us.json @@ -538,8 +538,8 @@ "block.minestuck.horizontal_green_stone_bricks": "Horizontal Green Stone Bricks", "block.minestuck.horse_clock_bottom": "Horse Clock", "block.minestuck.horse_clock_center": "Horse Clock", + "block.minestuck.horse_clock_center.tooltip": "It is so majestic you want to weep", "block.minestuck.horse_clock_top": "Horse Clock", - "block.minestuck.horse_clock_top.tooltip": "It is so majestic you want to weep", "block.minestuck.hot_cake": "Really Hot Cake", "block.minestuck.hubtop": "Hubtop", "block.minestuck.igneous_spike": "Igneous Spike", diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/alchemy.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/alchemy.json index 4c7436b8ee..335a623fc7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/alchemy.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/alchemy.json @@ -6,16 +6,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.alchemy.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:captcha_card" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.alchemy.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/all_modi.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/all_modi.json index 770278568d..2fb32b1c97 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/all_modi.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/all_modi.json @@ -75,16 +75,13 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.all_modi.description" }, "frame": "goal", - "hidden": false, "icon": { "item": "minestuck:queuestack_modus_card" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.all_modi.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/big_one_mil.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/big_one_mil.json index 1176554122..bfc8f9b8b4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/big_one_mil.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/big_one_mil.json @@ -11,17 +11,14 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.big_one_mil.description" }, "frame": "goal", - "hidden": false, "icon": { "item": "minestuck:boondollars", "nbt": "{value:1000000}" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.big_one_mil.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/bugs.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/bugs.json index 309590eeb6..e97271d12d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/bugs.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/bugs.json @@ -53,16 +53,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.bugs.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:chocolate_beetle" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.bugs.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/buy_out_shop.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/buy_out_shop.json index 93e967579e..d873f8dd61 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/buy_out_shop.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/buy_out_shop.json @@ -6,16 +6,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.buy_out_shop.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:cone_of_flies" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.buy_out_shop.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/commune.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/commune.json index d5fd8aac51..eb58dd3125 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/commune.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/commune.json @@ -22,16 +22,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.commune.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:stone_tablet" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.commune.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/connect.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/connect.json index 2c5c0ce73b..cd6b3435ab 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/connect.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/connect.json @@ -6,16 +6,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.connect.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:client_disk" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.connect.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/double_digits.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/double_digits.json index 4f4cb9dd95..6199f417b2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/double_digits.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/double_digits.json @@ -11,17 +11,13 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.double_digits.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:boondollars", "nbt": "{value:100}" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.double_digits.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/dungeon.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/dungeon.json index 4a95939c18..596aaeb331 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/dungeon.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/dungeon.json @@ -19,16 +19,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.dungeon.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:frost_bricks" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.dungeon.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/entry.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/entry.json index 69030dbd50..6e47bbe991 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/entry.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/entry.json @@ -6,17 +6,13 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.entry.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:cruxite_apple", "nbt": "{color:10542335}" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.entry.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/first_step.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/first_step.json index 7c416404e5..0b1cd251dd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/first_step.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/first_step.json @@ -11,17 +11,13 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.first_step.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:boondollars", "nbt": "{value:1}" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.first_step.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/french_fry.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/french_fry.json index 50904aaf23..be79896e9f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/french_fry.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/french_fry.json @@ -13,16 +13,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.french_fry.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:french_fry" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.french_fry.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/gold_seeds.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/gold_seeds.json index 85da347821..324d46baf0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/gold_seeds.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/gold_seeds.json @@ -14,16 +14,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.gold_seeds.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:gold_seeds" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.gold_seeds.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/halfway_point.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/halfway_point.json index c7becdad53..a8fd9b2def 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/halfway_point.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/halfway_point.json @@ -11,17 +11,13 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.halfway_point.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:boondollars", "nbt": "{value:1000}" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.halfway_point.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/intellibeam.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/intellibeam.json index b2bcc74d0d..3d12e2feeb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/intellibeam.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/intellibeam.json @@ -6,16 +6,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.intellibeam.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:intellibeam_laserstation" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.intellibeam.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/kill_ogre.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/kill_ogre.json index 94e66adc0b..88930f8863 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/kill_ogre.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/kill_ogre.json @@ -17,17 +17,13 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.kill_ogre.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:pogo_hammer", "nbt": "{Damage:0}" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.kill_ogre.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/legendary_weapon.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/legendary_weapon.json index 11f359e40a..9a25cd8211 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/legendary_weapon.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/legendary_weapon.json @@ -13,17 +13,13 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.legendary_weapon.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:caledfwlch", "nbt": "{Damage:0}" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.legendary_weapon.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/long_time_coming.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/long_time_coming.json index ba58ed6021..fee1a2d054 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/long_time_coming.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/long_time_coming.json @@ -15,16 +15,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.long_time_coming.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:sburb_code" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.long_time_coming.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/melon_overload.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/melon_overload.json index 6a1609a631..1a5cddb24d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/melon_overload.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/melon_overload.json @@ -6,17 +6,14 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.melon_overload.description" }, - "frame": "task", "hidden": true, "icon": { "item": "minestuck:melonsbane", "nbt": "{Damage:0}" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.melon_overload.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/new_modus.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/new_modus.json index dfc92edc9f..e6fd543e1a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/new_modus.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/new_modus.json @@ -6,16 +6,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.new_modus.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:hashmap_modus_card" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.new_modus.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/return_node.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/return_node.json index 44c9ed090b..a204fe01f9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/return_node.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/return_node.json @@ -6,16 +6,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.return_node.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minecraft:red_bed" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.return_node.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/root.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/root.json index c5c7324a1d..1ef7619bd5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/root.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/root.json @@ -19,8 +19,6 @@ "description": { "translate": "advancements.minestuck.root.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:raw_cruxite" }, diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/searching.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/searching.json index ed452e10c2..0beb6eb0bf 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/searching.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/searching.json @@ -15,16 +15,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.searching.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minecraft:compass" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.searching.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/shady_buyer.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/shady_buyer.json index df0b61efe0..d6a79470c6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/shady_buyer.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/shady_buyer.json @@ -9,16 +9,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.shady_buyer.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:rock_cookie" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.shady_buyer.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/minestuck/tree_modus.json b/src/main/generated/resources/data/minestuck/advancements/minestuck/tree_modus.json index 12966d4d70..5358370221 100644 --- a/src/main/generated/resources/data/minestuck/advancements/minestuck/tree_modus.json +++ b/src/main/generated/resources/data/minestuck/advancements/minestuck/tree_modus.json @@ -11,16 +11,12 @@ } }, "display": { - "announce_to_chat": true, "description": { "translate": "advancements.minestuck.tree_modus.description" }, - "frame": "task", - "hidden": false, "icon": { "item": "minestuck:tree_modus_card" }, - "show_toast": true, "title": { "translate": "advancements.minestuck.tree_modus.title" } diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_slab.json index e31750761f..18093795bb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_slab_from_black_chess_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_slab_from_black_chess_bricks_stonecutting.json index 9fcabdb758..5ccd86d54f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_slab_from_black_chess_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_slab_from_black_chess_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_slab_from_black_chess_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_button.json index 40b1347fe6..3c72b719a7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_smooth_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_pressure_plate.json index e6d0114787..9c6fc6f2dc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_smooth_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_slab.json index 0df27503e9..eae7fac69f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_smooth_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_slab_from_stonecutting.json index fd7e9e4c95..0d472ee97a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_smooth_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_stairs.json index cfa6a16391..75ec871e0e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_smooth_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_stairs_from_stonecutting.json index 420bd97a05..448519e5aa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_smooth_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_wall.json index ca51354735..9ca6b8cf68 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_smooth_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_wall_from_stonecutting.json index 4b08f6fa9b..95eb8b88f8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_smooth_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_smooth_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_stairs.json index 80836fda8a..c229a57d85 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_stairs_from_black_chess_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_stairs_from_black_chess_bricks_stonecutting.json index b9c643fae5..9343f90bfd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_stairs_from_black_chess_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_stairs_from_black_chess_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_stairs_from_black_chess_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_wall.json index 9f1d3bf75c..a1cbda1a9b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_stairs_from_stonecutting.json index 98ddf70e7d..1175ce1ad2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_chess_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_chess_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_slab.json index d73f3aeec3..cf57426b56 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_cobblestone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_slab_from_stonecutting.json index ebc971f465..03b9ed4366 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_cobblestone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_stairs.json index 710c4bdd26..4ea9b10bea 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_cobblestone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_stairs_from_stonecutting.json index 2cac360f35..e52ae70848 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_cobblestone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_wall.json index 210ea51616..ea2794c371 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_cobblestone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_wall_from_stonecutting.json index 544bf97cd6..d97e191ce1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_cobblestone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_cobblestone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone.json index a152e333b6..7e9a8f8aac 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_slab.json index 7bfd0ebfd0..62f1aa99a5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_slab_from_black_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_slab_from_black_stone_bricks_stonecutting.json index 7dbdaf9849..0de2d6a823 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_slab_from_black_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_slab_from_black_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_brick_slab_from_black_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_stairs.json index 3ff1496a9e..82c99bfdfe 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_stairs_from_black_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_stairs_from_black_stone_bricks_stonecutting.json index 0892bd91c3..0ca214245d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_stairs_from_black_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_stairs_from_black_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_brick_stairs_from_black_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_wall.json index 7d40d52fb8..8b688ca051 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_wall_from_stonecutting.json index 9777e5d963..919617b719 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_bricks.json index bf5cb0d484..2ac6e51277 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_bricks_from_black_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_bricks_from_black_stone_stonecutting.json index 98ad5f2ab8..15ac5b2e36 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_bricks_from_black_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_bricks_from_black_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_bricks_from_black_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_button.json index 0de05f56c0..b010ed6080 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_column.json index 4d66944aad..8d14f77792 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_column_from_black_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_column_from_black_stone_bricks_stonecutting.json index 179ecafd07..016ff10d60 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_column_from_black_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_column_from_black_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_column_from_black_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_pressure_plate.json index 52974cb197..868aa85efc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_slab.json index ecfadd121a..08b78f6969 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_slab_from_black_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_slab_from_black_stone_stonecutting.json index 951d107aa9..0a27fa825e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_slab_from_black_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_slab_from_black_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_slab_from_black_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_stairs.json index 33f33a9541..259b80ab06 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_stairs_from_black_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_stairs_from_black_stone_stonecutting.json index 1df31a39ab..8358cb7d69 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_stairs_from_black_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_stairs_from_black_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_stairs_from_black_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_wall.json index 3576f00e02..366e0ca71c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_wall_from_stonecutting.json index e8e46be506..538d14b54c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/black_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:black_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_bookshelf.json index 87cdf348c2..2f0aa996e1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_button.json index d426ab39cf..17104f57e3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_carved_planks.json index e063c39c9b..4e363be64c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_door.json index 3da7216e76..237e5e2a21 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_fence.json index dd1b7ac56d..22f2581edf 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_fence_gate.json index 2a13c2a89d..d2fa280240 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks.json index 51fa228a6c..fe9c01bdce 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_stripped_log.json index 98d6192fe3..1aa22dec45 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_stripped_wood.json index 0e9e325f45..5d517955bb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_wood.json index 66d9a68f77..a12059eeb3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_pressure_plate.json index a42065c48a..66decd930f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_slab.json index bb7ab886e6..303e0d87a2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_stairs.json index b22531d6f0..00dfcd7861 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_stripped_wood.json index dea0e41b4c..f4d758cde0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_trapdoor.json index 354a46583c..0e241f73e0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_wood.json index a55308a4c0..5741de2458 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_slab.json index be593ab01b..59c9e362f7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_shade_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_slab_from_stonecutting.json index 50ca24e052..3754a0d98a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_shade_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_stairs.json index 05ae24d684..0069e63a74 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_shade_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_stairs_from_stonecutting.json index 7adfd7f5ee..8224cf69dd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_shade_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_wall.json index 0d270e139f..b9515c3d44 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_shade_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_wall_from_stonecutting.json index 68f3999a3d..4f4afe3bf9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_shade_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_bricks.json index e1fdcc10a5..40d0eab34b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/blood_shade_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_shade_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_bookshelf.json index 45143f5d81..719e42ae4f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_button.json index 14a83e77d0..b1ab1d166b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_carved_planks.json index 6f384493d7..83b1c226e7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_door.json index a1dfa1bc4b..c44886d5c4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_fence.json index c9be9a33a8..cb76fcd759 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_fence_gate.json index b2e43c79d8..fcb27c1ea6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks.json index 6e77694816..8c656217ba 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_stripped_log.json index 7d268fce82..46ffde6016 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_stripped_wood.json index ac3a30a283..c8a9a3d0c4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_wood.json index b81ff305b0..e253fbf318 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_pressure_plate.json index d3c2f93bb6..9e5c37c46c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_slab.json index ab8a47d6da..5882c7a807 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_stairs.json index aa651896e7..00f63cad5e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_stripped_wood.json index 0a0a57fc38..29015780cc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_trapdoor.json index 65aa0d3e37..f85c98acd7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_wood.json index 5eb542cf59..00ba9008c6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/breath_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_slab.json index a2d97dbf4e..0f2d4a3190 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_slab_from_brown_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_slab_from_brown_stone_bricks_stonecutting.json index 7b38b0e011..27695db8a0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_slab_from_brown_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_slab_from_brown_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_brick_slab_from_brown_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_stairs.json index 560af6f48d..e9f450c9f3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_stairs_from_brown_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_stairs_from_brown_stone_bricks_stonecutting.json index d7cac9e753..d597dc7cf9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_stairs_from_brown_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_stairs_from_brown_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_brick_stairs_from_brown_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_wall.json index 4d4ce53637..9d364a3a29 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_wall_from_stonecutting.json index f2e81fc8c5..5f64087c9f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks.json index 83e9db7b16..23d15bffcc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks_from_brown_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks_from_brown_stone_stonecutting.json index adfaf61cc2..86da980c76 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks_from_brown_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks_from_brown_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_bricks_from_brown_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks_from_polished_brown_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks_from_polished_brown_stone_stonecutting.json index 7b6bb1dcdc..fe5e3eb404 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks_from_polished_brown_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_bricks_from_polished_brown_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_bricks_from_polished_brown_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_button.json index d3be2ff2ea..baca7c25e4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_column.json index cc4ad1d3f5..96859542cf 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_column_from_brown_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_column_from_brown_stone_bricks_stonecutting.json index 22082389f6..482677e95a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_column_from_brown_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_column_from_brown_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_column_from_brown_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_pressure_plate.json index de3d09aa6e..cf51821270 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_slab.json index 01ac5085a2..93f7cf62c2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_slab_from_brown_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_slab_from_brown_stone_stonecutting.json index d6e62e5254..6ecda73572 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_slab_from_brown_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_slab_from_brown_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_slab_from_brown_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_stairs.json index b7901b1329..018f72f0bb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_stairs_from_brown_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_stairs_from_brown_stone_stonecutting.json index 5580b323f2..ccea3443aa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_stairs_from_brown_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_stairs_from_brown_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_stairs_from_brown_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_wall.json index 6c259ffe84..cc182215b1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_wall_from_stonecutting.json index 88cdbff57c..14f91cc125 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/brown_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:brown_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_bush_from_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_bush_from_uncarved_wood.json index b68314f897..aa150cbd1c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_bush_from_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_bush_from_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_bush_from_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_button.json index 0c64c8b528..e45b553122 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_door.json index cb4c6021c6..57083a8a33 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_fence.json index 8c1026c58b..7670ffebe5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_fence_gate.json index 8f348aa814..e43cf406a6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_plank_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_plank_slab.json index eda9deb61c..418ed25994 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_plank_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_plank_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_heavy_plank_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_plank_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_plank_stairs.json index b01fd2e9d2..e8af589f6d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_plank_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_plank_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_heavy_plank_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_planks_from_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_planks_from_uncarved_wood.json index 795b8f524a..81b4408f2e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_planks_from_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_heavy_planks_from_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_heavy_planks_from_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_knotted_wood_from_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_knotted_wood_from_uncarved_wood.json index 190161e7cc..cda3b9524f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_knotted_wood_from_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_knotted_wood_from_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_knotted_wood_from_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_log_from_lacquered_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_log_from_lacquered_uncarved_wood.json index 8f9fae15cd..139c1395e9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_log_from_lacquered_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_log_from_lacquered_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_log_from_lacquered_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_planks_from_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_planks_from_uncarved_wood.json index e8ed7c19e3..04de5964d3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_planks_from_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_planks_from_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_planks_from_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_pressure_plate.json index 24c4c629c5..3c739c011d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_slab.json index 04d0a385b0..5618711a34 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_stairs.json index 778a929749..61626c661e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_trapdoor.json index e2a96ffab4..2a503cd77e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_wooden_leaf_from_lacquered_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_wooden_leaf_from_lacquered_uncarved_wood.json index a8b77da2a5..e082ad91d8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_wooden_leaf_from_lacquered_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/carved_wooden_leaf_from_lacquered_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_wooden_leaf_from_lacquered_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_button.json index ee36169e1f..a25422fcb6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_frame_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_frame_from_stonecutting.json index 62421b7970..d9f6839021 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_frame_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_frame_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_frame_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_pressure_plate.json index 73f0899d7c..4fe3e29009 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_from_cast_iron_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_from_cast_iron_stonecutting.json index 040aa30e8a..1ee1c0b923 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_from_cast_iron_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_from_cast_iron_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_sheet_from_cast_iron_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_slab_from_stonecutting.json index bb3979bddb..b54d11734e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_sheet_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_stairs_from_cast_iron_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_stairs_from_cast_iron_stonecutting.json index 6709d78771..221993ad63 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_stairs_from_cast_iron_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_sheet_stairs_from_cast_iron_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_sheet_stairs_from_cast_iron_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_slab.json index 1a4871dc11..cfab362249 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_slab_from_stonecutting.json index 1fdf335d1c..75c03d801d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_stairs.json index 13e238137c..b481d19029 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_stairs_from_stonecutting.json index cd2a71ae57..aef48d7621 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile.json index 0ccda19752..8c693a0c02 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_tile" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_from_cast_iron_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_from_cast_iron_stonecutting.json index 877f06c02f..cc965f8ff4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_from_cast_iron_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_from_cast_iron_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_tile_from_cast_iron_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_slab.json index 6f4e03c3d7..1e1d4a04a4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_tile_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_slab_from_stonecutting.json index 39736b8721..d687ae8372 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_tile_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_stairs.json index a6a40a7538..b565fe4bc3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_tile_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_stairs_from_cast_iron_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_stairs_from_cast_iron_stonecutting.json index a11210cd97..3cf6d85173 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_stairs_from_cast_iron_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_tile_stairs_from_cast_iron_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_tile_stairs_from_cast_iron_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_wall.json index 155b988790..dd5e72a20b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_wall_from_stonecutting.json index 5c9d9007f1..4ede3c0fbb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cast_iron_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cast_iron_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_slab.json index 9fe7beb755..62d3dea7cd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_slab_from_chalk_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_slab_from_chalk_bricks_stonecutting.json index db44f35642..771acf38b2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_slab_from_chalk_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_slab_from_chalk_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_brick_slab_from_chalk_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_stairs.json index 51667c4b02..b55a8ee740 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_stairs_from_chalk_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_stairs_from_chalk_bricks_stonecutting.json index ee76fcd819..44065c7f00 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_stairs_from_chalk_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_stairs_from_chalk_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_brick_stairs_from_chalk_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_wall.json index 0a00b84786..d0d7141cda 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_wall_from_stonecutting.json index a9c220cd1c..13a77131ae 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks.json index d4f7554b4f..de235bacc3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks_from_chalk_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks_from_chalk_stonecutting.json index bd1634acb2..c150eb9013 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks_from_chalk_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks_from_chalk_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_bricks_from_chalk_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks_from_polished_chalk_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks_from_polished_chalk_stonecutting.json index cfbd54cce9..3b96d65108 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks_from_polished_chalk_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_bricks_from_polished_chalk_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_bricks_from_polished_chalk_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_button.json index fecd755e99..bb6564e4a3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_column.json index 68c6ff6868..1c382807f4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_column_from_chalk_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_column_from_chalk_bricks_stonecutting.json index b504d5710a..44f25837d7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_column_from_chalk_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_column_from_chalk_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_column_from_chalk_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_pressure_plate.json index 02b83f8839..8fb3d75329 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_slab.json index 9f615b6fd2..33a325d9c8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_slab_from_chalk_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_slab_from_chalk_stonecutting.json index f380ab3e0c..bf938c2686 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_slab_from_chalk_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_slab_from_chalk_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_slab_from_chalk_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_stairs.json index b0da21fa64..151f1e4c65 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_stairs_from_chalk_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_stairs_from_chalk_stonecutting.json index 9bd71e9433..8c0ea4e7c2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_stairs_from_chalk_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_stairs_from_chalk_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_stairs_from_chalk_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_wall.json index c1d3a69020..bc72f04243 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_wall_from_stonecutting.json index 0aa96005fc..200adec9c7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chalk_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chalk_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_button.json index ea68b6da60..06ad3925e9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chipboard_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_fence.json index efdff7aa9d..1100f18821 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chipboard_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_fence_gate.json index a618b5ebe8..dc9f5216d5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chipboard_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_pressure_plate.json index 62020c0614..ac9d79e5bc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chipboard_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_slab.json index a4c9db1ab8..44b2c7d3c9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chipboard_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_stairs.json index 09e101d750..e8c88521c6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chipboard_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chipboard_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_black_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_black_stone_bricks.json index d361106155..d61493f9fc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_black_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_black_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_black_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_black_stone_bricks_from_black_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_black_stone_bricks_from_black_stone_bricks_stonecutting.json index 1b1a65b3d7..b53400bc41 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_black_stone_bricks_from_black_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_black_stone_bricks_from_black_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_black_stone_bricks_from_black_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cast_iron_from_cast_iron_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cast_iron_from_cast_iron_stonecutting.json index f77bb87040..b585cf3125 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cast_iron_from_cast_iron_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cast_iron_from_cast_iron_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_cast_iron_from_cast_iron_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_chalk_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_chalk_bricks.json index 392cf5f71a..00311d1502 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_chalk_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_chalk_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_chalk_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_chalk_bricks_from_chalk_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_chalk_bricks_from_chalk_bricks_stonecutting.json index ce3f535d5b..e397a472e8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_chalk_bricks_from_chalk_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_chalk_bricks_from_chalk_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_chalk_bricks_from_chalk_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone.json index d91fb1b32c..48a755731a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_coarse_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_bricks.json index fef6b868d2..334d59e2d1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_coarse_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_bricks_from_coarse_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_bricks_from_coarse_stone_bricks_stonecutting.json index 18fa1d27d6..86f5500486 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_bricks_from_coarse_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_bricks_from_coarse_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_coarse_stone_bricks_from_coarse_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_from_coarse_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_from_coarse_stone_stonecutting.json index 2486f29963..3dbdae31db 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_from_coarse_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_coarse_stone_from_coarse_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_coarse_stone_from_coarse_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block.json index d45a732c71..495b3b2873 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_cruxite_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block_from_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block_from_bricks_stonecutting.json index 245cecec65..dec3a6a484 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block_from_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block_from_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_cruxite_block_from_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block_from_stonecutting.json index be91b68a9a..76e79f6728 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_cruxite_block_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_cruxite_block_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_bricks.json index f46617bc50..a3241a9a19 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_frost_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_bricks_from_frost_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_bricks_from_frost_bricks_stonecutting.json index fbd99426ef..943b993d52 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_bricks_from_frost_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_bricks_from_frost_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_frost_bricks_from_frost_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_tile.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_tile.json index 5c188bd7f5..cfea37351e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_tile.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_tile.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_frost_tile" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_tile_from_frost_tile_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_tile_from_frost_tile_stonecutting.json index c4743d4a73..883c22cf89 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_tile_from_frost_tile_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_frost_tile_from_frost_tile_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_frost_tile_from_frost_tile_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_green_stone_bricks_from_polished_green_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_green_stone_bricks_from_polished_green_stone_stonecutting.json index dc7fb3d393..8129b3f64a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_green_stone_bricks_from_polished_green_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_green_stone_bricks_from_polished_green_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_green_stone_bricks_from_polished_green_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_igneous_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_igneous_stone.json index 1d862d0679..cb3c5f29fc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_igneous_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_igneous_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_igneous_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_igneous_stone_from_polished_igneous_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_igneous_stone_from_polished_igneous_bricks_stonecutting.json index 661f48e9b1..90ca08f6af 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_igneous_stone_from_polished_igneous_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_igneous_stone_from_polished_igneous_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_igneous_stone_from_polished_igneous_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_mycelium_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_mycelium_bricks.json index 349cfd07e5..69b909cda4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_mycelium_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_mycelium_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_mycelium_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_mycelium_bricks_from_mycelium_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_mycelium_bricks_from_mycelium_bricks_stonecutting.json index 86854e1d8c..940970fc5f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_mycelium_bricks_from_mycelium_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_mycelium_bricks_from_mycelium_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_mycelium_bricks_from_mycelium_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_pink_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_pink_stone_bricks.json index 3cc0c7f6e4..9b6cca6a62 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_pink_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_pink_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_pink_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_pink_stone_bricks_from_pink_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_pink_stone_bricks_from_pink_stone_bricks_stonecutting.json index 67ed169bb4..0860456c78 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_pink_stone_bricks_from_pink_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_pink_stone_bricks_from_pink_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_pink_stone_bricks_from_pink_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_red_sandstone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_red_sandstone_column.json index a761f4e3ea..d6f4612677 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_red_sandstone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_red_sandstone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_red_sandstone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_sandstone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_sandstone_column.json index d27feb141a..64533fa3bc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_sandstone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_sandstone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_sandstone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_shade_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_shade_bricks.json index 13211a1deb..5a5b6c2647 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_shade_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_shade_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_shade_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_shade_bricks_from_shade_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_shade_bricks_from_shade_bricks_stonecutting.json index af9e1d11ae..bf2c8a0909 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_shade_bricks_from_shade_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/chiseled_shade_bricks_from_shade_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:chiseled_shade_bricks_from_shade_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_button.json index cfcf866912..b0980e98d3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_door.json index b1675ddbd0..f83389f915 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_fence.json index 75709ca6a5..69369f10f1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_fence_gate.json index f4f389ffdb..e9c8be80ba 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_planks.json index 5c3e3bd825..268d77d73e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_planks.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:cindered_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_pressure_plate.json index f0cfbadaa9..1719a60546 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_slab.json index 7a9e9e0910..79667ff5bd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_stairs.json index 10987180a6..db999a81c3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_trapdoor.json index e5558c50b5..73f5e2266a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_wood.json index 0e09b6d02e..e9ffb6def8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_slab.json index 4a0c66c361..2fb239d09e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_slab_from_coarse_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_slab_from_coarse_stone_bricks_stonecutting.json index c183ee5444..38fb06262f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_slab_from_coarse_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_slab_from_coarse_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_brick_slab_from_coarse_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_stairs.json index 8ea847602c..0403334bf9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_stairs_from_coarse_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_stairs_from_coarse_stone_bricks_stonecutting.json index bdbb085db0..e794d223ff 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_stairs_from_coarse_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_stairs_from_coarse_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_brick_stairs_from_coarse_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_wall.json index a9451f2b45..155adb7e0f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_wall_from_stonecutting.json index dd350ffc06..1e9574f460 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_bricks.json index f02f4152c0..557790187e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_bricks_from_coarse_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_bricks_from_coarse_stone_stonecutting.json index fbf9aa5308..9a2c436ba4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_bricks_from_coarse_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_bricks_from_coarse_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_bricks_from_coarse_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_button.json index c56959ebc1..8ef1d2ec13 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_column.json index 2d62a2f169..ef3f70d4fa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_column_from_coarse_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_column_from_coarse_stone_bricks_stonecutting.json index c95bbc6743..05b757bc4a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_column_from_coarse_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_column_from_coarse_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_column_from_coarse_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_pressure_plate.json index fdea4d88cf..79ecff095c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_slab.json index e359bc3928..10d2e09fb0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_slab_from_coarse_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_slab_from_coarse_stone_stonecutting.json index b1465349ce..744498a232 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_slab_from_coarse_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_slab_from_coarse_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_slab_from_coarse_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_stairs.json index 9b4dd1dc88..a8d96646a5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_stairs_from_coarse_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_stairs_from_coarse_stone_stonecutting.json index cd8ec01398..ba5a983bc6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_stairs_from_coarse_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_stairs_from_coarse_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_stairs_from_coarse_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_wall.json index 404bd79bf0..e827911c50 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_wall_from_stonecutting.json index 5aaf56e44f..1e2f6e6cff 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/coarse_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:coarse_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_black_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_black_stone_bricks.json index 4e4b6f81b2..f824ea0197 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_black_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_black_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cracked_black_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_brown_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_brown_stone_bricks.json index dfd8216ba3..f8875d600c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_brown_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_brown_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cracked_brown_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_coarse_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_coarse_stone_bricks.json index 538c084e27..bdbf20e044 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_coarse_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_coarse_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cracked_coarse_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_frost_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_frost_bricks.json index 42d9096bbd..f5f5dea573 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_frost_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_frost_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cracked_frost_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_mycelium_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_mycelium_bricks.json index b2c641921a..cd009a7833 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_mycelium_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_mycelium_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cracked_mycelium_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_pink_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_pink_stone_bricks.json index 055b425546..55aa3d335d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_pink_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_pink_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cracked_pink_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_polished_igneous_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_polished_igneous_bricks.json index 89b1dab1c7..1ac1e10d7f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_polished_igneous_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_polished_igneous_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cracked_polished_igneous_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_shade_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_shade_bricks.json index 753b996f0d..b74b77ff51 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_shade_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cracked_shade_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cracked_shade_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_block.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_block.json index 5f8b7c41d5..292456b927 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_block.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_block.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab.json index 0582aaae2f..beb8a5bd48 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:cruxite_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab_from_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab_from_bricks_stonecutting.json index efca30df12..d1415fef6d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab_from_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab_from_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_brick_slab_from_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab_from_stonecutting.json index b1196aecdc..c120484b84 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs.json index 8c5034f9b5..b2ab626309 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:cruxite_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs_from_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs_from_bricks_stonecutting.json index bdcff160c1..48b601c8a1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs_from_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs_from_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_brick_stairs_from_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs_from_stonecutting.json index 27f8fac416..d2e1fab7f3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall.json index 8ef1b03a86..8c9c2807a9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:cruxite_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall_from_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall_from_bricks_stonecutting.json index fe63613df7..46a2789758 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall_from_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall_from_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_brick_wall_from_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall_from_stonecutting.json index ee5c8f1b00..56feafe9df 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_bricks.json index b9a89eaa7e..bff0bc611f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_bricks_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_bricks_from_stonecutting.json index fb55d39c2a..c8a6fe99aa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_bricks_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_bricks_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_bricks_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_button.json index 6802bd8ef4..e363194971 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_button.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:cruxite_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_door.json index 5b91a6918e..9f2f135679 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_lamp.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_lamp.json index 29ed61f15e..95c50a3f33 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_lamp.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_lamp.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_lamp" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pillar.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pillar.json index 1ad27f4ac7..c3112d4317 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pillar.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pillar.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_pillar" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pillar_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pillar_from_stonecutting.json index 0d853a33c1..d9a4565ae7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pillar_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pillar_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_pillar_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pressure_plate.json index cff99493c1..35ad8bf5de 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_pressure_plate.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:cruxite_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_slab.json index 4929cb81cf..8909ecf459 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_slab.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:cruxite_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_slab_from_stonecutting.json index ea73b12821..79222f7253 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_stairs.json index 09ae114aee..ede82619fa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_stairs.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:cruxite_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_stairs_from_stonecutting.json index 08fe6cf914..1c498d1a97 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_trapdoor.json index 8d2d63353f..1d6a40c3ef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_wall.json index 552ac79154..b6948373ce 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_wall.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:cruxite_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_wall_from_stonecutting.json index 55331508d5..22fa8f3e6a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cruxite_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_slab.json index 94fcafc2a3..eb86302c93 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_slab_from_dark_gray_chess_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_slab_from_dark_gray_chess_bricks_stonecutting.json index a4e7f73a6b..604d10691d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_slab_from_dark_gray_chess_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_slab_from_dark_gray_chess_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_slab_from_dark_gray_chess_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_button.json index b662baa210..2e6652302f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_smooth_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_pressure_plate.json index ddbe1a79cf..217fe432e1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_smooth_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_slab.json index 2719d57be2..8716cb393d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_smooth_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_slab_from_stonecutting.json index f9f4c1a71e..85119e85b9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_smooth_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_stairs.json index bde77d2739..b87b92beeb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_smooth_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_stairs_from_stonecutting.json index 696ee10cd1..bcdffba964 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_smooth_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_wall.json index fcfbe2b818..ef0c5327a7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_smooth_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_wall_from_stonecutting.json index a7b5b09119..33f4610638 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_smooth_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_smooth_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_stairs.json index 2a96c23a34..b556eef1ea 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_stairs_from_dark_gray_chess_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_stairs_from_dark_gray_chess_bricks_stonecutting.json index 4f662f3377..7fff243ea5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_stairs_from_dark_gray_chess_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_stairs_from_dark_gray_chess_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_stairs_from_dark_gray_chess_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_wall.json index 72e096ace0..282f476b46 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_wall_from_stonecutting.json index 639b55106d..bed90128ab 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dark_gray_chess_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dark_gray_chess_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json index 20d0a8a2be..3a58b10071 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_button.json index 4eeb6dd46e..ab424b440c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_door.json index 857a57a22c..7e384999f0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_fence.json index 00567ed440..09ebbb1db9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_fence_gate.json index 1d66c8cb27..7a06f9af80 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks.json index 2115d19ac5..f2bc839a72 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:dead_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks_slab.json index 93c8a5c0f8..4e43c4a317 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_planks_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks_stairs.json index f18b7c40d9..b3099f6d5b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_planks_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_planks_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_pressure_plate.json index 868a275811..17c3e1165f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_trapdoor.json index 4a82da97f7..f30550a04e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_wood.json index 4ab3e194da..2a37c2bdfe 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/dead_wood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:dead_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_slab.json index 7290cf2180..6a68351bf0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:decrepit_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_slab_from_stonecutting.json index ce68315dfe..9569fa91c2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:decrepit_stone_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_stairs.json index 83346517bb..1a24ef87d0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:decrepit_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_stairs_from_stonecutting.json index 8bbf773bb4..1525aa1cf8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:decrepit_stone_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_wall.json index 5ac0cc131c..0e0a094639 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:decrepit_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_wall_from_stonecutting.json index 855b809549..6c6100d91e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:decrepit_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_bricks_from_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_bricks_from_stone_bricks_stonecutting.json index dc8048c87c..106a004746 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_bricks_from_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/decrepit_stone_bricks_from_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:decrepit_stone_bricks_from_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_bookshelf.json index c8762c9ea8..ec3966af5e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_button.json index 6374f263e4..64b9418654 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_carved_planks.json index acde3e4199..365832b141 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_door.json index c4877b2877..8d5071253a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_fence.json index 168abad65c..4fa59379b4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_fence_gate.json index 7a73180255..158506bb12 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks.json index 6965fd3324..c9eb947b7d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_stripped_log.json index 952f48562f..5e571f991a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_stripped_wood.json index dc2e5e83b2..4734ecf7cf 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_wood.json index 23d6cb2636..7080c69f7a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_pressure_plate.json index 6af8eebcfd..291de54e76 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_slab.json index 4d93edceba..b11b365477 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_stairs.json index 9862472046..cb1eab6440 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_stripped_wood.json index b39d180c2f..7861395663 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_trapdoor.json index 4b9834d9d5..5669641fb9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_wood.json index ab95932edf..dde0aa6ebe 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/doom_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json index 659e9346e0..865f96a372 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_button.json index 9a372f6215..96dc690dca 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_door.json index bed29c239c..220fd681a5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_fence.json index 06b0471dfa..529c3f1499 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_fence_gate.json index ddbab46e39..d676923ffc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks.json index 9f2325cfce..0d599c55b0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:end_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks_slab.json index 91b44b21a5..eedddf7d97 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_planks_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks_stairs.json index 577606978c..0bdcc5a893 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_planks_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_planks_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_pressure_plate.json index 11e4de414c..2c460de2ef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_trapdoor.json index f9668198c6..5d9e7d8173 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_wood.json index 7e48072eb8..e0c11c6dea 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/end_wood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:end_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_slab.json index 6263cb5186..53ad110f40 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_chalk_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_slab_from_stonecutting.json index 647793f25e..4ee8cc9513 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_chalk_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_stairs.json index e6df0d6259..7c567b7f14 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_chalk_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_stairs_from_stonecutting.json index 4cf836f0fc..4a79b378e3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_chalk_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_wall.json index 177f093019..a95809bc05 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_chalk_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_wall_from_stonecutting.json index 8ad077a515..47f903046d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_chalk_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_bricks.json index f7cc023365..c45089d9ce 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_chalk_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_chalk_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_slab.json index 38bf58a540..68a6a7e8ae 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_frost_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_slab_from_stonecutting.json index 06b313946a..707b00c75e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_frost_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_stairs.json index 0ddaa899a4..614270abf2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_frost_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_stairs_from_stonecutting.json index 3110a7f9f4..17c56c6c1a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_frost_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_wall.json index 204b779abb..83d98044a7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_frost_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_wall_from_stonecutting.json index 20f0553e38..b158b6d1b6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_frost_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_bricks.json index bff9c3d219..443909b4ad 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_frost_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_frost_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_slab.json index aede9351ce..281acd3c8e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_cobblestone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_slab_from_stonecutting.json index 641c97457e..cb238bdff1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_cobblestone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_stairs.json index ec2bc1c435..6c4783d996 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_cobblestone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_stairs_from_stonecutting.json index 8401a97c1b..74ccedd477 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_cobblestone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_wall.json index 861fd2890b..385ea99c0f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_cobblestone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_wall_from_stonecutting.json index 729a6e6a24..3ca3dc729c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_cobblestone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_cobblestone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_slab.json index 5f7cc93f4d..ccad05a32b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_stairs.json index a0464f293c..8250454aa9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_wall.json index 3825a4ba05..6d1d4cd998 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_bricks.json index ed65be7d52..30e547b45a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mossy_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mossy_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_slab.json index f56571be46..6120505082 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mycelium_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_slab_from_stonecutting.json index db4eae0277..30b7f2ab29 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mycelium_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_stairs.json index 9ca307fe7b..4696a22bf1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mycelium_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_stairs_from_stonecutting.json index 7c2cba4d2a..73db83eada 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mycelium_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_wall.json index 4d9df4f23c..e0a42fa839 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mycelium_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_wall_from_stonecutting.json index 26f4b35d95..c7a46b273c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mycelium_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_bricks.json index 506c004a72..fcc78f520b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_mycelium_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:flowery_mycelium_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_vine_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_vine_wood.json index 2b58fd21a7..a553c4f4d8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_vine_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/flowery_vine_wood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:flowery_vine_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/fragile_stone_from_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/fragile_stone_from_stone_stonecutting.json index 22b93b4949..518c505dc3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/fragile_stone_from_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/fragile_stone_from_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:fragile_stone_from_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json index 14f7142f7b..7cfca3f11f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_slab.json index d5a72fd713..4bc696d35c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_slab_from_frost_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_slab_from_frost_bricks_stonecutting.json index e7adeebab7..f1721b222b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_slab_from_frost_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_slab_from_frost_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_brick_slab_from_frost_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_stairs.json index 44759681e5..cd214a7eea 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_stairs_from_frost_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_stairs_from_frost_bricks_stonecutting.json index b4a45573e0..ec05d32d38 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_stairs_from_frost_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_stairs_from_frost_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_brick_stairs_from_frost_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_wall.json index 3d6c39a755..d6027eb4eb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_wall_from_stonecutting.json index 2e75763a06..c0ea1650eb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bricks.json index 757ae8dfe7..89ec241cb2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bricks_from_frost_tile_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bricks_from_frost_tile_stonecutting.json index eb397b854d..5383417e15 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bricks_from_frost_tile_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bricks_from_frost_tile_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_bricks_from_frost_tile_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_button.json index 4cb76097a6..dc09997886 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_column.json index e6baf1cf01..d16a102b40 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_column_from_frost_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_column_from_frost_bricks_stonecutting.json index a4d4396091..99b639ed43 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_column_from_frost_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_column_from_frost_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_column_from_frost_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_door.json index f47973b8d2..ea83bb971f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_fence.json index e8b6b6ffbf..05bf78a847 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_fence_gate.json index eebe8c55eb..6121395a0d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_planks.json index 06103f71fa..8c78da1f5b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_planks.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:frost_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_pressure_plate.json index 9b94b562b4..3fc165a378 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_slab.json index 15bbc63ab2..17177ee23b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_stairs.json index e4179ade2b..1bb8d3ca9e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_slab.json index 55d2fdd5dc..8e72a1ac80 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_tile_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_slab_from_frost_tile_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_slab_from_frost_tile_stonecutting.json index 74e8c5abe0..0771788261 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_slab_from_frost_tile_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_slab_from_frost_tile_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_tile_slab_from_frost_tile_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_stairs.json index f7fb106b91..1b5fb6e117 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_tile_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_stairs_from_frost_tile_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_stairs_from_frost_tile_stonecutting.json index ef8a631208..dbf298eea5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_stairs_from_frost_tile_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_stairs_from_frost_tile_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_tile_stairs_from_frost_tile_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_wall.json index e7ee136a3b..aef0e50bcc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_tile_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_wall_from_stonecutting.json index ecc6ac4ab4..009b8f8699 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_tile_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_tile_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_trapdoor.json index 5b0fb7c30e..dcf75bafab 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_wood.json index 6c087021b5..553f89a591 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/frost_wood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:frost_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_slab_from_stonecutting.json index db969e887b..0511638f78 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:generic_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_stairs_from_stonecutting.json index c6ae07726a..67f8d7a7d8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:generic_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_wall_from_stonecutting.json index 4abd8d4736..c4b6c1b72e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/generic_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:generic_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json index 63e89eec24..48ecc01b0f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_button.json index d43520fd79..b98ebf7b3f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_door.json index 048c867aec..05d348d8cd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_fence.json index f9fd6bf4cb..7ad7809d16 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_fence_gate.json index a7c136c834..a2bc558bf3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_planks.json index e9ff80dd46..d3c47cfa98 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_planks.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:glowing_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_pressure_plate.json index c9d01859e9..123c463f39 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_slab.json index 14216c1849..fc79ade12f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_stairs.json index 7ce24f8554..bbea50b2f1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_trapdoor.json index f6d33eb7f3..d537e4a922 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_wood.json index 7c80ef66d4..5e42a4954d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_wood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:glowing_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_embedded_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_embedded_ladder.json index 3a10859622..a6b473ec20 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_embedded_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_embedded_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_brick_embedded_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_slab.json index 06739e37d1..214dfd19e7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_slab_from_green_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_slab_from_green_stone_bricks_stonecutting.json index 6e4946b1e5..e4b6329961 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_slab_from_green_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_slab_from_green_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_brick_slab_from_green_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_stairs.json index fb9ecdfa26..eba08ba1bc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_stairs_from_green_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_stairs_from_green_stone_bricks_stonecutting.json index 7389cc7116..08e8037f8b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_stairs_from_green_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_stairs_from_green_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_brick_stairs_from_green_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_trim_from_green_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_trim_from_green_stone_bricks_stonecutting.json index 3712d807cc..f588b28f15 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_trim_from_green_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_trim_from_green_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_brick_trim_from_green_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_wall.json index d2fa6235f8..eba4dc5a1a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_wall_from_stonecutting.json index c18190b698..f1d27416df 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_bricks.json index 5f9eca9e8a..54489c4eb9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_bricks_from_polished_green_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_bricks_from_polished_green_stone_stonecutting.json index 93b1a332fb..438dfa1c1e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_bricks_from_polished_green_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_bricks_from_polished_green_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_bricks_from_polished_green_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_button.json index a063cd6f8f..5b2836cfc5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_column.json index 89afb39dc4..98d904d8e5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_column_from_green_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_column_from_green_stone_bricks_stonecutting.json index 46685ea63d..1e1648b116 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_column_from_green_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_column_from_green_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_column_from_green_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_pressure_plate.json index bfe3839a4c..c340726837 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_slab.json index c45bfce2a9..31db7774d5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_slab_from_green_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_slab_from_green_stone_stonecutting.json index 4acb1e2e13..12bf1c3e16 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_slab_from_green_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_slab_from_green_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_slab_from_green_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_stairs.json index 1a7fc7b867..927bdc1c50 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_stairs_from_green_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_stairs_from_green_stone_stonecutting.json index 5cb2c0b928..c5f3c90203 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_stairs_from_green_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_stairs_from_green_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_stairs_from_green_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_wall.json index a90981a0d1..0d37c37179 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_wall_from_stonecutting.json index 3fbd3b0907..40b518673f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/green_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:green_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_bookshelf.json index 2eee48d07f..16dd4fb919 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_button.json index eea0e98061..b66f013703 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_carved_planks.json index ce4e4dbd6c..b014f1392b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_door.json index f16cb00da7..d269a42746 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_fence.json index 96e39c0bb6..fa5fc82d88 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_fence_gate.json index 545dc2b3c7..a3989edec4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks.json index 5c6ce5cfc2..b2759c78db 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_stripped_log.json index 8abd583961..8a963693e4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_stripped_wood.json index ad7d753119..4453b10bcc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_wood.json index 0f012be981..aee6c619ea 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_pressure_plate.json index 921c3861b0..ebca8f31e3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_slab.json index 82e46dc04e..254d05b51a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_stairs.json index eb83d0aeb0..8def94540e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_stripped_wood.json index bf617d92f8..f7cfbf3b40 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_trapdoor.json index b420876a12..55be538e26 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_wood.json index 6c9f83ad44..ca0873469e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heart_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heat_lamp.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heat_lamp.json index 0b891506c3..4531ca5c5c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heat_lamp.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/heat_lamp.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heat_lamp" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_bookshelf.json index d91b914aee..cf24ee344c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_button.json index 03b6573962..46ebafce39 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_carved_planks.json index aa93c77378..20325ffcd1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_door.json index 9077fa2927..b034856b23 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_fence.json index f36bd1f337..1744d25f4a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_fence_gate.json index 9f54e8d2ca..ed85b03c53 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks.json index 2f2e320fe0..b50b7156b3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_stripped_log.json index d7ee349be1..8b3a062de7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_stripped_wood.json index 03f1168f6a..11fb322bc0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_wood.json index 59d45748cc..4fd14b99a0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_pressure_plate.json index d5b5d6b8c6..b6a30442b3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_slab.json index f30cc96ca3..c730789788 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_stairs.json index c7a6d6e974..e1ce47e8a6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_stripped_wood.json index 077887db2e..2bddc30f57 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_trapdoor.json index c8f278a427..5e6524d249 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_wood.json index f0f9349417..968738d6a2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/hope_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_slab.json index 81811dc23d..c18787850c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:horizontal_green_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_slab_from_stonecutting.json index 800c034660..09863de618 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:horizontal_green_stone_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_stairs.json index d548ccae84..4c3bc4a3a1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:horizontal_green_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_stairs_from_stonecutting.json index f54c11dede..4c52a28733 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:horizontal_green_stone_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_wall.json index 2bfab1c08a..53bb7304e2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:horizontal_green_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_wall_from_stonecutting.json index 73c619bae7..b5a08030e5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:horizontal_green_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_bricks.json index 0f787db579..fe4638edec 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:horizontal_green_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_bricks_from_polished_green_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_bricks_from_polished_green_stone_stonecutting.json index e60aeaca42..a16978f8d9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_bricks_from_polished_green_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/horizontal_green_stone_bricks_from_polished_green_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:horizontal_green_stone_bricks_from_polished_green_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_button.json index 9368d32a4c..17717b5e1e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:igneous_stone_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_pressure_plate.json index 69371a6330..649e042a32 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:igneous_stone_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_slab.json index 9c330965eb..99f363aa11 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:igneous_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_slab_from_igneous_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_slab_from_igneous_stone_stonecutting.json index abfcac5a2f..5e3bcd0d3a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_slab_from_igneous_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_slab_from_igneous_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:igneous_stone_slab_from_igneous_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_stairs.json index ef50fedbf7..8b669e85db 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:igneous_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_stairs_from_igneous_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_stairs_from_igneous_stone_stonecutting.json index 57825a2d99..a4ab825a23 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_stairs_from_igneous_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_stairs_from_igneous_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:igneous_stone_stairs_from_igneous_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_wall.json index 243cc694b5..9c9857295e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:igneous_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_wall_from_stonecutting.json index dfa6b8f102..fb1e57c802 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/igneous_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:igneous_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_button.json index 177788947a..7971e8c578 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_carved_knotted_wood_from_lacquered_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_carved_knotted_wood_from_lacquered_uncarved_wood.json index 9c1d94ef85..551d26f76d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_carved_knotted_wood_from_lacquered_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_carved_knotted_wood_from_lacquered_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_carved_knotted_wood_from_lacquered_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_button.json index e116636ec3..a5aa3ed5be 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_chipboard_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_fence.json index a88fc41aa5..2444a653ff 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_chipboard_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_fence_gate.json index c8745d4d82..16877f5887 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_chipboard_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_pressure_plate.json index bd1fc272a0..1d4a6eb75e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_chipboard_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_slab.json index 3001e2bb35..c57208c8af 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_chipboard_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_stairs.json index 27d8ed5102..25b11b82e2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_chipboard_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_chipboard_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_door.json index 55aca5a723..6466ce37ee 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_fence.json index c5a44d3f70..05043d16ff 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_fence_gate.json index 1559fcb400..f2442377d3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_plank_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_plank_slab.json index aef14b20fd..705de8a370 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_plank_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_plank_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_heavy_plank_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_plank_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_plank_stairs.json index 27f8c17f03..4ee6dfc4a2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_plank_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_plank_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_heavy_plank_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_planks_from_lacquered_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_planks_from_lacquered_uncarved_wood.json index 2f05238217..73870d8bd1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_planks_from_lacquered_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_heavy_planks_from_lacquered_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_heavy_planks_from_lacquered_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_planks_from_lacquered_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_planks_from_lacquered_uncarved_wood.json index c1721d91ac..0f3db7e02f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_planks_from_lacquered_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_planks_from_lacquered_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_planks_from_lacquered_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_pressure_plate.json index 4163c15766..a0d862908b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_slab.json index 1ce4c10e29..d4bbd744ef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_stairs.json index 3f6e07f6f1..31adb91298 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_trapdoor.json index 9f1687ff9f..7a056c5c4a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_button.json index b68b775fb3..4ca1a1731d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_uncarved_wood_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_fence.json index ada042899b..8e6f66cbb7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_uncarved_wood_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_fence_gate.json index 32b66f75d0..0c0da77ac3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_uncarved_wood_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_pressure_plate.json index bae56f3cb9..db264d22be 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_uncarved_wood_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_slab.json index 4ec7a1d35a..a18d3eb814 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_uncarved_wood_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_stairs.json index f47eeabe38..2e3619fe87 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/lacquered_uncarved_wood_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_uncarved_wood_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_bookshelf.json index 3e896c3ab2..b420a7f81e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_button.json index d4ca8ebd6e..68f1d2153e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_carved_planks.json index dcf18adff6..8df30c603c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_door.json index 9ad95302c7..e1f416852f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_fence.json index c04e67d934..8b1686a580 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_fence_gate.json index fbabbc6713..130bed9eba 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks.json index d33f0472a3..b1f3c94f75 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_stripped_log.json index 199f5d6ffe..5eecd710a9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_stripped_wood.json index 0d4dbf5587..9405191abd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_wood.json index 6dcde50c23..eebacf35a7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_pressure_plate.json index a768229513..416bc90e60 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_slab.json index 73e4d77be1..d2d8437e0e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_stairs.json index daa39bc862..ca0571f9fd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_stripped_wood.json index 6ab0080f4c..4ea454d292 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_trapdoor.json index 54d73db617..fcabee1c03 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_wood.json index 0baa40d924..e467ad950d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/life_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_bookshelf.json index dfd3591945..43e6ba3170 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_button.json index 8aaf87d3e5..0391454264 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_carved_planks.json index 937f8c558b..62e3a400ca 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_door.json index 02816488ec..730af8a0a5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_fence.json index 34baacf250..f907822735 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_fence_gate.json index 10035de66c..00ba07a09e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks.json index 2e04274877..af4ae4c39d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_stripped_log.json index b3541a7c7b..f76641f89b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_stripped_wood.json index 4d358e8e8b..59ab342538 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_wood.json index 42d9e9662c..1c7222d241 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_pressure_plate.json index f7a3e1c385..ca40f24e57 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_slab.json index 90c3dbc838..4ec5df6580 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_stairs.json index 3c77701184..096e9edf0a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_stripped_wood.json index 5c81095815..ed12123746 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_trapdoor.json index 973574bcaa..9f54c6785e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_wood.json index adf15d9cd3..a2bea848c8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_slab.json index b1373aec12..aab9badd08 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_slab_from_light_gray_chess_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_slab_from_light_gray_chess_bricks_stonecutting.json index ad8843f742..9f0749e43f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_slab_from_light_gray_chess_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_slab_from_light_gray_chess_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_slab_from_light_gray_chess_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_button.json index 6cdaee13df..b9a3be8034 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_smooth_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_pressure_plate.json index 698f21666e..e8810db0fd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_smooth_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_slab.json index 2db9472276..6bad242f29 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_smooth_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_slab_from_stonecutting.json index 0c1e92bea8..e70e453363 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_smooth_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_stairs.json index b477871341..8966248375 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_smooth_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_stairs_from_stonecutting.json index 8b5f0f7e6e..a6a4162f1d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_smooth_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_wall.json index 74815e4ad5..997ec9fda3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_smooth_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_wall_from_stonecutting.json index b37490e6a8..5e96ee96b2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_smooth_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_smooth_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_stairs.json index 8d29784370..4416e7402a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_stairs_from_light_gray_chess_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_stairs_from_light_gray_chess_bricks_stonecutting.json index d9965a0eea..de8832720a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_stairs_from_light_gray_chess_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_stairs_from_light_gray_chess_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_stairs_from_light_gray_chess_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_wall.json index 73453c1baa..c7c3e62c94 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_wall_from_stonecutting.json index f60713296d..fba8305c4e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/light_gray_chess_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_gray_chess_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_slab.json index 61e3acbce2..2ccde89d87 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_black_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_slab_from_magmatic_black_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_slab_from_magmatic_black_stone_bricks_stonecutting.json index 57fb4fc6e4..d314e3c793 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_slab_from_magmatic_black_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_slab_from_magmatic_black_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_black_stone_brick_slab_from_magmatic_black_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_stairs.json index 034be7886a..ca0dd4274f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_black_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_stairs_from_magmatic_black_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_stairs_from_magmatic_black_stone_bricks_stonecutting.json index 343ce93b58..44e7953663 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_stairs_from_magmatic_black_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_stairs_from_magmatic_black_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_black_stone_brick_stairs_from_magmatic_black_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_wall.json index c1c6417943..0c63c6a6df 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_black_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_wall_from_stonecutting.json index 091e9a5d10..93af2aa3c0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_black_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_bricks.json index 28875079b7..1cf247bacb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_black_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_black_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_slab.json index 2562ac8378..44d10f0316 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_polished_igneous_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_stairs.json index e002f084d4..4901b815e2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_polished_igneous_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_wall.json index eebd803834..55cf419227 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_polished_igneous_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_wall_from_stonecutting.json index 6b4dc3843a..3ac74fd879 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_polished_igneous_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_bricks.json index 1d4898b58a..1430e0b4a8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_polished_igneous_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_bricks_from_magma.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_bricks_from_magma.json index 70124a00b6..cb3fbdf906 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_bricks_from_magma.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/magmatic_polished_igneous_bricks_from_magma.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:magmatic_polished_igneous_bricks_from_magma" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_bookshelf.json index 4d6e8b8de7..f44593bb2b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_button.json index 2b2d75b71e..852e7b1f63 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_carved_planks.json index ea2e2cd318..ee1256350a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_door.json index bc056de9a0..412af830c5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_fence.json index 53cb2f8e23..146d5c3d40 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_fence_gate.json index 8ffe44413d..a8e17330b1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks.json index 399955e0de..f814f0feb0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_stripped_log.json index 7300cf56cb..ace08a1c9e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_stripped_wood.json index 7f37b13876..a46a6febaf 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_wood.json index 2bc8644ff4..9bfb7b72de 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_pressure_plate.json index eee222809a..cc1e263ef4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_slab.json index 1411c235f0..efada86b2c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_stairs.json index 17ac9850d0..52c5fe70df 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_stripped_wood.json index f2e8459444..f54e882800 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_trapdoor.json index d3534f11bf..bfddc0c76a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_wood.json index f6309f1c90..dfc30504a3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mind_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_slab.json index 24b87736af..d0b5b58fb6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_chalk_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_slab_from_stonecutting.json index ba6df685aa..bc91f2aa7f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_chalk_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_stairs.json index 00e87dccae..e602f54639 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_chalk_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_stairs_from_stonecutting.json index 5c3ff57280..9192117165 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_chalk_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_wall.json index 8064ffae6b..8ad28d0812 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_chalk_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_wall_from_stonecutting.json index 7f795684a4..2233f33a8a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_chalk_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_bricks.json index 38cfb09a69..4b8edb24fc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_chalk_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_chalk_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_coarse_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_coarse_stone_bricks.json index e4fb1ca1bf..b7832f277e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_coarse_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_coarse_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_coarse_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_slab.json index a6b05132a3..f4986a8d5b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_decrepit_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_slab_from_stonecutting.json index ca80ff6b45..c1490ef224 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_decrepit_stone_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_stairs.json index 6f5d7a86b5..047e76b8c0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_decrepit_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_stairs_from_stonecutting.json index 045f555410..4fbbcf573e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_decrepit_stone_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_wall.json index 9fbb84e9dd..20aed01842 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_decrepit_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_wall_from_stonecutting.json index e7b1000bae..1f50b2ebab 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_decrepit_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_bricks.json index 75fcb86579..3c9bae1bf5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_decrepit_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_decrepit_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_slab.json index e79ef369f2..0006a056ed 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_mycelium_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_slab_from_stonecutting.json index bf7a24ee34..9920340bb7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_mycelium_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_stairs.json index 83ae6d97d5..588adf031a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_mycelium_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_stairs_from_stonecutting.json index 4ecaf2e26e..5f891c3954 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_mycelium_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_wall.json index c66ba539b3..7ec8cc9be5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_mycelium_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_wall_from_stonecutting.json index 065f5f4c63..376316409b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_mycelium_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_bricks.json index 525da29365..c8f5fe83aa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_mycelium_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_mycelium_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_slab.json index d0904b4262..b701d82af7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_pink_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_slab_from_stonecutting.json index 68134548e3..700fa8557b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_pink_stone_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_stairs.json index 33ba71cddc..54f979351f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_pink_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_stairs_from_stonecutting.json index 413d40f9db..28fe1f35b9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_pink_stone_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_wall.json index 768b1f7f62..b35c53db89 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_pink_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_wall_from_stonecutting.json index e7e2b58e69..eaf759e3ca 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_pink_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_bricks.json index b8cba14208..278cecbac8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_pink_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_pink_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_slab.json index b46e44d674..eb939acfb7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_shade_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_slab_from_stonecutting.json index 7cf6283cef..980f72ff9f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_shade_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_stairs.json index 91fd214b95..88be212ebe 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_shade_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_stairs_from_stonecutting.json index 9cb9429d36..5c42dda179 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_shade_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_wall.json index f99713e8c2..518ad18e12 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_shade_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_wall_from_stonecutting.json index 1a55348a00..ce87acc84b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_shade_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_bricks.json index 9815036e17..b2b6730daa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mossy_shade_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mossy_shade_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_slab.json index eb1055df55..2dceb97866 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_slab_from_mycelium_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_slab_from_mycelium_bricks_stonecutting.json index 927db0886c..ab3bed0b99 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_slab_from_mycelium_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_slab_from_mycelium_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_brick_slab_from_mycelium_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_stairs.json index b1e4b9dacd..667d03b21a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_stairs_from_mycelium_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_stairs_from_mycelium_bricks_stonecutting.json index 9537dcffae..960bd83221 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_stairs_from_mycelium_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_stairs_from_mycelium_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_brick_stairs_from_mycelium_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_wall.json index 175ad88d98..cdc4030973 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_wall_from_stonecutting.json index f15d065804..4305398b1d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_bricks.json index 9b57452d59..cf8268aad1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_bricks_from_mycelium_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_bricks_from_mycelium_stone_stonecutting.json index ace7caa2aa..105f734014 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_bricks_from_mycelium_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_bricks_from_mycelium_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_bricks_from_mycelium_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_slab.json index 0a67d2f14f..dde3911416 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_cobblestone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_slab_from_stonecutting.json index 91c2ee7b45..6ef406f009 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_cobblestone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_stairs.json index e744c52111..1b8829a4c3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_cobblestone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_stairs_from_stonecutting.json index 36e5e1e2a0..167080a89c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_cobblestone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_wall.json index 22b58884fb..e4045df290 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_cobblestone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_wall_from_stonecutting.json index c9db8322b7..c6160b7ec3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_cobblestone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_cobblestone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_column.json index 3de4570450..9c9494999b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_column_from_mycelium_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_column_from_mycelium_bricks_stonecutting.json index d5d656e618..c41f6c93e4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_column_from_mycelium_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_column_from_mycelium_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_column_from_mycelium_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_slab.json index cceb7fc26b..e4464193c5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_slab_from_mycelium_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_slab_from_mycelium_stone_stonecutting.json index cd99910cd9..588831f84d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_slab_from_mycelium_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_slab_from_mycelium_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_slab_from_mycelium_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stairs.json index 8a449381be..83b2f7fbed 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stairs_from_mycelium_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stairs_from_mycelium_stone_stonecutting.json index 4722bb01ac..16840b475e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stairs_from_mycelium_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stairs_from_mycelium_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_stairs_from_mycelium_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone.json index bf1450e0a2..f3e87cc7a8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_button.json index 889fcf6ec8..e5e03c421a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_stone_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_pressure_plate.json index 618f011179..4558499d56 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_stone_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_wall.json index 8d7f0eed25..708fc5c088 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_wall_from_stonecutting.json index 6473940fc9..336d5f85fb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/mycelium_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mycelium_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_button.json index 1bd8c41a5a..15fa58e2ed 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_door.json index 4857eae345..799375c103 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_fence.json index fcdc0e8b5b..1713510037 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_fence_gate.json index 80a5e6e136..c311a4c3f5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_pressure_plate.json index 2638cab551..2937d44b39 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_slab.json index e8590d7f4a..950f38b8f8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_stairs.json index 2fb0510e31..aaa9d84342 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_trapdoor.json index 3fd7bc59ee..df9e7bd826 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_wall.json index 10909f1d7e..df6a069dec 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/perfectly_generic_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/petrified_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/petrified_wood.json index 82cd91bb1f..227af3e92f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/petrified_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/petrified_wood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:petrified_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_slab.json index d18fd8760f..d12ec5c711 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_slab_from_pink_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_slab_from_pink_stone_bricks_stonecutting.json index 64f7d16ad7..30c3726555 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_slab_from_pink_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_slab_from_pink_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_brick_slab_from_pink_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_stairs.json index 608e13d0c7..fa18527362 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_stairs_from_pink_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_stairs_from_pink_stone_bricks_stonecutting.json index 15368a49ba..4d8d47b9ae 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_stairs_from_pink_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_stairs_from_pink_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_brick_stairs_from_pink_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_wall.json index 6aeee6253b..8c03bca17a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_wall_from_stonecutting.json index 5d82d5ac59..ff1f20ed8f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_bricks.json index fc77d05d6b..698875c211 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_bricks_from_pink_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_bricks_from_pink_stone_stonecutting.json index ae5dde5c33..bb702b4388 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_bricks_from_pink_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_bricks_from_pink_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_bricks_from_pink_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_button.json index b78b3efa53..fb65d3e4af 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_column.json index 5035e342aa..d1c963a1a6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_column_from_pink_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_column_from_pink_stone_bricks_stonecutting.json index f60c1039f4..074c7d2ad3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_column_from_pink_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_column_from_pink_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_column_from_pink_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_pressure_plate.json index d2d0253661..3f16562a6f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_slab.json index d675865298..007acfd058 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_slab_from_pink_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_slab_from_pink_stone_stonecutting.json index d0b0ee77c0..42e839c317 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_slab_from_pink_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_slab_from_pink_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_slab_from_pink_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_stairs.json index 6effe65065..6cc2a6466e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_stairs_from_pink_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_stairs_from_pink_stone_stonecutting.json index 21ee3e22df..06677796f1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_stairs_from_pink_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_stairs_from_pink_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_stairs_from_pink_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_wall.json index 6334344704..ef80d5877f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_wall_from_stonecutting.json index e38581c5d9..bdc48ff309 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pink_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pink_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone.json index 833b570cc7..8cc330827e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_black_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_slab.json index 02ff6767ad..e6457376b6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_black_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_slab_from_stonecutting.json index 0c47fc8781..628be3c3ae 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_black_stone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_stairs.json index dc9c993e1b..69d20431e5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_black_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_stairs_from_stonecutting.json index 9a0be6ce80..6acf019966 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_black_stone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_wall.json index a2e326e76e..968865f3a5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_black_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_wall_from_stonecutting.json index f235d81bfa..984b4a5f69 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_black_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_black_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone.json index 0b85e4debf..cd9cfe6c36 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_brown_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_slab.json index 5631f5af71..e7c4c3bf70 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_brown_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_slab_from_stonecutting.json index 63234d2261..b6fb59155e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_brown_stone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_stairs.json index 159497800b..3af788b9d3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_brown_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_stairs_from_stonecutting.json index 655eff0c7d..dfa6649070 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_brown_stone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_wall.json index 5980402156..578ac75e01 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_brown_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_wall_from_stonecutting.json index 7a8f3e6b37..f5371ed562 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_brown_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_brown_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk.json index 968a8c02e6..fa9d392ce2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_chalk" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_from_chalk_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_from_chalk_stonecutting.json index 9c405e603c..d384add158 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_from_chalk_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_from_chalk_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_chalk_from_chalk_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_slab.json index a993325768..0f6f0a1671 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_chalk_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_slab_from_stonecutting.json index 01b6db15ff..fb92ae3c9f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_chalk_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_stairs.json index 5e3053f280..f7167c0574 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_chalk_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_stairs_from_stonecutting.json index c34d731e77..493d054bba 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_chalk_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_wall.json index d4b834a911..04b10c4e14 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_chalk_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_wall_from_stonecutting.json index 34e66e85ae..7dd1d52fa0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_chalk_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_chalk_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_block.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_block.json index a5eeafc7a2..5aa49cadd4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_block.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_block.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_cruxite_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_block_from_smooth_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_block_from_smooth_stonecutting.json index 4a9d59748b..a13f2911a1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_block_from_smooth_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_block_from_smooth_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_cruxite_block_from_smooth_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab.json index 052dff529f..3314aa5466 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:polished_cruxite_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab_from_smooth_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab_from_smooth_stonecutting.json index 76587a821d..6f581b4869 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab_from_smooth_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab_from_smooth_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_cruxite_slab_from_smooth_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab_from_stonecutting.json index 55b7bd90d7..d7133ab201 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_cruxite_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs.json index b395bde1d5..41a21e0dcd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:polished_cruxite_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs_from_smooth_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs_from_smooth_stonecutting.json index c9c2b08e50..907f31d073 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs_from_smooth_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs_from_smooth_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_cruxite_stairs_from_smooth_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs_from_stonecutting.json index 4a8e4ef8b9..ddac08c826 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_cruxite_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall.json index 2f9c733e44..cf8a066177 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:polished_cruxite_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall_from_smooth_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall_from_smooth_stonecutting.json index f4d6a5134d..28c9ae035a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall_from_smooth_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall_from_smooth_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_cruxite_wall_from_smooth_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall_from_stonecutting.json index b11fc29019..f17a872aa0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_cruxite_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_cruxite_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone.json index 32da572e19..90c7bf7793 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_green_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_from_green_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_from_green_stone_stonecutting.json index e85a565587..050d98bea3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_from_green_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_from_green_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_green_stone_from_green_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_slab.json index 853613b350..bd5f9518e7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_green_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_slab_from_stonecutting.json index e4f73c61ca..91b1cbb3ef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_green_stone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_stairs.json index 9bb0ac7483..06a84ada27 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_green_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_stairs_from_stonecutting.json index 75bc2cde9c..26d89dd0b6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_green_stone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_wall.json index eec2ce08df..f64a7111f4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_green_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_wall_from_stonecutting.json index 7f94ff14db..b0d5facc42 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_green_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_green_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_slab.json index eeabe786c8..3e9db41ad6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_slab_from_polished_igneous_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_slab_from_polished_igneous_bricks_stonecutting.json index 6384bc0fdf..f9fa34b6a2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_slab_from_polished_igneous_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_slab_from_polished_igneous_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_brick_slab_from_polished_igneous_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_stairs.json index 2f04b4a4f4..9f7e91a518 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_stairs_from_polished_igneous_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_stairs_from_polished_igneous_bricks_stonecutting.json index 579529efd4..62f50c6943 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_stairs_from_polished_igneous_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_stairs_from_polished_igneous_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_brick_stairs_from_polished_igneous_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_wall.json index d98e00d031..274a920ce1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_wall_from_stonecutting.json index 74bfebebb6..a9b27f9dcb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_bricks.json index 8dab3e8002..71de98ca3c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_bricks_from_igneous_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_bricks_from_igneous_stone_stonecutting.json index 6c5ec5501b..0c1ed3ba3e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_bricks_from_igneous_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_bricks_from_igneous_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_bricks_from_igneous_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_pillar.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_pillar.json index 9a251d7049..ea70fd18d9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_pillar.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_pillar.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_pillar" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_pillar_from_polished_igneous_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_pillar_from_polished_igneous_bricks_stonecutting.json index 5e14d3f969..4bcb5b66da 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_pillar_from_polished_igneous_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_pillar_from_polished_igneous_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_pillar_from_polished_igneous_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_slab_from_stonecutting.json index 697d584083..31c25c7cb4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stairs_from_stonecutting.json index b2f7bbbc2a..aee28993d7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone.json index e22577c027..c29f931c3f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_slab.json index 6e955fdaff..ccaadf96dd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_stairs.json index 95cbd29a3e..6c2e2d406d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_wall.json index ce5dd35482..2cbf1b2712 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_wall_from_stonecutting.json index ef7aa86f1b..bae5152f1b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_igneous_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_igneous_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_slab.json index f15000e3be..f2e2ad33b8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_lacquered_uncarved_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_stairs.json index 9f2fb8c8d4..7059aef99f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_lacquered_uncarved_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_wood_from_lacquered_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_wood_from_lacquered_uncarved_wood.json index 87ccfcd873..385ad8ebef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_wood_from_lacquered_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_lacquered_uncarved_wood_from_lacquered_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_lacquered_uncarved_wood_from_lacquered_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone.json index f9b6bd3fa1..f5f7ad6c10 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_mycelium_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_slab.json index 18966ccfa3..aaaf27fcb4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_mycelium_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_slab_from_stonecutting.json index ba69022f25..ba1d8b496e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_mycelium_stone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_stairs.json index 54febb7f27..1da062d45c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_mycelium_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_stairs_from_stonecutting.json index 3f09bd6c84..8664f0213d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_mycelium_stone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_wall.json index 06199996b6..62cf052f3c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_mycelium_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_wall_from_stonecutting.json index a088fd1522..9ec9f40762 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_mycelium_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_mycelium_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone.json index 2bdc8ba026..2dc356aeee 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_pink_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_slab.json index 392deb9783..fb99e474bb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_pink_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_slab_from_stonecutting.json index 84feb2c72f..cd7fd4a5bc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_pink_stone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_stairs.json index 0af5145784..d5715e5eda 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_pink_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_stairs_from_stonecutting.json index 93ad7efba6..c101608221 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_pink_stone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_wall.json index f357b0f546..9a52fc9da5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_pink_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_wall_from_stonecutting.json index 9b87ff217f..461ad90324 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_pink_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_pink_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_slab.json index f8f19496d5..fc04e1097a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_treated_uncarved_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_stairs.json index e54866633d..8fe62bf479 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_treated_uncarved_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_wood_from_treated_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_wood_from_treated_uncarved_wood.json index c63dc117ea..be3c319e8a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_wood_from_treated_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_treated_uncarved_wood_from_treated_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_treated_uncarved_wood_from_treated_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_slab.json index e056936eca..5c7ffa1f80 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_uncarved_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_stairs.json index d384cae139..ad420c4e88 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_uncarved_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_wood_from_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_wood_from_uncarved_wood.json index 6873ec0616..a79782df79 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_wood_from_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/polished_uncarved_wood_from_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:polished_uncarved_wood_from_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_slab.json index 2d667a332d..7ae14fc29c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_slab_from_stonecutting.json index f85849ce89..4e046b188a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_stairs.json index 268878fab1..91d90aec1d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_stairs_from_stonecutting.json index c35ab6a916..bf0fc5b9bd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_wall.json index 1e79b941b0..c18f226730 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_wall_from_stonecutting.json index 2d553a953a..5f550d870f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_bricks.json index 665e18e661..55561e3243 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_button.json index 604dd95977..fa71effeb8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_stone_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_pressure_plate.json index 18de73b474..8e204d1431 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_stone_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_slab.json index 9b8689771d..d9cbf3b31d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_slab_from_stonecutting.json index 7357f98160..1ddf6c4aba 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_stone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_stairs.json index 1def6b7ffb..fbe5302eba 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_stairs_from_stonecutting.json index e8b0224915..c5be4d458b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_stone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_wall.json index c74ffde174..aed1d08255 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_wall_from_stonecutting.json index a3467db176..bb626c82e2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_slab.json index cbe4d3fba8..b258665098 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_tile_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_slab_from_stonecutting.json index 6401c65ef0..9e0f6d534a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_tile_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_stairs.json index 522711cb3f..397c0d2627 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_tile_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_stairs_from_stonecutting.json index 952ed72caf..ed826891aa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_tile_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_wall.json index 133a968967..7d5e952058 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_tile_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_wall_from_stonecutting.json index 8d5884aae4..80c2c371f6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tile_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_tile_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tiles.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tiles.json index ec5110eeba..60b4df726e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tiles.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pumice_tiles.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pumice_tiles" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pushable_block_from_stone_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pushable_block_from_stone_bricks_stonecutting.json index d4eb6ef900..f4b3ff4bf6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pushable_block_from_stone_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/pushable_block_from_stone_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:pushable_block_from_stone_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_bookshelf.json index f4ccb577db..e391cc11d3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_button.json index 40dccd6c34..461b06b292 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_carved_planks.json index d05d516207..0a2e0969b3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_door.json index 0bfb8a775f..dcaf106a98 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_fence.json index a54717eef5..f398ac407a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_fence_gate.json index a7ab2ef31c..2f6a7c72c4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks.json index 7547365eea..59708c6c3e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_stripped_log.json index 78bfe7675c..ceb5a8f1b6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_stripped_wood.json index 9ce041f240..c5b1d7a5a7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_wood.json index df6cfedab4..14924b09ec 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_pressure_plate.json index 0ae6c7fabc..5192fa3446 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_slab.json index ab26868299..2a5a59b2d1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_stairs.json index c593a9e093..c721d30dbe 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_stripped_wood.json index 2f27a3d4fa..2f9659fd7d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_trapdoor.json index c24bc67d6f..f2e7804ce5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_wood.json index 7b76113b30..51933f5ee3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rage_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json index bb40f48724..3837897748 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_button.json index 2463b46fd7..46acae3d8d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_door.json index ed6b81b138..77e292b92f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_fence.json index 277e4a73f9..d303554451 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_fence_gate.json index 0b738ac83b..55bbf10ba5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks.json index 64c5e69d4c..6119fbcfd1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:rainbow_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks_slab.json index ddc917d0ff..72c6708cbb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_planks_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks_stairs.json index cd205bdefd..ef0fd9cd77 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_planks_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_planks_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_pressure_plate.json index a1d51d990a..78bb57bff4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_trapdoor.json index d4daf50811..37b8185319 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_wood.json index a8b682f05c..b1649bf64c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_wood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:rainbow_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/red_sandstone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/red_sandstone_column.json index a05b3c8f69..abaf3d08bb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/red_sandstone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/red_sandstone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:red_sandstone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rotted_shadewood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rotted_shadewood.json index cb0d1dfced..666a7c2404 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rotted_shadewood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/rotted_shadewood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:rotted_shadewood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/sandstone_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/sandstone_column.json index 114727563a..389dc830f6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/sandstone_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/sandstone_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:sandstone_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/scarred_shadewood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/scarred_shadewood.json index 6268406436..fea532465e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/scarred_shadewood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/scarred_shadewood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:scarred_shadewood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_slab.json index d18acd5a2f..1d0e660877 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_slab_from_shade_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_slab_from_shade_bricks_stonecutting.json index aaa2fe4339..8bf131dbaf 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_slab_from_shade_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_slab_from_shade_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_brick_slab_from_shade_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_stairs.json index 3db5bc3596..804885c1cf 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_stairs_from_shade_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_stairs_from_shade_bricks_stonecutting.json index 26a5b5e853..6cef50c715 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_stairs_from_shade_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_stairs_from_shade_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_brick_stairs_from_shade_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_wall.json index 71e2f12ba0..b688f2cc38 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_wall_from_stonecutting.json index 208d70771c..b2188c92fa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_bricks.json index 5a2d14d885..5dce36000a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_bricks_from_shade_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_bricks_from_shade_stone_stonecutting.json index 0f5c0ccae8..3fd8be8bf2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_bricks_from_shade_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_bricks_from_shade_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_bricks_from_shade_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_button.json index 6eff63726a..9d6d208737 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_column.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_column.json index fb0bb565f6..afd28c85eb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_column.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_column.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_column" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_column_from_shade_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_column_from_shade_bricks_stonecutting.json index 124df807a9..7145ff2a71 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_column_from_shade_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_column_from_shade_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_column_from_shade_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_pressure_plate.json index d9b77d3b61..c413b3f114 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_slab.json index f4207cd51c..a93dc7f94f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_slab_from_shade_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_slab_from_shade_stone_stonecutting.json index 5d421778bd..755c440a27 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_slab_from_shade_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_slab_from_shade_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_slab_from_shade_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_stairs.json index 6f19a38222..8b197244c0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_stairs_from_shade_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_stairs_from_shade_stone_stonecutting.json index 75f9c3a39c..1f582588b0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_stairs_from_shade_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_stairs_from_shade_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_stairs_from_shade_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_wall.json index e84f4c0db3..e05f254c63 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_wall_from_stonecutting.json index 0a90764bcc..8a48981fe0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shade_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shade_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood.json index 2aad092466..6e588dd8f7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:shadewood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_button.json index 1ed44b1236..618d937a4f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_door.json index cf2b2221c5..1acf293cc3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_fence.json index 323e1c8972..75e40d5001 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_fence_gate.json index b2e517bd4e..74bdc16d3d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_planks.json index 4396e9a533..3995e5c149 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_planks.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:shadewood_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_pressure_plate.json index 4f4f0db4a8..dd1fd274d6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_slab.json index a49e771dd4..4d87266124 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_stairs.json index c0404038e2..6c53c95d59 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_trapdoor.json index bbb8d2b2e8..e3cddee811 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_cruxite_block.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_cruxite_block.json index 6f08716bdd..534465b36d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_cruxite_block.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_cruxite_block.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:smooth_cruxite_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone.json index 86563bc468..09b2cb37f8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:smooth_shade_stone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_slab.json index 2478ef8cd4..2b93468741 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:smooth_shade_stone_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_slab_from_stonecutting.json index 9dbcef40d6..de7925f6a9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:smooth_shade_stone_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_stairs.json index 09b1132f74..920917e017 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:smooth_shade_stone_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_stairs_from_stonecutting.json index 0e67a83cbc..1f2eda2368 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:smooth_shade_stone_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_wall.json index 976614594a..0fd75e4acb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:smooth_shade_stone_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_wall_from_stonecutting.json index a57bb10aa5..9867a1c7cc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/smooth_shade_stone_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:smooth_shade_stone_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_bookshelf.json index bc67fd33ad..ba794af5ed 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_button.json index 32341ad336..4303378f46 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_carved_planks.json index 245462fad5..e8c99a179d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_door.json index ea0ed592b2..b10a72c95f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_fence.json index ce48127a5c..99c99afba7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_fence_gate.json index 64f3f22e12..77009566e1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks.json index 6c743403d1..8464bcbab5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_stripped_log.json index 5b0a3ac4b0..68bdb13d50 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_stripped_wood.json index 8289c12196..e3555e06b1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_wood.json index fd2fd67f83..e01d8a273f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_pressure_plate.json index cfc77d0bec..c473a7d1f4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_slab.json index 6b1760cd40..3543a7ab48 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_stairs.json index 049c19776f..b754294991 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_stripped_wood.json index 092fb7d549..6fb23d2fc4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_trapdoor.json index 48ecc768c7..ec4716da97 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_wood.json index d312d41065..cb1ef0efbd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/space_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/steep_green_stone_brick_stairs_base.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/steep_green_stone_brick_stairs_base.json index 0afd85f1eb..a2d0890c27 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/steep_green_stone_brick_stairs_base.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/steep_green_stone_brick_stairs_base.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:steep_green_stone_brick_stairs_base" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/steep_green_stone_brick_stairs_top.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/steep_green_stone_brick_stairs_top.json index ea97ba7d69..d544662503 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/steep_green_stone_brick_stairs_top.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/steep_green_stone_brick_stairs_top.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:steep_green_stone_brick_stairs_top" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/strawberry.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/strawberry.json index d4d333ef08..3a6d59489a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/strawberry.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/strawberry.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:strawberry" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_rotted_shadewood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_rotted_shadewood.json index bb95e7f0a7..75a7f4025f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_rotted_shadewood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_rotted_shadewood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:stripped_rotted_shadewood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_scarred_shadewood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_scarred_shadewood.json index e732527162..eb8d1217a1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_scarred_shadewood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_scarred_shadewood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:stripped_scarred_shadewood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_shadewood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_shadewood.json index 5a3852145e..bcbab31ce7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_shadewood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/stripped_shadewood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:stripped_shadewood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/sugar_cube.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/sugar_cube.json index b30e0fd867..0a6338864d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/sugar_cube.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/sugar_cube.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:sugar_cube" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_slab.json index 5df53296a7..b1a85224ef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:tar_shade_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_slab_from_stonecutting.json index 3ca77eba59..29698c0e38 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:tar_shade_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_stairs.json index c027a39b71..ca8d8fb32f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:tar_shade_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_stairs_from_stonecutting.json index ab512711ff..ebd470325a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:tar_shade_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_wall.json index a42c50e526..55f5349c7f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:tar_shade_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_wall_from_stonecutting.json index da32561475..e7be7cff4e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/tar_shade_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:tar_shade_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_bookshelf.json index e987c10f8d..15b4e01ca0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_button.json index 6952b824fe..4ccf66c87a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_carved_planks.json index b45626a6fc..b59183feb1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_door.json index f03f133d30..a74f4eca50 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_fence.json index a169902731..a786e46c5d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_fence_gate.json index f672702eff..926acceaab 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks.json index 0049f126bf..6229e0de32 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_stripped_log.json index 33e849a4c5..f1bbe2c191 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_stripped_wood.json index 08c53fd48f..dee6fbcb0f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_wood.json index b3a46ca237..a1e6ae3188 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_pressure_plate.json index 9d53d57334..ff215eadc9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_slab.json index 504ab2c093..6394d1aeb5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_stairs.json index 18549f1749..5297594c5d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_stripped_wood.json index ec3053ece1..9c96ddb66f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_trapdoor.json index ebdc0c5207..8979a06149 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_wood.json index 7a5b056ea3..10f84983d4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/time_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json index ddcad2a481..a23d3dc18d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_button.json index e8d997c12b..3853833011 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_carved_knotted_wood_from_treated_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_carved_knotted_wood_from_treated_uncarved_wood.json index 17aded85e7..da93ed0337 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_carved_knotted_wood_from_treated_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_carved_knotted_wood_from_treated_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_carved_knotted_wood_from_treated_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_button.json index 22bf1bb9e5..ed7f8f4c29 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_chipboard_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_fence.json index fcbdb29098..30fe23a245 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_chipboard_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_fence_gate.json index d6408040ff..a5f426d400 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_chipboard_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_pressure_plate.json index 9d0dca1086..049c134c53 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_chipboard_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_slab.json index de9ccfae0d..4b5f95f4d3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_chipboard_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_stairs.json index 7a58095a1d..0d4b62f959 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_chipboard_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_chipboard_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_door.json index 474d24f378..7c1d521535 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_fence.json index 90b3d04a42..357189d40f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_fence_gate.json index 004fa75172..761f5e76d1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_plank_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_plank_slab.json index cd690d9c56..2ed0e8df40 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_plank_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_plank_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_heavy_plank_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_plank_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_plank_stairs.json index 385d258011..e8a0a10d27 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_plank_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_plank_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_heavy_plank_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_planks_from_treated_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_planks_from_treated_uncarved_wood.json index 4978a0ef34..98758cde11 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_planks_from_treated_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_heavy_planks_from_treated_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_heavy_planks_from_treated_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_from_treated_uncarved_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_from_treated_uncarved_wood.json index 9d1db28c32..6df451c9da 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_from_treated_uncarved_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_from_treated_uncarved_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_planks_from_treated_uncarved_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_slab.json index d621c12b9b..01d422bc47 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_planks_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_stairs.json index f5db18bf6e..a9e6375662 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_planks_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_planks_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_pressure_plate.json index 7cfa70b968..4dfe3fbb8f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_trapdoor.json index 38210d7c38..a9df729d9f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_button.json index 7beb26ab34..075b0ebbc9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_uncarved_wood_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_fence.json index 8e8e4b2d6f..ec132c0679 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_uncarved_wood_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_fence_gate.json index 37f7f6ff8b..ca4277506a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_uncarved_wood_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_pressure_plate.json index 01c37b612c..a1649db486 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_uncarved_wood_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_slab.json index 3fb1ae995e..5b127d1d8a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_uncarved_wood_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_stairs.json index d53fedb5f8..4b1595110c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/treated_uncarved_wood_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_uncarved_wood_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_button.json index a52abccf94..71dfffcabd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uncarved_wood_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_fence.json index 5f773240f8..f8b17f5b58 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uncarved_wood_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_fence_gate.json index 3a754ae4ee..461987b603 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uncarved_wood_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_pressure_plate.json index cd62fa1c20..367a6546c8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uncarved_wood_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_slab.json index dac93a23e9..a120c47f1f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uncarved_wood_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_stairs.json index 5bd7ac9369..97443b8f44 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uncarved_wood_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uncarved_wood_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_block.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_block.json index ca14d9df86..dfa8993f1d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_block.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_block.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_button.json index caaca25b6d..ce42d71060 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_pressure_plate.json index ba0da89de8..c5a1920c1b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_slab.json index ac8c608149..f6da9be83c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_slab_from_stonecutting.json index 52588ab851..2fef30e0fa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_stairs.json index cc52359054..30275924eb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_stairs_from_stonecutting.json index e80fca0ae0..1679203c12 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_wall.json index 2e8538facf..f372864678 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_wall_from_stonecutting.json index d966d5d57b..cab2319505 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/uranium_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_slab.json index e01cdf53da..e986faceba 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:vertical_green_stone_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_slab_from_stonecutting.json index 5a3ba4bd84..4c429bcfa9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:vertical_green_stone_brick_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_stairs.json index 308e3c8a5a..33129a16b4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:vertical_green_stone_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_stairs_from_stonecutting.json index de422fb8b8..eb874cc9ac 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:vertical_green_stone_brick_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_wall.json index c2b5ec0629..e5b35db905 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:vertical_green_stone_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_wall_from_stonecutting.json index d489c4c71d..afc780fad6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:vertical_green_stone_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_bricks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_bricks.json index 9c5b7d6791..293461361c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_bricks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:vertical_green_stone_bricks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_bricks_from_polished_green_stone_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_bricks_from_polished_green_stone_stonecutting.json index 0e6a2f7b9a..d435f13124 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_bricks_from_polished_green_stone_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vertical_green_stone_bricks_from_polished_green_stone_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:vertical_green_stone_bricks_from_polished_green_stone_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vine_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vine_wood.json index afb66ea608..687068eace 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vine_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/vine_wood.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:vine_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_bookshelf.json index 9fc4faf913..4751fb3d0c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_bookshelf.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_bookshelf" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_button.json index 08ca2c4f7b..f57f40ded9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_carved_planks.json index af8c7225ba..290ca4dfe2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_carved_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_carved_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_door.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_door.json index 1b482d970f..a6c007d663 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_door.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_fence.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_fence.json index f82d2f0094..14498dee51 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_fence.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_fence_gate.json index 537ee5fdb5..4af18a282c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_fence_gate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks.json index 217c9c9d9b..9ec8e7371d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_planks" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_stripped_log.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_stripped_log.json index 9df1df8cb6..5e27aaedbc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_stripped_log.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_stripped_log.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_planks_from_stripped_log" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_stripped_wood.json index 20f6f84ee2..e4b844c705 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_planks_from_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_wood.json index 434a038ddb..59c18875e1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_planks_from_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_planks_from_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_pressure_plate.json index d56967dcc1..141f499f06 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_slab.json index 3e9c414981..a1ba9dfcd4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_stairs.json index f666a132f8..ff3158f918 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_stripped_wood.json index 7c63b3d162..9bc5390eb5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_stripped_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_stripped_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_trapdoor.json index 1640114174..c517bb5081 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_trapdoor.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_wood.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_wood.json index d6b43fcd00..f5ce4af4cb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/void_aspect_wood.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_wood" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_slab.json index 53b0a399e9..23c3ce2278 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_slab_from_white_chess_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_slab_from_white_chess_bricks_stonecutting.json index c43ef21a94..16c18b3e31 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_slab_from_white_chess_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_slab_from_white_chess_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_slab_from_white_chess_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_button.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_button.json index 123535b7ba..5bb743bd7f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_button.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_button.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_smooth_button" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_pressure_plate.json index 154fbff7b3..dc91c9983f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_smooth_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_slab.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_slab.json index 08ecf750b3..0eeb80a865 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_slab.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_slab.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_smooth_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_slab_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_slab_from_stonecutting.json index b669e1f893..2d0dabc4cb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_slab_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_slab_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_smooth_slab_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_stairs.json index 269b41ad2f..ae243772b4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_smooth_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_stairs_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_stairs_from_stonecutting.json index 9d403043c1..5015e84694 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_stairs_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_stairs_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_smooth_stairs_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_wall.json index af40167ae5..f5c8c0e742 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_smooth_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_wall_from_stonecutting.json index 326bf5b8e0..ec1699bd0d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_smooth_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_smooth_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_stairs.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_stairs.json index b957406c2e..22f02916e4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_stairs.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_stairs_from_white_chess_bricks_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_stairs_from_white_chess_bricks_stonecutting.json index 4a2f929f40..8b22ef6d93 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_stairs_from_white_chess_bricks_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_stairs_from_white_chess_bricks_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_stairs_from_white_chess_bricks_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_wall.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_wall.json index 80c1daa897..c49ab98574 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_wall.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_wall" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_wall_from_stonecutting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_wall_from_stonecutting.json index d98dbcc403..38b0c7ad2c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_wall_from_stonecutting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/white_chess_brick_wall_from_stonecutting.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:white_chess_brick_wall_from_stonecutting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/bear_poking_stick.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/bear_poking_stick.json index f31b03fb2d..7efe8127fa 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/bear_poking_stick.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/bear_poking_stick.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:bear_poking_stick" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/cane.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/cane.json index 3ee47ca093..321e01f2a1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/cane.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/cane.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:cane" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/claw_hammer.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/claw_hammer.json index e1a3a2894f..34de0a9352 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/claw_hammer.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/claw_hammer.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:claw_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/dagger.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/dagger.json index d6116c9466..04d0b1395b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/dagger.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/dagger.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:dagger" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/deuce_club.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/deuce_club.json index 82b1e5da03..130283dc78 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/deuce_club.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/deuce_club.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:deuce_club" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/fan.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/fan.json index f2de922da7..caea4096fb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/fan.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/fan.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:fan" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/fork.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/fork.json index d85a4163c9..fcaf0967c6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/fork.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/fork.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:fork" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/house_key.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/house_key.json index 26d974f365..dadfbeffd9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/house_key.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/house_key.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:house_key" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/iron_cane.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/iron_cane.json index d19852e05a..b5a777d0c7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/iron_cane.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/iron_cane.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:iron_cane" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/katana.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/katana.json index 5f64a9da3d..81df2857df 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/katana.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/katana.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:katana" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/knitting_needle.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/knitting_needle.json index 631e10d046..02e3453713 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/knitting_needle.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/knitting_needle.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:knitting_needle" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/macuahuitl.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/macuahuitl.json index cf1f630a66..c1539e9184 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/macuahuitl.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/macuahuitl.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:macuahuitl" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/makeshift_claws_drawn.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/makeshift_claws_drawn.json index ff586960f2..a1b7483451 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/makeshift_claws_drawn.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/makeshift_claws_drawn.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:makeshift_claws_drawn" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/obsidian_axe_knife.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/obsidian_axe_knife.json index 9485bf0140..390734286c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/obsidian_axe_knife.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/obsidian_axe_knife.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:obsidian_axe_knife" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/pointy_stick.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/pointy_stick.json index 5013616d58..028fabc235 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/pointy_stick.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/pointy_stick.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:pointy_stick" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/shuriken.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/shuriken.json index 01bcaede32..789d2c5ea8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/shuriken.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/shuriken.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shuriken" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/sickle.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/sickle.json index 0421c56f0e..cccc6bb064 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/sickle.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/sickle.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:sickle" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/sledge_hammer.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/sledge_hammer.json index f1b493aab7..1bd6162cc2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/sledge_hammer.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/sledge_hammer.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:sledge_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword.json index 2ac9ca8cbb..3ef1722c10 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:steak_sword" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword_from_campfire_cooking.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword_from_campfire_cooking.json index 54215b1132..e92ec224ee 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword_from_campfire_cooking.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword_from_campfire_cooking.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:steak_sword_from_campfire_cooking" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword_from_smoking.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword_from_smoking.json index d85654bd6d..74b58c2e65 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword_from_smoking.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/steak_sword_from_smoking.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:steak_sword_from_smoking" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/umbrella.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/umbrella.json index 341259f061..cd64f1441d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/umbrella.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/umbrella.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:umbrella" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/wooden_lance.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/wooden_lance.json index dff5701b3e..8995769ce6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/wooden_lance.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/wooden_lance.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:wooden_lance" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/wooden_spoon.json b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/wooden_spoon.json index 304f683ffb..7f608beeed 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/combat/wooden_spoon.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/combat/wooden_spoon.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:wooden_spoon" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_hanging_sign.json index b08212bd22..15ba2a12d0 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_ladder.json index da9a8bbed4..e40d4cc2cd 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_sign.json index f7b59ac000..103ec0f37c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/blood_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blood_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_hanging_sign.json index 989767950c..09ed8b3efe 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_ladder.json index 47a5ecb14c..00821ec9e4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_sign.json index 87708e9afd..c5217509dc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/breath_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:breath_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/carved_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/carved_hanging_sign.json index e78184161a..7c9446c432 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/carved_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/carved_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/carved_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/carved_sign.json index 3572e1fe45..069a976f61 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/carved_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/carved_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:carved_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/chessboard_black.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/chessboard_black.json index d2ee487f58..9302cdfd32 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/chessboard_black.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/chessboard_black.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:chessboard_black" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/chessboard_white.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/chessboard_white.json index d3215aeb7a..3f1f9190f3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/chessboard_white.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/chessboard_white.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:chessboard_white" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_hanging_sign.json index f08e584c2a..acfe53ff7b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_sign.json index 8d3bca5338..968cb9c550 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/cindered_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cindered_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/computer.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/computer.json index 9bf0f2b628..86d25c1a4a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/computer.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/computer.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:computer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_hanging_sign.json index 7911cf14a1..c1591af61a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json index d7e044bdad..055644c9cc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_sign.json index 09c2f8a7ca..a04f1185e6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:dead_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_hanging_sign.json index 6b1127063f..1ffe110e2a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_ladder.json index 83e57e2758..9b4cf8c192 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_sign.json index 2fa9a31650..5af5489efb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/doom_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:doom_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_hanging_sign.json index b95920cf4c..99f3adc63d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json index 2732b1471d..0077fcd716 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_sign.json index 0f52d4fdcc..adc154e1a7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:end_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_hanging_sign.json index 3f8b424986..537b3602ea 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json index f7887cfa4f..7289f00c2b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_sign.json index 08dae7445c..e58af4593f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/frost_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:frost_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_hanging_sign.json index 6f7b7b0aa6..e9b385a818 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json index 1d15bea88d..673e494cdc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_sign.json index 09fcb6eff7..4f704442eb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:glowing_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_hanging_sign.json index 636159580c..933a4c013e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_ladder.json index faff6dd00d..1a26fe45ef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_sign.json index b17f3d3605..d12acf4abb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/heart_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:heart_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_hanging_sign.json index b4d0f22a2e..a3e81fdc51 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_ladder.json index fb8591a39f..f6da140f67 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_sign.json index 860759d777..96798c311c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/hope_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:hope_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/lacquered_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/lacquered_hanging_sign.json index 7a01f5f8e2..024cff2150 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/lacquered_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/lacquered_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/lacquered_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/lacquered_sign.json index 09661277a8..bc477cb2b2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/lacquered_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/lacquered_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:lacquered_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_hanging_sign.json index 2f0453c518..d99eda8ffe 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_ladder.json index d28940c852..879634b1f7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_sign.json index 4ea9f34491..b892c4efe7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/life_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:life_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_hanging_sign.json index c414093f03..f1197cc9e1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_ladder.json index 2473c63f59..4474c93901 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_sign.json index 6f6f118a80..a9d86f63cb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/light_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:light_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_hanging_sign.json index 392a6743c0..0e68016186 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_ladder.json index d55a7a7b39..0d44b01486 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_sign.json index 27316d5e25..f507657ab5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/mind_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:mind_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/perfectly_generic_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/perfectly_generic_hanging_sign.json index 322dee1d7e..ba82e8e8a2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/perfectly_generic_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/perfectly_generic_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/perfectly_generic_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/perfectly_generic_sign.json index 61fbb5b2c1..29499dd252 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/perfectly_generic_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/perfectly_generic_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:perfectly_generic_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_hanging_sign.json index af29580495..ae43b09140 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_ladder.json index 2840dd1db6..72fb646987 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_sign.json index ca9bf72802..d965fd27b4 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rage_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rage_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_hanging_sign.json index bd3eb91e15..4e30d328e6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json index 5391b94b6b..f477eb8320 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_sign.json index a95619fb08..fa098037a7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rainbow_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_hanging_sign.json index 372ec81adf..2b1586158d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_sign.json index cdeaaecf18..06a4947757 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:shadewood_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/skaianet_denier.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/skaianet_denier.json index 9dbae1f296..3569618d12 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/skaianet_denier.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/skaianet_denier.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:skaianet_denier" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_hanging_sign.json index f704271a8a..21ca58918d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_ladder.json index 889d290a0b..86e5e1f744 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_sign.json index 2ad0a0a367..d4066dce66 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/space_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:space_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/spruce_planks_from_wooden_cactus.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/spruce_planks_from_wooden_cactus.json index 9a0aecbdad..53b40d60ff 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/spruce_planks_from_wooden_cactus.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/spruce_planks_from_wooden_cactus.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:spruce_planks_from_wooden_cactus" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_hanging_sign.json index 58c347dde6..6eb37c4383 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_ladder.json index c576a08a7b..d13c3126d9 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_sign.json index ddb114cd6e..94644510ac 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/time_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:time_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/trans_portalizer.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/trans_portalizer.json index 88f2751cca..a6726c65ca 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/trans_portalizer.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/trans_portalizer.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:trans_portalizer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_hanging_sign.json index 20ebcd80d3..869fc67a96 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json index 33220e0e22..89f25226f5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_sign.json index 8447cb9d77..b70c4176b7 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/treated_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:treated_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/uranium_cooker.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/uranium_cooker.json index cc843a6421..b836fa1ef1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/uranium_cooker.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/uranium_cooker.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:uranium_cooker" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_hanging_sign.json index 2dc4b22bae..1520a0afda 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_hanging_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_hanging_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_ladder.json index bb82dadeee..0b1f926070 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_ladder.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_sign.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_sign.json index a9a087d4fe..2456dc7d91 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/void_aspect_sign.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:void_aspect_sign" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/food/apple_cake.json b/src/main/generated/resources/data/minestuck/advancements/recipes/food/apple_cake.json index 447141f623..81fe076b51 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/food/apple_cake.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/food/apple_cake.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:apple_cake" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/food/bug_mac.json b/src/main/generated/resources/data/minestuck/advancements/recipes/food/bug_mac.json index 93dbd96e55..40132eb35f 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/food/bug_mac.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/food/bug_mac.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:bug_mac" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/food/bug_on_a_stick.json b/src/main/generated/resources/data/minestuck/advancements/recipes/food/bug_on_a_stick.json index 20a36d6276..5f142204ef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/food/bug_on_a_stick.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/food/bug_on_a_stick.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:bug_on_a_stick" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/food/cake_from_mix.json b/src/main/generated/resources/data/minestuck/advancements/recipes/food/cake_from_mix.json index a74662b86a..0634c863b3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/food/cake_from_mix.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/food/cake_from_mix.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:cake_from_mix" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/food/grub_sauce.json b/src/main/generated/resources/data/minestuck/advancements/recipes/food/grub_sauce.json index 8946024869..0e6dd0d43e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/food/grub_sauce.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/food/grub_sauce.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:grub_sauce" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/food/salad.json b/src/main/generated/resources/data/minestuck/advancements/recipes/food/salad.json index 6f9e0ad217..77ff9b8c3d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/food/salad.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/food/salad.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:salad" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/food/strawberry_chunk.json b/src/main/generated/resources/data/minestuck/advancements/recipes/food/strawberry_chunk.json index 38ea360e2e..01e07fc775 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/food/strawberry_chunk.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/food/strawberry_chunk.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:strawberry_chunk" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/bi_dye.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/bi_dye.json index 98a6020ab8..e3206a4e84 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/bi_dye.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/bi_dye.json @@ -56,6 +56,5 @@ "recipes": [ "minestuck:bi_dye" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/blank_disk.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/blank_disk.json index 4331f99778..388857c4d8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/blank_disk.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/blank_disk.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:blank_disk" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/captcha_card.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/captcha_card.json index 95ff9d1440..d5ed0b838d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/captcha_card.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/captcha_card.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:captcha_card" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/charcoal_from_wooden_cactus.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/charcoal_from_wooden_cactus.json index 23b14ce245..339fc40426 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/charcoal_from_wooden_cactus.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/charcoal_from_wooden_cactus.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:charcoal_from_wooden_cactus" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/clothes_iron.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/clothes_iron.json index df3195eb4f..ce8a499932 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/clothes_iron.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/clothes_iron.json @@ -39,6 +39,5 @@ "recipes": [ "minestuck:clothes_iron" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/coal_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/coal_from_blasting.json index e29dff12f5..bfad23bbf6 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/coal_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/coal_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:coal_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/coal_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/coal_from_smelting.json index 763a30d1fb..6b3a36053c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/coal_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/coal_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:coal_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/diamond_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/diamond_from_blasting.json index 13a3ead0f8..c9285cd19a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/diamond_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/diamond_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:diamond_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/diamond_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/diamond_from_smelting.json index f851c7d149..06a3351eed 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/diamond_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/diamond_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:diamond_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/emerald_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/emerald_from_blasting.json index 370609d781..8d3f510c2c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/emerald_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/emerald_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:emerald_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/emerald_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/emerald_from_smelting.json index dc001ee6eb..44343790a3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/emerald_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/emerald_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:emerald_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/energy_core.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/energy_core.json index 80d6df1bc9..70595daa7c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/energy_core.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/energy_core.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:energy_core" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_ingot_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_ingot_from_blasting.json index 8ceaa516d8..4c97bb7030 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_ingot_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_ingot_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:gold_ingot_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_ingot_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_ingot_from_smelting.json index 4c0903ef0a..871460c618 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_ingot_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_ingot_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:gold_ingot_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_nugget_from_seeds.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_nugget_from_seeds.json index 0a5388a798..dca96bc7d8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_nugget_from_seeds.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gold_nugget_from_seeds.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:gold_nugget_from_seeds" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gutter_thumb_drive.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gutter_thumb_drive.json index 2516905999..79e2eaa10c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gutter_thumb_drive.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/gutter_thumb_drive.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:gutter_thumb_drive" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/horn.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/horn.json index d0243557e4..0ac1dac6ef 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/horn.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/horn.json @@ -52,6 +52,5 @@ "recipes": [ "minestuck:horn" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/iron_ingot_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/iron_ingot_from_blasting.json index 1cc181d2d6..a9f4601de2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/iron_ingot_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/iron_ingot_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:iron_ingot_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/iron_ingot_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/iron_ingot_from_smelting.json index cdf0dff242..faf097e3c2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/iron_ingot_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/iron_ingot_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:iron_ingot_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lapis_lazuli_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lapis_lazuli_from_blasting.json index b927d659d6..d61f87f70c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lapis_lazuli_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lapis_lazuli_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:lapis_lazuli_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lapis_lazuli_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lapis_lazuli_from_smelting.json index b1d3f45781..2b6342ce41 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lapis_lazuli_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lapis_lazuli_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:lapis_lazuli_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lip_balm.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lip_balm.json index 4edc5312bc..9bb256626a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lip_balm.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/lip_balm.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:lip_balm" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/mailbox.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/mailbox.json index 3f32d0fca0..aacdda67cb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/mailbox.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/mailbox.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:mailbox" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/plutonium_core.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/plutonium_core.json index d76f3d50af..336088de01 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/plutonium_core.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/plutonium_core.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:plutonium_core" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/quartz_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/quartz_from_blasting.json index b0f41a0fe3..c0ca6ed9b5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/quartz_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/quartz_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:quartz_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/quartz_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/quartz_from_smelting.json index c263a91b70..fe013366f2 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/quartz_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/quartz_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:quartz_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/queue_modus_card.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/queue_modus_card.json index 85352af0e5..bb91db755c 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/queue_modus_card.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/queue_modus_card.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:queue_modus_card" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_blasting.json index 583f8aac29..22df943f0b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:raw_cruxite_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_block.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_block.json index db01b55ae2..29ff4878cb 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_block.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_block.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:raw_cruxite_from_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_dowel.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_dowel.json index 86b2a59db7..0b4f9bd806 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_dowel.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_dowel.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:raw_cruxite_from_dowel" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_smelting.json index 72d5ca46dc..7d598b1a0e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_cruxite_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:raw_cruxite_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_blasting.json index 9a02558ed5..080d7fc0dc 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:raw_uranium_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_block.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_block.json index 859fad2516..00d85b9b8a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_block.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_block.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:raw_uranium_from_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_smelting.json index 5b009aa220..3836eba51b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/raw_uranium_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:raw_uranium_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/redstone_from_blasting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/redstone_from_blasting.json index aace463c7d..1945e89027 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/redstone_from_blasting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/redstone_from_blasting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:redstone_from_blasting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/redstone_from_smelting.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/redstone_from_smelting.json index 963bdf5c88..c87360ef2e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/redstone_from_smelting.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/redstone_from_smelting.json @@ -28,6 +28,5 @@ "recipes": [ "minestuck:redstone_from_smelting" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/stack_modus_card.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/stack_modus_card.json index c0995e9fc7..6878b00f08 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/stack_modus_card.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/stack_modus_card.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:stack_modus_card" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/sugar_from_cube.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/sugar_from_cube.json index 5b34f4b44a..e471712e24 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/sugar_from_cube.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/sugar_from_cube.json @@ -43,6 +43,5 @@ "recipes": [ "minestuck:sugar_from_cube" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/temple_scanner.json b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/temple_scanner.json index 4d66fa3303..8e850dc617 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/misc/temple_scanner.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/misc/temple_scanner.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:temple_scanner" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/block_pressure_plate.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/block_pressure_plate.json index 72590e9848..792bb5e94e 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/block_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/block_pressure_plate.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:block_pressure_plate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/item_magnet.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/item_magnet.json index f121db8777..bedbcd43a1 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/item_magnet.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/item_magnet.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:item_magnet" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/one_second_interval_timed_solid_switch.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/one_second_interval_timed_solid_switch.json index be09134da3..a860f63d69 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/one_second_interval_timed_solid_switch.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/one_second_interval_timed_solid_switch.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:one_second_interval_timed_solid_switch" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/redstone_clock.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/redstone_clock.json index 8f084284c5..a5f7e0cb1b 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/redstone_clock.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/redstone_clock.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:redstone_clock" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/remote_comparator.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/remote_comparator.json index e7189841f2..a1b7ae4320 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/remote_comparator.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/remote_comparator.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:remote_comparator" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/retractable_spikes.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/retractable_spikes.json index a690bf977e..b8faa26a36 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/retractable_spikes.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/retractable_spikes.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:retractable_spikes" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/rotator.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/rotator.json index b3f5d9112d..022d6b9998 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/rotator.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/rotator.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:rotator" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/solid_switch.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/solid_switch.json index 8b85e0aeaf..691c7424e5 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/solid_switch.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/solid_switch.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:solid_switch" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/spikes.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/spikes.json index 471c21266c..a25f027b5d 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/spikes.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/spikes.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:spikes" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/toggler.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/toggler.json index 8db0b1e268..eb0fe6b4c3 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/toggler.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/toggler.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:toggler" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/two_second_interval_timed_solid_switch.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/two_second_interval_timed_solid_switch.json index bef3f047ec..da4c5b942a 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/two_second_interval_timed_solid_switch.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/two_second_interval_timed_solid_switch.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:two_second_interval_timed_solid_switch" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/variable_solid_switch.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/variable_solid_switch.json index 6f34f4c004..01f5fd13b8 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/variable_solid_switch.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/variable_solid_switch.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:variable_solid_switch" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/wireless_redstone_receiver.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/wireless_redstone_receiver.json index 78cee56b95..40f7563a21 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/wireless_redstone_receiver.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/wireless_redstone_receiver.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:wireless_redstone_receiver" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/wireless_redstone_transmitter.json b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/wireless_redstone_transmitter.json index 53e4e735ac..6d89714e27 100644 --- a/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/wireless_redstone_transmitter.json +++ b/src/main/generated/resources/data/minestuck/advancements/recipes/redstone/wireless_redstone_transmitter.json @@ -30,6 +30,5 @@ "recipes": [ "minestuck:wireless_redstone_transmitter" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/apple_cake.json b/src/main/generated/resources/data/minestuck/recipes/apple_cake.json index 77631b1b82..121ad78d1c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/apple_cake.json +++ b/src/main/generated/resources/data/minestuck/recipes/apple_cake.json @@ -22,6 +22,5 @@ ], "result": { "item": "minestuck:apple_cake" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/bear_poking_stick.json b/src/main/generated/resources/data/minestuck/recipes/bear_poking_stick.json index 5fc36dbf3b..2ec1d41729 100644 --- a/src/main/generated/resources/data/minestuck/recipes/bear_poking_stick.json +++ b/src/main/generated/resources/data/minestuck/recipes/bear_poking_stick.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:bear_poking_stick" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_slab.json index 4038ba4144..b5ad9883c4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:black_chess_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_pressure_plate.json index 175b441738..5b1e520b60 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:black_chess_brick_smooth_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_slab.json b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_slab.json index 72385b78c2..7199ae1d32 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:black_chess_brick_smooth_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_stairs.json b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_stairs.json index a60814c2bc..801429ff7f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:black_chess_brick_smooth_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_wall.json b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_wall.json index 3e4243bc0c..6f6a6b0ed5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_smooth_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:black_chess_brick_smooth_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_stairs.json index 36e8856c44..67ae52f1ff 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:black_chess_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_wall.json index bbe2093e88..43a9c0c3d6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_chess_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:black_chess_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_slab.json b/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_slab.json index 4bcc4c48b8..dbe836f627 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:black_cobblestone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_stairs.json index 7015ec6416..9254727908 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:black_cobblestone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_wall.json b/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_wall.json index b5ac64e93d..bf5a902eeb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_cobblestone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:black_cobblestone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_slab.json index c5e452a016..694870a680 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:black_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_stairs.json index 71903ef185..d1d7ef7a3a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:black_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_wall.json index 7e392db00d..930ac3e2f8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:black_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_bricks.json index fcf495dc14..69c11a4829 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:black_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_column.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_column.json index f435503b40..f4ff1915e2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:black_stone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_pressure_plate.json index a4d185c837..0938108476 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:black_stone_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_slab.json index a059ac6dd0..a89e19aef2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:black_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_stairs.json index caa28f9c38..deab024709 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:black_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/black_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/black_stone_wall.json index 6c9cc562c8..6ab3d68705 100644 --- a/src/main/generated/resources/data/minestuck/recipes/black_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/black_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:black_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blank_disk.json b/src/main/generated/resources/data/minestuck/recipes/blank_disk.json index 5009c92121..3638623250 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blank_disk.json +++ b/src/main/generated/resources/data/minestuck/recipes/blank_disk.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:blank_disk" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/block_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/block_pressure_plate.json index 83dea73256..74d19f68e6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/block_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/block_pressure_plate.json @@ -22,6 +22,5 @@ ], "result": { "item": "minestuck:block_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_bookshelf.json index 4e4df93ca9..b932a2598c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:blood_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_carved_planks.json index 75bdee4be3..be497db2a8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:blood_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_door.json index 1737365bb5..d286cc9aae 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:blood_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_fence.json index 7d640e7d82..86b9662ed7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:blood_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_fence_gate.json index b5e1e5329b..09bafded09 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:blood_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_hanging_sign.json index b500e5f133..2f2e65d973 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:blood_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_ladder.json index cf4fe76cf1..2c9a95cd08 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:blood_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_pressure_plate.json index 35cdd5d3c6..5e5a47ca0a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:blood_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_sign.json index fb32166825..da9d6fdc19 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:blood_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_slab.json index 17a3baa425..7b637e8aba 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:blood_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_stairs.json index 803a91fce8..ae99f7bcd7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:blood_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_stripped_wood.json index 633a364af1..abd0c3223a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:blood_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_trapdoor.json index a0723e05cc..adb7f4f4c1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:blood_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_wood.json index 7ba5a50df4..a278342775 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:blood_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_slab.json index 6d38729922..1737aba642 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:blood_shade_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_stairs.json index e1fa74219d..623cb08b8c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:blood_shade_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_wall.json index d3d95a031f..ba7110d3f3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/blood_shade_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:blood_shade_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_bookshelf.json index 800e6cdfee..fc62f3b971 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:breath_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_carved_planks.json index c56cfae2db..46cc77dad4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:breath_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_door.json index 29ef39e353..cf86eac171 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:breath_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_fence.json index 11658e4992..edb2f0f4c0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:breath_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_fence_gate.json index 48836e1793..e46d4066a2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:breath_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_hanging_sign.json index 0e658bf0d2..f545c73841 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:breath_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_ladder.json index 0ba9e3a721..dac68c9698 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:breath_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_pressure_plate.json index 0a60e54776..441f0f6d70 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:breath_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_sign.json index 0770b658dd..958ec7b168 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:breath_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_slab.json index f5b90e1663..e669d07ece 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:breath_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_stairs.json index 6b4b059cc4..c26e79b415 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:breath_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_stripped_wood.json index d69a611c54..9e2a885b94 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:breath_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_trapdoor.json index 75323cfd70..76c06e1460 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:breath_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_wood.json index f47b50955a..189da3f1a3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/breath_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/breath_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:breath_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_slab.json index a95c345941..288d7675f2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:brown_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_stairs.json index 006fd02df0..ce39e204c2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:brown_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_wall.json index d0e9c0ed1c..9794f0d720 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:brown_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_bricks.json index 45d47cd0a0..b4c15b84d7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:brown_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_column.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_column.json index 97c878cc73..d84f87d3fa 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:brown_stone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_pressure_plate.json index eb3f7d6878..e88165162b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:brown_stone_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_slab.json index 300e6c8f98..22543f4894 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:brown_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_stairs.json index 4571b80433..49c9aa0b1e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:brown_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/brown_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/brown_stone_wall.json index 5d5b4c43be..374d2da981 100644 --- a/src/main/generated/resources/data/minestuck/recipes/brown_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/brown_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:brown_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cane.json b/src/main/generated/resources/data/minestuck/recipes/cane.json index f6468150a5..d5f6d24404 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cane.json +++ b/src/main/generated/resources/data/minestuck/recipes/cane.json @@ -13,6 +13,5 @@ ], "result": { "item": "minestuck:cane" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/captcha_card.json b/src/main/generated/resources/data/minestuck/recipes/captcha_card.json index 325df01601..45afb6f353 100644 --- a/src/main/generated/resources/data/minestuck/recipes/captcha_card.json +++ b/src/main/generated/resources/data/minestuck/recipes/captcha_card.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:captcha_card" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_door.json b/src/main/generated/resources/data/minestuck/recipes/carved_door.json index 1f4493bbe2..997dd5a2f1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:carved_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_fence.json b/src/main/generated/resources/data/minestuck/recipes/carved_fence.json index 9f39611117..03fbd377cd 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:carved_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/carved_fence_gate.json index 4e927fea2e..aebd660bf4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:carved_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/carved_hanging_sign.json index ac069508d3..5ae1cca876 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:carved_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_heavy_plank_slab.json b/src/main/generated/resources/data/minestuck/recipes/carved_heavy_plank_slab.json index 8cbe1060e0..17c9d7ffda 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_heavy_plank_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_heavy_plank_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:carved_heavy_plank_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_heavy_plank_stairs.json b/src/main/generated/resources/data/minestuck/recipes/carved_heavy_plank_stairs.json index dd584187db..f6441e8297 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_heavy_plank_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_heavy_plank_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:carved_heavy_plank_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/carved_pressure_plate.json index b6d3a826c4..958d255fb6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:carved_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_sign.json b/src/main/generated/resources/data/minestuck/recipes/carved_sign.json index fc4866883a..a9321504d3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:carved_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_slab.json b/src/main/generated/resources/data/minestuck/recipes/carved_slab.json index 21e756afdc..e026b7ed1f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:carved_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_stairs.json b/src/main/generated/resources/data/minestuck/recipes/carved_stairs.json index 2055b612f1..8cf09a7b1a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:carved_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/carved_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/carved_trapdoor.json index 1a5ec3d9dc..cf0717b6dd 100644 --- a/src/main/generated/resources/data/minestuck/recipes/carved_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/carved_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:carved_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cast_iron_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/cast_iron_pressure_plate.json index 043bce7266..6a625b3030 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cast_iron_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/cast_iron_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:cast_iron_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cast_iron_slab.json b/src/main/generated/resources/data/minestuck/recipes/cast_iron_slab.json index bf735bcda4..7a92bf4893 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cast_iron_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/cast_iron_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:cast_iron_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cast_iron_stairs.json b/src/main/generated/resources/data/minestuck/recipes/cast_iron_stairs.json index 8e70a16a07..34063c926e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cast_iron_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/cast_iron_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:cast_iron_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile.json b/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile.json index 767fee7b21..8c5f0d664e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile.json +++ b/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:cast_iron_tile" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile_slab.json b/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile_slab.json index d2154f944f..5dacc0e24a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:cast_iron_tile_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile_stairs.json b/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile_stairs.json index 0302637fac..d48d4342bb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/cast_iron_tile_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:cast_iron_tile_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cast_iron_wall.json b/src/main/generated/resources/data/minestuck/recipes/cast_iron_wall.json index 321123615a..efcb7c2d4a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cast_iron_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/cast_iron_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:cast_iron_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/chalk_brick_slab.json index 62053373c7..c2a7ab43c3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:chalk_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/chalk_brick_stairs.json index bd11ec7358..454f9b70f0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:chalk_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/chalk_brick_wall.json index 9467308c49..a8fad878da 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:chalk_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_bricks.json b/src/main/generated/resources/data/minestuck/recipes/chalk_bricks.json index 481b165eb9..bc04898c51 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:chalk_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_column.json b/src/main/generated/resources/data/minestuck/recipes/chalk_column.json index 358ea2a6df..d9a35554ab 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:chalk_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/chalk_pressure_plate.json index bb77ae01ca..98343999db 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chalk_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_slab.json b/src/main/generated/resources/data/minestuck/recipes/chalk_slab.json index 74555071b5..c131e03c09 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:chalk_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_stairs.json b/src/main/generated/resources/data/minestuck/recipes/chalk_stairs.json index 1ecfac5492..e9ef91da03 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:chalk_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chalk_wall.json b/src/main/generated/resources/data/minestuck/recipes/chalk_wall.json index c86a748827..b4ac0fd83c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chalk_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/chalk_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:chalk_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chessboard_black.json b/src/main/generated/resources/data/minestuck/recipes/chessboard_black.json index e838eaeaf7..46793bd29e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chessboard_black.json +++ b/src/main/generated/resources/data/minestuck/recipes/chessboard_black.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:chessboard" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chessboard_white.json b/src/main/generated/resources/data/minestuck/recipes/chessboard_white.json index 080706483b..1d5cacf75c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chessboard_white.json +++ b/src/main/generated/resources/data/minestuck/recipes/chessboard_white.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:chessboard" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chipboard_fence.json b/src/main/generated/resources/data/minestuck/recipes/chipboard_fence.json index 3d10b3ebd6..5ffd476f06 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chipboard_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/chipboard_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:chipboard_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chipboard_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/chipboard_fence_gate.json index ae3a3b96dc..8c75fc4d3d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chipboard_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/chipboard_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:chipboard_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chipboard_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/chipboard_pressure_plate.json index 7c73d22d0d..857a2013d9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chipboard_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/chipboard_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chipboard_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chipboard_slab.json b/src/main/generated/resources/data/minestuck/recipes/chipboard_slab.json index 56575683b7..fb0eaeb5aa 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chipboard_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/chipboard_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:chipboard_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chipboard_stairs.json b/src/main/generated/resources/data/minestuck/recipes/chipboard_stairs.json index 1682694d0e..d5eee1ce07 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chipboard_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/chipboard_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:chipboard_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_black_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_black_stone_bricks.json index e752917445..6be4fa28c7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_black_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_black_stone_bricks.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_black_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_chalk_bricks.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_chalk_bricks.json index ee02cc88c4..8a8022aa0a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_chalk_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_chalk_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:chiseled_chalk_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_coarse_stone.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_coarse_stone.json index 53bb71d2ee..524600a252 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_coarse_stone.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_coarse_stone.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_coarse_stone" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_coarse_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_coarse_stone_bricks.json index ca71656241..4502fea9e1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_coarse_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_coarse_stone_bricks.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_coarse_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_cruxite_block.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_cruxite_block.json index 588e7aa5b6..86f60143ca 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_cruxite_block.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_cruxite_block.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:chiseled_cruxite_block" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_frost_bricks.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_frost_bricks.json index 47b630fd66..686a28ba20 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_frost_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_frost_bricks.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_frost_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_frost_tile.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_frost_tile.json index 496e007096..efd185b9e0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_frost_tile.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_frost_tile.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_frost_tile" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_igneous_stone.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_igneous_stone.json index e4a2c5e57d..38aa379d6a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_igneous_stone.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_igneous_stone.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_igneous_stone" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_mycelium_bricks.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_mycelium_bricks.json index 0b6ed9fdd2..bfa13c1dbf 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_mycelium_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_mycelium_bricks.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_mycelium_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_pink_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_pink_stone_bricks.json index b6355d0da0..dc2c4faa65 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_pink_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_pink_stone_bricks.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_pink_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_red_sandstone_column.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_red_sandstone_column.json index 4c205d9dd2..a97927e039 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_red_sandstone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_red_sandstone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:chiseled_red_sandstone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_sandstone_column.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_sandstone_column.json index f0af22a000..f3c7e92452 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_sandstone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_sandstone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:chiseled_sandstone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/chiseled_shade_bricks.json b/src/main/generated/resources/data/minestuck/recipes/chiseled_shade_bricks.json index 3b5bec2d8c..a555b56066 100644 --- a/src/main/generated/resources/data/minestuck/recipes/chiseled_shade_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/chiseled_shade_bricks.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:chiseled_shade_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_door.json b/src/main/generated/resources/data/minestuck/recipes/cindered_door.json index b42a7bd640..6e966dac5c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:cindered_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_fence.json b/src/main/generated/resources/data/minestuck/recipes/cindered_fence.json index ee1f4e8618..2f8719583e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:cindered_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/cindered_fence_gate.json index 8ad7e085da..7a7ba771cc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:cindered_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/cindered_hanging_sign.json index 74a6d45f2c..00533988a5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:cindered_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/cindered_pressure_plate.json index 965b6eaecb..e5dedea42a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:cindered_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_sign.json b/src/main/generated/resources/data/minestuck/recipes/cindered_sign.json index 059e8a19b6..1e17cf9092 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:cindered_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_slab.json b/src/main/generated/resources/data/minestuck/recipes/cindered_slab.json index 17987bda1c..a61bc21236 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:cindered_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_stairs.json b/src/main/generated/resources/data/minestuck/recipes/cindered_stairs.json index 7b5431eab4..5a192c60b1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:cindered_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/cindered_trapdoor.json index d74f4fe5ed..e8b5e02bbd 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:cindered_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_wood.json b/src/main/generated/resources/data/minestuck/recipes/cindered_wood.json index faa1db026a..05eeb08665 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cindered_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/cindered_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:cindered_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/claw_hammer.json b/src/main/generated/resources/data/minestuck/recipes/claw_hammer.json index 697ea04dfa..181faed885 100644 --- a/src/main/generated/resources/data/minestuck/recipes/claw_hammer.json +++ b/src/main/generated/resources/data/minestuck/recipes/claw_hammer.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:claw_hammer" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/clothes_iron.json b/src/main/generated/resources/data/minestuck/recipes/clothes_iron.json index 2ac620f52e..d36205fd29 100644 --- a/src/main/generated/resources/data/minestuck/recipes/clothes_iron.json +++ b/src/main/generated/resources/data/minestuck/recipes/clothes_iron.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:clothes_iron" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_slab.json index eab0eee7ff..d4e17c32f2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:coarse_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_stairs.json index 088aa8538d..14ec307d7b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:coarse_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_wall.json index a7bfc38589..66c7edfeb2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:coarse_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_bricks.json index e96ac38f8d..4e1825a5a0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:coarse_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_column.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_column.json index 9de72c1518..9c3051adcd 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:coarse_stone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_pressure_plate.json index 0f4039b702..60f0ce74e1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:coarse_stone_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_slab.json index 18595f2515..b87ca00c31 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:coarse_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_stairs.json index 63d9951e03..929c0cab51 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:coarse_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_wall.json index 5454beafa0..4c83b1c616 100644 --- a/src/main/generated/resources/data/minestuck/recipes/coarse_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/coarse_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:coarse_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/cactus.json b/src/main/generated/resources/data/minestuck/recipes/combinations/cactus.json index ca012a9873..8f67e45ee5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/cactus.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/cactus.json @@ -4,7 +4,7 @@ "item": "minecraft:sand" }, "input2": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "mode": "and", "output": { diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/crimson_roots.json b/src/main/generated/resources/data/minestuck/recipes/combinations/crimson_roots.json index 5319297020..1da1a15603 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/crimson_roots.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/crimson_roots.json @@ -1,7 +1,7 @@ { "type": "minestuck:combination", "input1": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "input2": { "item": "minecraft:crimson_fungus" diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/dead_bush_from_grass.json b/src/main/generated/resources/data/minestuck/recipes/combinations/dead_bush_from_short_grass.json similarity index 82% rename from src/main/generated/resources/data/minestuck/recipes/combinations/dead_bush_from_grass.json rename to src/main/generated/resources/data/minestuck/recipes/combinations/dead_bush_from_short_grass.json index d6326d7194..34880658c5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/dead_bush_from_grass.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/dead_bush_from_short_grass.json @@ -4,7 +4,7 @@ "item": "minecraft:sand" }, "input2": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "mode": "or", "output": { diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/grass_block_from_grass.json b/src/main/generated/resources/data/minestuck/recipes/combinations/grass_block_from_short_grass.json similarity index 83% rename from src/main/generated/resources/data/minestuck/recipes/combinations/grass_block_from_grass.json rename to src/main/generated/resources/data/minestuck/recipes/combinations/grass_block_from_short_grass.json index 8d894cf69a..8be701a2b6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/grass_block_from_grass.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/grass_block_from_short_grass.json @@ -4,7 +4,7 @@ "item": "minecraft:dirt" }, "input2": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "mode": "and", "output": { diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/moss_block.json b/src/main/generated/resources/data/minestuck/recipes/combinations/moss_block.json index ab98fab26d..e5b71a4f50 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/moss_block.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/moss_block.json @@ -4,7 +4,7 @@ "item": "minecraft:grass_block" }, "input2": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "mode": "or", "output": { diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/moss_carpet.json b/src/main/generated/resources/data/minestuck/recipes/combinations/moss_carpet.json index f57d5718b6..60905de914 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/moss_carpet.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/moss_carpet.json @@ -4,7 +4,7 @@ "item": "minecraft:grass_block" }, "input2": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "mode": "and", "output": { diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/shears.json b/src/main/generated/resources/data/minestuck/recipes/combinations/shears.json index 7a9fb4224f..26aa169e94 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/shears.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/shears.json @@ -4,7 +4,7 @@ "item": "minecraft:iron_ingot" }, "input2": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "mode": "and", "output": { diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/warped_roots.json b/src/main/generated/resources/data/minestuck/recipes/combinations/warped_roots.json index 8560da8d13..c05dbaceda 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/warped_roots.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/warped_roots.json @@ -1,7 +1,7 @@ { "type": "minestuck:combination", "input1": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "input2": { "item": "minecraft:warped_fungus" diff --git a/src/main/generated/resources/data/minestuck/recipes/combinations/wooden_grass.json b/src/main/generated/resources/data/minestuck/recipes/combinations/wooden_grass.json index 1f3678211a..ceb960502f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/combinations/wooden_grass.json +++ b/src/main/generated/resources/data/minestuck/recipes/combinations/wooden_grass.json @@ -4,7 +4,7 @@ "tag": "minecraft:planks" }, "input2": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" }, "mode": "or", "output": { diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_block.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_block.json index 940b4b7062..41f107e36a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_block.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_block.json @@ -13,6 +13,5 @@ ], "result": { "item": "minestuck:cruxite_block" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_slab.json index 97f78612e6..44bed6e2dd 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:cruxite_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_stairs.json index ae072979fc..0f0bb38bfe 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:cruxite_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_wall.json index 33a676ee84..e19800e493 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:cruxite_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_bricks.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_bricks.json index 095a8a2c40..adb269e273 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_bricks.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:cruxite_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_door.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_door.json index 63ed21360b..017c370b6e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:cruxite_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_lamp.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_lamp.json index f1d99754a4..a36cd50554 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_lamp.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_lamp.json @@ -20,6 +20,5 @@ ], "result": { "item": "minestuck:cruxite_lamp" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_pillar.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_pillar.json index 68921e1a70..1c562898c4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_pillar.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_pillar.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:cruxite_pillar" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_pressure_plate.json index 4bd479825b..3e8a15c5fb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:cruxite_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_slab.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_slab.json index b9be04f3e2..963f795f46 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:cruxite_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_stairs.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_stairs.json index e0337d39b2..538796137c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:cruxite_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_trapdoor.json index da6b629df1..8be4a368e2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:cruxite_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/cruxite_wall.json b/src/main/generated/resources/data/minestuck/recipes/cruxite_wall.json index 8b6541597b..f4add69125 100644 --- a/src/main/generated/resources/data/minestuck/recipes/cruxite_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/cruxite_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:cruxite_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dagger.json b/src/main/generated/resources/data/minestuck/recipes/dagger.json index 133b2fb7ea..8b85de627d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dagger.json +++ b/src/main/generated/resources/data/minestuck/recipes/dagger.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:dagger" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_slab.json index 0266d5f3cb..30f4358a73 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:dark_gray_chess_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_pressure_plate.json index f3918b167d..98bbc4ec3a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:dark_gray_chess_brick_smooth_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_slab.json b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_slab.json index 0ccacee189..d7bcb1014b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:dark_gray_chess_brick_smooth_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_stairs.json b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_stairs.json index 9b96002f05..97f1d73969 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:dark_gray_chess_brick_smooth_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_wall.json b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_wall.json index b5b973acf2..445bb606de 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_smooth_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:dark_gray_chess_brick_smooth_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_stairs.json index 3457cba1aa..08a79dd1bc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:dark_gray_chess_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_wall.json index baf5e96a54..0187cd0f08 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/dark_gray_chess_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:dark_gray_chess_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json index a4479ead74..3c033c2410 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:dead_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_door.json b/src/main/generated/resources/data/minestuck/recipes/dead_door.json index f55827f34a..22ff42f129 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:dead_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_fence.json b/src/main/generated/resources/data/minestuck/recipes/dead_fence.json index 7009e8666d..e3056e88f2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:dead_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/dead_fence_gate.json index 20439d8267..5812d79f7c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:dead_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/dead_hanging_sign.json index 1db03731c1..c48147ba44 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:dead_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json b/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json index ec358b05e1..b70fb5de04 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:dead_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_planks_slab.json b/src/main/generated/resources/data/minestuck/recipes/dead_planks_slab.json index 9ab3a45726..77851487e3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_planks_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_planks_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:dead_planks_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_planks_stairs.json b/src/main/generated/resources/data/minestuck/recipes/dead_planks_stairs.json index 2cbb09e023..9343b79873 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_planks_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_planks_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:dead_planks_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/dead_pressure_plate.json index 41d69049d8..c72f2d430c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:dead_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_sign.json b/src/main/generated/resources/data/minestuck/recipes/dead_sign.json index 2a70027a2e..43a17e2ca9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:dead_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/dead_trapdoor.json index eade342b56..63e8a933a0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:dead_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_wood.json b/src/main/generated/resources/data/minestuck/recipes/dead_wood.json index 642e20ddda..33121c7407 100644 --- a/src/main/generated/resources/data/minestuck/recipes/dead_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/dead_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:dead_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_slab.json index 21a25eb464..5108ec88b6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:decrepit_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_stairs.json index e058c8d4c9..a0d5a8f8ec 100644 --- a/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:decrepit_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_wall.json index 0e7a65d972..680ea5235a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/decrepit_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:decrepit_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/deuce_club.json b/src/main/generated/resources/data/minestuck/recipes/deuce_club.json index 5bd711f47f..d791cc7456 100644 --- a/src/main/generated/resources/data/minestuck/recipes/deuce_club.json +++ b/src/main/generated/resources/data/minestuck/recipes/deuce_club.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:deuce_club" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_bookshelf.json index d128761e3a..3a4cfa828f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:doom_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_carved_planks.json index 75073942d1..ac43953e3b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:doom_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_door.json index e27c1b13a5..d68c3a826e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:doom_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_fence.json index da47c198d3..33b92619e4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:doom_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_fence_gate.json index fa437ae34e..683c255be1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:doom_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_hanging_sign.json index 3ae7611b6a..97d47697c8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:doom_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_ladder.json index 55b00db2b4..0d364ae899 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:doom_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_pressure_plate.json index 53058e2d8c..af702960c2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:doom_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_sign.json index 823a741f2c..e77d81bb21 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:doom_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_slab.json index e5431e1e18..4634033c2f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:doom_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_stairs.json index 9007902452..99eb3bce57 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:doom_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_stripped_wood.json index f9b2bdfcf6..bfffb95214 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:doom_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_trapdoor.json index 64db96b7e4..6bc3a8b6df 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:doom_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_wood.json index b025e8a8ab..637b4db98d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/doom_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/doom_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:doom_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/end_bookshelf.json index 1c077f68a3..431c2e4f83 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:end_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_door.json b/src/main/generated/resources/data/minestuck/recipes/end_door.json index 6b39dc16c2..1c13cd6171 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:end_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_fence.json b/src/main/generated/resources/data/minestuck/recipes/end_fence.json index 827b81466f..c20a0be3b4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:end_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/end_fence_gate.json index 177d485c4c..007dc1fb67 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:end_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/end_hanging_sign.json index 769b81aec9..d1b37662da 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:end_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_ladder.json b/src/main/generated/resources/data/minestuck/recipes/end_ladder.json index 9a0d1e6ebc..9301141b53 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:end_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_planks_slab.json b/src/main/generated/resources/data/minestuck/recipes/end_planks_slab.json index 58f2756c36..1fcf8109e8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_planks_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_planks_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:end_planks_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_planks_stairs.json b/src/main/generated/resources/data/minestuck/recipes/end_planks_stairs.json index 867950e09b..fa8f478d5e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_planks_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_planks_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:end_planks_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/end_pressure_plate.json index 8caaf4ef0b..3bcf5a4fcb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:end_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_sign.json b/src/main/generated/resources/data/minestuck/recipes/end_sign.json index e7291367e1..8eef104032 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:end_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/end_trapdoor.json index e183cd3d80..36745e727d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:end_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/end_wood.json b/src/main/generated/resources/data/minestuck/recipes/end_wood.json index 77701f612d..9b439e316f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/end_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/end_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:end_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/energy_core.json b/src/main/generated/resources/data/minestuck/recipes/energy_core.json index 636358972a..c9314da28c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/energy_core.json +++ b/src/main/generated/resources/data/minestuck/recipes/energy_core.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:energy_core" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/fan.json b/src/main/generated/resources/data/minestuck/recipes/fan.json index 101a680c5e..a0bced4838 100644 --- a/src/main/generated/resources/data/minestuck/recipes/fan.json +++ b/src/main/generated/resources/data/minestuck/recipes/fan.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:fan" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_slab.json index 11545b3714..b6048fe80d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:flowery_chalk_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_stairs.json index d15f23d850..f1543689ba 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:flowery_chalk_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_wall.json index a566da6841..9daef2cc57 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_chalk_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:flowery_chalk_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_slab.json index 14b1de69e3..98d6fb5793 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:flowery_frost_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_stairs.json index d7f756ae46..aa02e963ed 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:flowery_frost_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_wall.json index e7536e3194..cf2f89cd92 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_frost_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:flowery_frost_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_slab.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_slab.json index dbdd70b36e..aed0d81180 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:flowery_mossy_cobblestone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_stairs.json index 0288ce0144..210f8a4671 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:flowery_mossy_cobblestone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_wall.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_wall.json index 0696dc07be..1003fb739e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_cobblestone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:flowery_mossy_cobblestone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_slab.json index 76229461ac..28fc12a093 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:flowery_mossy_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_stairs.json index e188e27c9c..2b3cbbcfa7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:flowery_mossy_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_wall.json index 65c9fc3b76..0cfb3d3348 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mossy_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:flowery_mossy_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_slab.json index 523de23f63..c8d4b18968 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:flowery_mycelium_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_stairs.json index f3374a386d..087ab6c1d9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:flowery_mycelium_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_wall.json index 20dd01db3c..fa71b0e697 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_mycelium_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:flowery_mycelium_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/flowery_vine_wood.json b/src/main/generated/resources/data/minestuck/recipes/flowery_vine_wood.json index e9f8c1b099..84e1f1c9f7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/flowery_vine_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/flowery_vine_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:flowery_vine_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/fork.json b/src/main/generated/resources/data/minestuck/recipes/fork.json index f0a44f48d8..fa9f1f7dc7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/fork.json +++ b/src/main/generated/resources/data/minestuck/recipes/fork.json @@ -13,6 +13,5 @@ ], "result": { "item": "minestuck:fork" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/frost_bookshelf.json index d7b533e79b..ecd291cdf9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:frost_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/frost_brick_slab.json index 323571132c..2bc6d2136e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:frost_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/frost_brick_stairs.json index cbaf466111..f6f0c80d4f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:frost_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/frost_brick_wall.json index f4428e3468..1668806302 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:frost_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_bricks.json b/src/main/generated/resources/data/minestuck/recipes/frost_bricks.json index 9f95461769..a1faf7a1b3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:frost_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_column.json b/src/main/generated/resources/data/minestuck/recipes/frost_column.json index c8bd6ccbd1..42c523d9cc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:frost_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_door.json b/src/main/generated/resources/data/minestuck/recipes/frost_door.json index 726dd7d6b8..048f531837 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:frost_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_fence.json b/src/main/generated/resources/data/minestuck/recipes/frost_fence.json index 9b27a81676..5b48d1bbc9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:frost_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/frost_fence_gate.json index 6ff6751806..76a75670a5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:frost_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/frost_hanging_sign.json index 9ccc8f1570..b2b4a093c5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:frost_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_ladder.json b/src/main/generated/resources/data/minestuck/recipes/frost_ladder.json index 8db94130ef..aa6380e07e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:frost_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/frost_pressure_plate.json index e3ff3e0a30..8c652503ef 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:frost_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_sign.json b/src/main/generated/resources/data/minestuck/recipes/frost_sign.json index c402455291..2ae019212c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:frost_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_slab.json b/src/main/generated/resources/data/minestuck/recipes/frost_slab.json index b77d6a24b4..de448386c1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:frost_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_stairs.json b/src/main/generated/resources/data/minestuck/recipes/frost_stairs.json index 59e638cc7a..ae9ef73fb7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:frost_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_tile_slab.json b/src/main/generated/resources/data/minestuck/recipes/frost_tile_slab.json index 89e372c984..170810f74a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_tile_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_tile_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:frost_tile_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_tile_stairs.json b/src/main/generated/resources/data/minestuck/recipes/frost_tile_stairs.json index 8f5d8995b2..a80fbe4a5c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_tile_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_tile_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:frost_tile_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_tile_wall.json b/src/main/generated/resources/data/minestuck/recipes/frost_tile_wall.json index ecb11130e6..bd35c1da4e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_tile_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_tile_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:frost_tile_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/frost_trapdoor.json index 73c8a665f2..537bc8d411 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:frost_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/frost_wood.json b/src/main/generated/resources/data/minestuck/recipes/frost_wood.json index 826ad1d14f..264f220448 100644 --- a/src/main/generated/resources/data/minestuck/recipes/frost_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/frost_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:frost_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/glowing_bookshelf.json index b53881018a..d9805ffa31 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:glowing_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_door.json b/src/main/generated/resources/data/minestuck/recipes/glowing_door.json index d6d43ebe6b..391223e119 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:glowing_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_fence.json b/src/main/generated/resources/data/minestuck/recipes/glowing_fence.json index 08f5c61041..07c245922c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:glowing_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/glowing_fence_gate.json index e9ff3ed78c..25b9bd2007 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:glowing_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/glowing_hanging_sign.json index 93a00a6fd3..deeb704186 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:glowing_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_ladder.json b/src/main/generated/resources/data/minestuck/recipes/glowing_ladder.json index f18c1a81ab..2edaf78057 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:glowing_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/glowing_pressure_plate.json index b9a911e5ed..269df0d469 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:glowing_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_sign.json b/src/main/generated/resources/data/minestuck/recipes/glowing_sign.json index b3a6bd322e..10ff0dab2d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:glowing_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_slab.json b/src/main/generated/resources/data/minestuck/recipes/glowing_slab.json index af164c2c67..87c070a5f4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:glowing_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_stairs.json b/src/main/generated/resources/data/minestuck/recipes/glowing_stairs.json index 538c1405c4..61d5aabb86 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:glowing_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/glowing_trapdoor.json index 6f1c874b32..082d4e0348 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:glowing_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/glowing_wood.json b/src/main/generated/resources/data/minestuck/recipes/glowing_wood.json index dfb7ca7451..ec026917aa 100644 --- a/src/main/generated/resources/data/minestuck/recipes/glowing_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/glowing_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:glowing_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_embedded_ladder.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_embedded_ladder.json index ef0c7590f8..ff93bc7b38 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_embedded_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_embedded_ladder.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:green_stone_brick_embedded_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_slab.json index 2792b75a5b..cb24336e18 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:green_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_stairs.json index 924a50fa36..1af09f8e9b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:green_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_wall.json index 6cd68787a2..347305cab7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:green_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_bricks.json index eb3b45a950..79a4e897b8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:green_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_column.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_column.json index 4c0a42ca27..76e2ab5f4e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:green_stone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_pressure_plate.json index bde8dfae50..b02ea7d8f5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:green_stone_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_slab.json index 0b4711fe1d..d92ca663a0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:green_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_stairs.json index 332114df83..db12542fba 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:green_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/green_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/green_stone_wall.json index e18b644f93..9932bb5454 100644 --- a/src/main/generated/resources/data/minestuck/recipes/green_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/green_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:green_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/grist_costs/grass.json b/src/main/generated/resources/data/minestuck/recipes/grist_costs/short_grass.json similarity index 74% rename from src/main/generated/resources/data/minestuck/recipes/grist_costs/grass.json rename to src/main/generated/resources/data/minestuck/recipes/grist_costs/short_grass.json index 8c098c150d..aef903f0ac 100644 --- a/src/main/generated/resources/data/minestuck/recipes/grist_costs/grass.json +++ b/src/main/generated/resources/data/minestuck/recipes/grist_costs/short_grass.json @@ -4,6 +4,6 @@ "minestuck:build": 1 }, "ingredient": { - "item": "minecraft:grass" + "item": "minecraft:short_grass" } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/grub_sauce.json b/src/main/generated/resources/data/minestuck/recipes/grub_sauce.json index a5c5bf9883..dad5bd1ad5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/grub_sauce.json +++ b/src/main/generated/resources/data/minestuck/recipes/grub_sauce.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:grub_sauce" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_bookshelf.json index 5619fb5f66..18c15ef584 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:heart_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_carved_planks.json index c0dd39ac98..1e52bda6ec 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:heart_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_door.json index 32f99c51ba..71584ae4c5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:heart_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_fence.json index 8c47d22d83..a90dd147c6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:heart_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_fence_gate.json index 034d24e7b2..55b973525c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:heart_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_hanging_sign.json index 5a0a209d81..1f234cea93 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:heart_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_ladder.json index d9b60c64b3..85e9e707b5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:heart_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_pressure_plate.json index 905f9cc040..0627b93513 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:heart_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_sign.json index 65dfafb2f0..f392510250 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:heart_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_slab.json index a81f7e6fee..f001623f9b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:heart_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_stairs.json index 7490ea1ae6..a3de153b52 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:heart_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_stripped_wood.json index 1deea03cdb..03af6e3305 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:heart_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_trapdoor.json index c719452c13..50c6b83a44 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:heart_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_wood.json index 249cdfe599..70d1fde5de 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heart_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/heart_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:heart_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/heat_lamp.json b/src/main/generated/resources/data/minestuck/recipes/heat_lamp.json index c2c78689db..f0b5814d38 100644 --- a/src/main/generated/resources/data/minestuck/recipes/heat_lamp.json +++ b/src/main/generated/resources/data/minestuck/recipes/heat_lamp.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:heat_lamp" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_bookshelf.json index 19f729bf08..2e11b2c473 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:hope_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_carved_planks.json index c58f24c1ba..86bd3e7328 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:hope_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_door.json index fa0f51429f..f63d9f16e2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:hope_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_fence.json index c2c1ea6736..8a63fb9825 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:hope_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_fence_gate.json index 4f88bec997..2aa997abe9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:hope_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_hanging_sign.json index 798586fd84..7b469476fb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:hope_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_ladder.json index 87420a6692..1730b165de 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:hope_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_pressure_plate.json index 08fcff7589..7415dc6d72 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:hope_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_sign.json index 2842e81941..3b58b99755 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:hope_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_slab.json index 8cd19c27d2..aaadc39753 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:hope_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_stairs.json index a3388e3646..2067aad687 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:hope_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_stripped_wood.json index 90f1a62925..7311a015e1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:hope_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_trapdoor.json index b6522e4aff..376102e0f0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:hope_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_wood.json index 8be63fbc49..1f5d35fa23 100644 --- a/src/main/generated/resources/data/minestuck/recipes/hope_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/hope_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:hope_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_slab.json index 40828ff92f..61d6b435d7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:horizontal_green_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_stairs.json index 9f89898d77..e50c2f1972 100644 --- a/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:horizontal_green_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_wall.json index 2e5fca1e89..fc16c1faca 100644 --- a/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:horizontal_green_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_bricks.json index de5b3146f0..0a66577df4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/horizontal_green_stone_bricks.json @@ -12,6 +12,5 @@ "result": { "count": 2, "item": "minestuck:horizontal_green_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/horn.json b/src/main/generated/resources/data/minestuck/recipes/horn.json index 4560eb5670..73607c887a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/horn.json +++ b/src/main/generated/resources/data/minestuck/recipes/horn.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:horn" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/house_key.json b/src/main/generated/resources/data/minestuck/recipes/house_key.json index d8d02e977d..9566294ec3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/house_key.json +++ b/src/main/generated/resources/data/minestuck/recipes/house_key.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:house_key" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/igneous_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/igneous_stone_pressure_plate.json index 12c9022aaa..61ed897205 100644 --- a/src/main/generated/resources/data/minestuck/recipes/igneous_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/igneous_stone_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:igneous_stone_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/igneous_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/igneous_stone_slab.json index c35aad3513..617da6052a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/igneous_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/igneous_stone_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:igneous_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/igneous_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/igneous_stone_stairs.json index 0eac56a58b..959182d809 100644 --- a/src/main/generated/resources/data/minestuck/recipes/igneous_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/igneous_stone_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:igneous_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/igneous_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/igneous_stone_wall.json index 9f7e2d92a6..cbdbb72569 100644 --- a/src/main/generated/resources/data/minestuck/recipes/igneous_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/igneous_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:igneous_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/iron_cane.json b/src/main/generated/resources/data/minestuck/recipes/iron_cane.json index b7456493db..dee355c05c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/iron_cane.json +++ b/src/main/generated/resources/data/minestuck/recipes/iron_cane.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:iron_cane" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/item_magnet.json b/src/main/generated/resources/data/minestuck/recipes/item_magnet.json index 5da5515ddc..91431d5a74 100644 --- a/src/main/generated/resources/data/minestuck/recipes/item_magnet.json +++ b/src/main/generated/resources/data/minestuck/recipes/item_magnet.json @@ -22,6 +22,5 @@ ], "result": { "item": "minestuck:item_magnet" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/katana.json b/src/main/generated/resources/data/minestuck/recipes/katana.json index a7616b360f..4ab41a5a8d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/katana.json +++ b/src/main/generated/resources/data/minestuck/recipes/katana.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:katana" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/knitting_needle.json b/src/main/generated/resources/data/minestuck/recipes/knitting_needle.json index 690a331a26..822d4f45ec 100644 --- a/src/main/generated/resources/data/minestuck/recipes/knitting_needle.json +++ b/src/main/generated/resources/data/minestuck/recipes/knitting_needle.json @@ -17,6 +17,5 @@ "result": { "count": 2, "item": "minestuck:knitting_needle" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_fence.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_fence.json index f45d458511..cb83ee2d12 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:lacquered_chipboard_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_fence_gate.json index f53b84083f..22c2ff1c87 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:lacquered_chipboard_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_pressure_plate.json index cb6851e964..57077e384c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:lacquered_chipboard_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_slab.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_slab.json index 0ae7bea5d6..20fcf8903e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:lacquered_chipboard_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_stairs.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_stairs.json index 0c6def5a8b..e94fe842ce 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_chipboard_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:lacquered_chipboard_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_door.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_door.json index eae7c89cd9..f604c97a7e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:lacquered_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_fence.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_fence.json index 6557352808..61c2c50430 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:lacquered_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_fence_gate.json index cc19c8cacf..463ddddc6e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:lacquered_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_hanging_sign.json index 41b5a9bfcd..3172948923 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:lacquered_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_heavy_plank_slab.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_heavy_plank_slab.json index 1cdd9cfb89..b0664c1cda 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_heavy_plank_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_heavy_plank_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:lacquered_heavy_plank_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_heavy_plank_stairs.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_heavy_plank_stairs.json index 9067c11270..c6409a99d7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_heavy_plank_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_heavy_plank_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:lacquered_heavy_plank_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_pressure_plate.json index 671f659883..467ac596a3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:lacquered_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_sign.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_sign.json index 7d4b5c04c6..347716c2fb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:lacquered_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_slab.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_slab.json index 60dcf4d7d0..39667778a5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:lacquered_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_stairs.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_stairs.json index 45faa327ca..4d21539a36 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:lacquered_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_trapdoor.json index 7367998444..2d105a4ea8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:lacquered_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_fence.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_fence.json index 7cc867bb24..2bd2469491 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:lacquered_uncarved_wood_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_fence_gate.json index 1aedfb0db5..8f99b12f07 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:lacquered_uncarved_wood_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_pressure_plate.json index d71ab6e009..128f787203 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:lacquered_uncarved_wood_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_slab.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_slab.json index 3aa8ee0c5b..089da014fc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:lacquered_uncarved_wood_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_stairs.json b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_stairs.json index b34bcd7e67..e7a80b3ca9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/lacquered_uncarved_wood_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:lacquered_uncarved_wood_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_bookshelf.json index 7af1af1f1e..b52d585c5e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:life_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_carved_planks.json index c9f27d35c4..83939f0bc7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:life_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_door.json index 01eb605c6e..bf349599b9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:life_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_fence.json index 92dc1eaed7..4b0c077124 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:life_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_fence_gate.json index 081305d47d..8f9ab7e14c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:life_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_hanging_sign.json index df14950d3a..9371747a4c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:life_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_ladder.json index 69d899adc8..94c1eb16fe 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:life_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_pressure_plate.json index c0b4095587..44b9be804b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:life_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_sign.json index 35cffff19c..fb71a9d791 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:life_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_slab.json index 6113d61602..4787e3b567 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:life_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_stairs.json index e23c90220b..1a4f98a3e0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:life_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_stripped_wood.json index 54a4ee483c..427fe0539b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:life_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_trapdoor.json index 8d6c063efe..d70b61c462 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:life_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/life_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/life_aspect_wood.json index 58ee752e4d..63dff716fb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/life_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/life_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:life_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_bookshelf.json index 0b95eb86ff..33acde0eb0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:light_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_carved_planks.json index 4eb673f36b..968a08cdbc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:light_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_door.json index 066a4233dc..020fca4997 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:light_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_fence.json index df598d0621..32e6e2ae7e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:light_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_fence_gate.json index 44f38271a4..c2a32e68d5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:light_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_hanging_sign.json index 665ceefdb1..d394e7638b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:light_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_ladder.json index 6ef4cbaebb..be1a83bd0c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:light_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_pressure_plate.json index 8c4be31443..c471a5d9ce 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:light_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_sign.json index ca2e191758..46ef396f75 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:light_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_slab.json index 059589e1c3..aa8edab3cf 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:light_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_stairs.json index 6aedec8ed7..47d1673a03 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:light_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_stripped_wood.json index a8cfc6ad5b..733339b00a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:light_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_trapdoor.json index 8c7f2a8380..4d7c6db5e0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:light_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/light_aspect_wood.json index a3dee3e2f7..b00e74274e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:light_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_slab.json index 69bc129ccf..96eeda8ad0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:light_gray_chess_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_pressure_plate.json index 964f7a4826..2ad3309dd1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:light_gray_chess_brick_smooth_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_slab.json b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_slab.json index 0470006610..0742fa8a50 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:light_gray_chess_brick_smooth_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_stairs.json b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_stairs.json index 493f30c683..5b0644c8de 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:light_gray_chess_brick_smooth_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_wall.json b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_wall.json index 168ee6d200..7e98091c5b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_smooth_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:light_gray_chess_brick_smooth_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_stairs.json index c4803e552e..338bdfe18f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:light_gray_chess_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_wall.json index 62ed13e475..04d94ad990 100644 --- a/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/light_gray_chess_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:light_gray_chess_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/lip_balm.json b/src/main/generated/resources/data/minestuck/recipes/lip_balm.json index def76cfdb2..9d47582eda 100644 --- a/src/main/generated/resources/data/minestuck/recipes/lip_balm.json +++ b/src/main/generated/resources/data/minestuck/recipes/lip_balm.json @@ -15,6 +15,5 @@ ], "result": { "item": "minestuck:lip_balm" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/macuahuitl.json b/src/main/generated/resources/data/minestuck/recipes/macuahuitl.json index b2e6a60ff9..a36c39926b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/macuahuitl.json +++ b/src/main/generated/resources/data/minestuck/recipes/macuahuitl.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:macuahuitl" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_slab.json index 6b82d9f6b2..3943e48b57 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:magmatic_black_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_stairs.json index 7b16c0ed0e..884fdf8f61 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:magmatic_black_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_wall.json index f60e530bf7..655f368fdb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:magmatic_black_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_bricks.json index 2e21c12edd..5f47766212 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_black_stone_bricks.json @@ -16,6 +16,5 @@ "result": { "count": 4, "item": "minestuck:magmatic_black_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_slab.json index 792b41090c..340f08fc18 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:magmatic_polished_igneous_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_stairs.json index fbc3244e2d..587667fb21 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:magmatic_polished_igneous_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_wall.json index b44701f685..acba4ceca8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:magmatic_polished_igneous_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_bricks.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_bricks.json index 143ac38f48..bc73546b1d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:magmatic_polished_igneous_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_bricks_from_magma.json b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_bricks_from_magma.json index 91f845eabb..1fb5eb17a2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_bricks_from_magma.json +++ b/src/main/generated/resources/data/minestuck/recipes/magmatic_polished_igneous_bricks_from_magma.json @@ -16,6 +16,5 @@ "result": { "count": 4, "item": "minestuck:magmatic_polished_igneous_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mailbox.json b/src/main/generated/resources/data/minestuck/recipes/mailbox.json index fbd6d82fab..7fe53c8d00 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mailbox.json +++ b/src/main/generated/resources/data/minestuck/recipes/mailbox.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:mailbox" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/makeshift_claws_drawn.json b/src/main/generated/resources/data/minestuck/recipes/makeshift_claws_drawn.json index 678c49850b..a05eb702f6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/makeshift_claws_drawn.json +++ b/src/main/generated/resources/data/minestuck/recipes/makeshift_claws_drawn.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:makeshift_claws_drawn" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_bookshelf.json index d804643672..14ed6c94a1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:mind_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_carved_planks.json index 616ce24e0e..1957dfffa3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:mind_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_door.json index 23d6112be9..75b33f2561 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:mind_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_fence.json index 5db89d79fe..beda6c1035 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:mind_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_fence_gate.json index cb85b72c9a..4dd4bbb04f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:mind_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_hanging_sign.json index 1e426b59d8..72e2cccb58 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:mind_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_ladder.json index 66f9f89b35..dcdd52c13e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:mind_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_pressure_plate.json index 61ab4d084c..c3033a3a6a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:mind_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_sign.json index 94879a234e..cb3abf5324 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:mind_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_slab.json index f1bb7642e8..0d9515316e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:mind_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_stairs.json index fb8690a011..233b27fec7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:mind_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_stripped_wood.json index feac0e1223..f7bfac7d7a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:mind_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_trapdoor.json index 79e0a612f0..b3909aeae0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:mind_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_wood.json index 1aacba2443..eaa7072071 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mind_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/mind_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:mind_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_slab.json index fc967ceaf1..dd61082a56 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:mossy_chalk_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_stairs.json index 7a1ff59d1c..d03e1903da 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:mossy_chalk_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_wall.json index bdd32aa63a..b6b324d0d0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_chalk_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:mossy_chalk_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_slab.json index 99a7313014..3ed8a8e3e2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:mossy_decrepit_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_stairs.json index 817a82f12b..bf4d07e6f3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:mossy_decrepit_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_wall.json index eaee7ed91d..bbda883abb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_decrepit_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:mossy_decrepit_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_slab.json index 91927fbdbf..d374c7725a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:mossy_mycelium_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_stairs.json index bbb56484c1..cb66e2761e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:mossy_mycelium_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_wall.json index 986057aa1e..6005265d64 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_mycelium_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:mossy_mycelium_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_slab.json index 8b400548b5..d39b0558e0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:mossy_pink_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_stairs.json index edaecca4f6..49bb04aa4c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:mossy_pink_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_wall.json index cf8cb879f4..1975aa0850 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_pink_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:mossy_pink_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_slab.json index 8826de586f..f6d2b181b4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:mossy_shade_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_stairs.json index ce9aebfd69..2885d796e1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:mossy_shade_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_wall.json index 6c8d356e9c..f89278f2cd 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/mossy_shade_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:mossy_shade_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_slab.json index f2d56994b2..62cb0d6872 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:mycelium_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_stairs.json index f651f7c3d4..95df0f49ca 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:mycelium_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_wall.json index 4304c05b0f..47c93534fb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:mycelium_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_bricks.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_bricks.json index f6b09b72d7..59484ac3ad 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:mycelium_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_slab.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_slab.json index 84bbf553f2..6afaab334c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:mycelium_cobblestone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_stairs.json index 1308954f5a..a414f78179 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:mycelium_cobblestone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_wall.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_wall.json index 6ee1e5b3b5..0da59d8d15 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_cobblestone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:mycelium_cobblestone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_column.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_column.json index 8a4af2eab6..312cf90559 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:mycelium_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_slab.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_slab.json index b3f4650a56..4269672949 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:mycelium_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_stairs.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_stairs.json index 25016fb7d7..f815845650 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:mycelium_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_stone_pressure_plate.json index fcd3fe799e..235fc16003 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_stone_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:mycelium_stone_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/mycelium_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/mycelium_stone_wall.json index 034c0892e4..f8a91fa6bc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/mycelium_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/mycelium_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:mycelium_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/obsidian_axe_knife.json b/src/main/generated/resources/data/minestuck/recipes/obsidian_axe_knife.json index 05c7bfc1d3..7845efe56a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/obsidian_axe_knife.json +++ b/src/main/generated/resources/data/minestuck/recipes/obsidian_axe_knife.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:obsidian_axe_knife" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_door.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_door.json index 0391e5ffee..222f9118f7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:perfectly_generic_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_fence.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_fence.json index 85e513b24f..a5239725a7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:perfectly_generic_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_fence_gate.json index 09f1be1320..5fe93bfd9b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:perfectly_generic_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_hanging_sign.json index 0ee2488fe0..b1ad398559 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_hanging_sign.json @@ -17,6 +17,5 @@ "result": { "count": 6, "item": "minestuck:perfectly_generic_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_pressure_plate.json index 7606518d5e..c226f51466 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:perfectly_generic_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_sign.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_sign.json index ce618316c3..669725ee17 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_sign.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:perfectly_generic_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_slab.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_slab.json index 1b739779f7..8f5e32b617 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:perfectly_generic_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_stairs.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_stairs.json index 07bdc459d6..f834292aea 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:perfectly_generic_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_trapdoor.json index fb368c2600..cc3714791d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:perfectly_generic_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_wall.json b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_wall.json index 5cee36f42d..2431c4ba2e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/perfectly_generic_wall.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:perfectly_generic_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/petrified_wood.json b/src/main/generated/resources/data/minestuck/recipes/petrified_wood.json index 4bffb35c33..cf0cad8c1f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/petrified_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/petrified_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:petrified_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_slab.json index a4bf11ede8..c094f04722 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:pink_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_stairs.json index ade4169dc2..cebf99e845 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:pink_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_wall.json index 18a684665b..33a0ffc64f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:pink_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_bricks.json index 5ea5441289..cdb6df83b1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:pink_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_column.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_column.json index 5755729e0d..e7cac198c3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:pink_stone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_pressure_plate.json index 1d912343fc..66d0906470 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:pink_stone_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_slab.json index cbd49b76b2..8d69d3b9d1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:pink_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_stairs.json index 7c91f2124b..a063b19f62 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:pink_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pink_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/pink_stone_wall.json index 4db45f045c..8f907ee761 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pink_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/pink_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:pink_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/plutonium_core.json b/src/main/generated/resources/data/minestuck/recipes/plutonium_core.json index d8f8f23d72..b574c76d50 100644 --- a/src/main/generated/resources/data/minestuck/recipes/plutonium_core.json +++ b/src/main/generated/resources/data/minestuck/recipes/plutonium_core.json @@ -22,6 +22,5 @@ ], "result": { "item": "minestuck:plutonium_core" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pointy_stick.json b/src/main/generated/resources/data/minestuck/recipes/pointy_stick.json index 84791e5d63..1ecdcae3cb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pointy_stick.json +++ b/src/main/generated/resources/data/minestuck/recipes/pointy_stick.json @@ -13,6 +13,5 @@ ], "result": { "item": "minestuck:pointy_stick" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_slab.json index 0968da2809..dc03d181c2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_black_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_stairs.json index 61adc8988e..644e2c91be 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_black_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_wall.json index c9782882c8..cc144dddb9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_black_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_black_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_slab.json index c6c84c98fa..7d0764a5cf 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_brown_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_stairs.json index 3e7cc3a837..0a9b16f522 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_brown_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_wall.json index 796bbfe347..3f7e528425 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_brown_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_brown_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_chalk.json b/src/main/generated/resources/data/minestuck/recipes/polished_chalk.json index ca1f1f9860..39dc561ca9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_chalk.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_chalk.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:polished_chalk" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_chalk_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_chalk_slab.json index da8c496c2e..b232bb18c8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_chalk_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_chalk_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_chalk_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_chalk_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_chalk_stairs.json index 47fe92458e..9c0bae11f7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_chalk_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_chalk_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_chalk_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_chalk_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_chalk_wall.json index a693639a21..b4f70726b0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_chalk_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_chalk_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_chalk_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_block.json b/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_block.json index 62d33c38fa..68e0d7469b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_block.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_block.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:polished_cruxite_block" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_slab.json index 64fc76388d..1d020ec0ff 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_cruxite_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_stairs.json index 91cc801de7..2c85f95698 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_cruxite_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_wall.json index 62c8e62d24..edc5481999 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_cruxite_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_cruxite_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_green_stone.json b/src/main/generated/resources/data/minestuck/recipes/polished_green_stone.json index c608eed26b..6b53936765 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_green_stone.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_green_stone.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:polished_green_stone" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_slab.json index 61648b053e..6c60a1edb5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_green_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_stairs.json index ae8b139946..66a732b997 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_green_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_wall.json index 339aa327c6..b5b94b5004 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_green_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_green_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_slab.json index b2ac2676d7..2084cbfe53 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:polished_igneous_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_stairs.json index 6fc383b82f..ea9f263795 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:polished_igneous_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_wall.json index 2ca069dfc1..c370f886ff 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_igneous_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_bricks.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_bricks.json index dfe09db5a6..950f50ccc1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:polished_igneous_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_pillar.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_pillar.json index 29d531bf91..7bff7da7b0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_pillar.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_pillar.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:polished_igneous_pillar" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone.json index 058c4d8156..40a5129291 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:polished_igneous_stone" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_slab.json index 9a5907095c..c4749a4d5d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_igneous_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_stairs.json index 3143e451dd..d82c168b8b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_igneous_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_wall.json index fbdf31c905..bb583ef8c2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_igneous_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_igneous_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_lacquered_uncarved_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_lacquered_uncarved_slab.json index 4af2e60836..b5d6c16aed 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_lacquered_uncarved_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_lacquered_uncarved_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_lacquered_uncarved_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_lacquered_uncarved_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_lacquered_uncarved_stairs.json index 7aca5e3eb5..1827e6e5bc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_lacquered_uncarved_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_lacquered_uncarved_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_lacquered_uncarved_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_slab.json index 1b3d9d96fc..69a37f1d35 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_mycelium_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_stairs.json index 713e7d1f68..3922ca54f0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_mycelium_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_wall.json index a63843483c..619bd36685 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_mycelium_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_mycelium_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_slab.json index f932a98b42..ea24933f5a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_pink_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_stairs.json index 0d42d44e31..a9f72e8467 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_pink_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_wall.json index f268110ee7..8bf57d24e7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_pink_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:polished_pink_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_treated_uncarved_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_treated_uncarved_slab.json index 57376f5c9d..ed22ba06ff 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_treated_uncarved_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_treated_uncarved_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_treated_uncarved_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_treated_uncarved_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_treated_uncarved_stairs.json index 9c19aa2375..bab5f71be9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_treated_uncarved_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_treated_uncarved_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_treated_uncarved_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_uncarved_slab.json b/src/main/generated/resources/data/minestuck/recipes/polished_uncarved_slab.json index 72e1547b57..6f8825dd7c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_uncarved_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_uncarved_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:polished_uncarved_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/polished_uncarved_stairs.json b/src/main/generated/resources/data/minestuck/recipes/polished_uncarved_stairs.json index 063403e1e4..2aba7597fe 100644 --- a/src/main/generated/resources/data/minestuck/recipes/polished_uncarved_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/polished_uncarved_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:polished_uncarved_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/pumice_brick_slab.json index 59070538ef..ef25703b28 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:pumice_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/pumice_brick_stairs.json index 70a5fd41f2..dd37c50363 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:pumice_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/pumice_brick_wall.json index 806bcd564c..b0b8082a88 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:pumice_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_bricks.json b/src/main/generated/resources/data/minestuck/recipes/pumice_bricks.json index 087d1e7503..e21c414995 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:pumice_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_stone_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/pumice_stone_pressure_plate.json index 6c2e431ef1..6890972a53 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_stone_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_stone_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:pumice_stone_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/pumice_stone_slab.json index d316c0e74a..3a86fac89c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_stone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:pumice_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/pumice_stone_stairs.json index 701d9e2c7d..10d59e871b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_stone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:pumice_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/pumice_stone_wall.json index b2b70912c1..91efdf2d0b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:pumice_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_tile_slab.json b/src/main/generated/resources/data/minestuck/recipes/pumice_tile_slab.json index 8ddc09275c..87f1c08f72 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_tile_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_tile_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:pumice_tile_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_tile_stairs.json b/src/main/generated/resources/data/minestuck/recipes/pumice_tile_stairs.json index d1a8e7b066..d4a7e685a7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_tile_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_tile_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:pumice_tile_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_tile_wall.json b/src/main/generated/resources/data/minestuck/recipes/pumice_tile_wall.json index 39e4f76cb2..d90409d1cd 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_tile_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_tile_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:pumice_tile_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/pumice_tiles.json b/src/main/generated/resources/data/minestuck/recipes/pumice_tiles.json index da8aeb07ca..832af318af 100644 --- a/src/main/generated/resources/data/minestuck/recipes/pumice_tiles.json +++ b/src/main/generated/resources/data/minestuck/recipes/pumice_tiles.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:pumice_tiles" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/queue_modus_card.json b/src/main/generated/resources/data/minestuck/recipes/queue_modus_card.json index 5a5650e118..a13fafd517 100644 --- a/src/main/generated/resources/data/minestuck/recipes/queue_modus_card.json +++ b/src/main/generated/resources/data/minestuck/recipes/queue_modus_card.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:queue_modus_card" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_bookshelf.json index a0b471a765..09ac6e16fe 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:rage_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_carved_planks.json index 38ae9c1a89..101b942d1f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:rage_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_door.json index 4c718b6bbd..634d9e0744 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:rage_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_fence.json index 49b7e17e48..34cd09db3b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:rage_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_fence_gate.json index 09b6039eaa..9677f6e8ae 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:rage_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_hanging_sign.json index dd20fdb31e..23ea1cb97b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:rage_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_ladder.json index a6e9e00e9c..bd8b828d3e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:rage_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_pressure_plate.json index 7b07dd71b4..c87e0dbcab 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:rage_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_sign.json index a6968b5090..cd06633c4e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:rage_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_slab.json index 7864bf5e81..cfb19b433b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:rage_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_stairs.json index 888e197dff..e8aaf716da 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:rage_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_stripped_wood.json index 46bcdb5cb7..29b9b005b6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:rage_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_trapdoor.json index 6b8b0ab058..1f10e4200b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:rage_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_wood.json index ed50da9908..f86b3fb9d2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rage_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/rage_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:rage_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_bookshelf.json index b8cd19620c..eaa3757ef9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:rainbow_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_door.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_door.json index cb9dd63ddf..a5a216ce9f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:rainbow_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_fence.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_fence.json index 65caa4a9bc..1eba84d4c8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:rainbow_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_fence_gate.json index dd9ec4e038..95ff3916f4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:rainbow_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_hanging_sign.json index 7f2a7a3ff0..f48327b7f2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:rainbow_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_ladder.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_ladder.json index 48f55d63d0..9e06ca41ef 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:rainbow_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_planks_slab.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_planks_slab.json index f93c4e5f4b..9219b74942 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_planks_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_planks_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:rainbow_planks_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_planks_stairs.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_planks_stairs.json index d63583b125..4875c2cf15 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_planks_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_planks_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:rainbow_planks_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_pressure_plate.json index 37e996a488..67f794d267 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:rainbow_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_sign.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_sign.json index ba165435d1..535a4b89bc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:rainbow_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_trapdoor.json index 14f31df644..28d858b1ca 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:rainbow_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rainbow_wood.json b/src/main/generated/resources/data/minestuck/recipes/rainbow_wood.json index bd519d52a5..5b5c3608d7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rainbow_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/rainbow_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:rainbow_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/red_sandstone_column.json b/src/main/generated/resources/data/minestuck/recipes/red_sandstone_column.json index 3c5a40b9fc..1fc17385f8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/red_sandstone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/red_sandstone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:red_sandstone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/redstone_clock.json b/src/main/generated/resources/data/minestuck/recipes/redstone_clock.json index e58e374e7e..d97697dee9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/redstone_clock.json +++ b/src/main/generated/resources/data/minestuck/recipes/redstone_clock.json @@ -25,6 +25,5 @@ ], "result": { "item": "minestuck:redstone_clock" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/remote_comparator.json b/src/main/generated/resources/data/minestuck/recipes/remote_comparator.json index edcfe6e326..06b4f9d815 100644 --- a/src/main/generated/resources/data/minestuck/recipes/remote_comparator.json +++ b/src/main/generated/resources/data/minestuck/recipes/remote_comparator.json @@ -22,6 +22,5 @@ ], "result": { "item": "minestuck:remote_comparator" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/retractable_spikes.json b/src/main/generated/resources/data/minestuck/recipes/retractable_spikes.json index db3550b1f1..0dd0e2b7b0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/retractable_spikes.json +++ b/src/main/generated/resources/data/minestuck/recipes/retractable_spikes.json @@ -22,6 +22,5 @@ ], "result": { "item": "minestuck:retractable_spikes" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rotator.json b/src/main/generated/resources/data/minestuck/recipes/rotator.json index 2a72d88bd6..2bfbf0d4a2 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rotator.json +++ b/src/main/generated/resources/data/minestuck/recipes/rotator.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:rotator" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/rotted_shadewood.json b/src/main/generated/resources/data/minestuck/recipes/rotted_shadewood.json index d0537f0f7d..65b06579ac 100644 --- a/src/main/generated/resources/data/minestuck/recipes/rotted_shadewood.json +++ b/src/main/generated/resources/data/minestuck/recipes/rotted_shadewood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:rotted_shadewood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/sandstone_column.json b/src/main/generated/resources/data/minestuck/recipes/sandstone_column.json index 862072b97b..ca5087f368 100644 --- a/src/main/generated/resources/data/minestuck/recipes/sandstone_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/sandstone_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:sandstone_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/scarred_shadewood.json b/src/main/generated/resources/data/minestuck/recipes/scarred_shadewood.json index 236a3db0fa..de836d1c9b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/scarred_shadewood.json +++ b/src/main/generated/resources/data/minestuck/recipes/scarred_shadewood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:scarred_shadewood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/shade_brick_slab.json index 8f19d22610..4981cc9365 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:shade_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/shade_brick_stairs.json index ca1d59ead2..a0d522692d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:shade_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/shade_brick_wall.json index c9981f4e19..1361005b53 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:shade_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_bricks.json b/src/main/generated/resources/data/minestuck/recipes/shade_bricks.json index 6631b0bef1..4c8abb0b8a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 4, "item": "minestuck:shade_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_column.json b/src/main/generated/resources/data/minestuck/recipes/shade_column.json index aa49f80e2a..783a168f63 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_column.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_column.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:shade_column" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/shade_pressure_plate.json index de46a951eb..566cb867e6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:shade_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_slab.json b/src/main/generated/resources/data/minestuck/recipes/shade_slab.json index 0f5de6743e..c53e44bd38 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:shade_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_stairs.json b/src/main/generated/resources/data/minestuck/recipes/shade_stairs.json index 2c8fe6d574..8c8fc608c1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:shade_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shade_wall.json b/src/main/generated/resources/data/minestuck/recipes/shade_wall.json index 84dbad9d07..33cf523eba 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shade_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/shade_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:shade_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood.json b/src/main/generated/resources/data/minestuck/recipes/shadewood.json index 74f690437b..5aa1b6f3f4 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:shadewood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_door.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_door.json index 04ed4185e1..ad406163e6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:shadewood_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_fence.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_fence.json index f801375f14..f1256c31ff 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:shadewood_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_fence_gate.json index 8d3b0b887a..a1dff42214 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:shadewood_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_hanging_sign.json index be759067b7..8201bd01db 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:shadewood_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_pressure_plate.json index 896547641e..8dc8965f67 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:shadewood_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_sign.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_sign.json index 20f95eb8fc..ccaa5ad2dd 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:shadewood_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_slab.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_slab.json index fd420d11ef..ef047aef91 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:shadewood_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_stairs.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_stairs.json index 50f5dc02af..3f43bb8ce5 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:shadewood_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shadewood_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/shadewood_trapdoor.json index d9f602943d..b4b2729c80 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shadewood_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/shadewood_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:shadewood_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/shuriken.json b/src/main/generated/resources/data/minestuck/recipes/shuriken.json index de1f329243..589b095f99 100644 --- a/src/main/generated/resources/data/minestuck/recipes/shuriken.json +++ b/src/main/generated/resources/data/minestuck/recipes/shuriken.json @@ -17,6 +17,5 @@ "result": { "count": 2, "item": "minestuck:shuriken" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/sickle.json b/src/main/generated/resources/data/minestuck/recipes/sickle.json index 02f1729491..98876f1dbc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/sickle.json +++ b/src/main/generated/resources/data/minestuck/recipes/sickle.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:sickle" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/skaianet_denier.json b/src/main/generated/resources/data/minestuck/recipes/skaianet_denier.json index 1b45b114cd..b093546e02 100644 --- a/src/main/generated/resources/data/minestuck/recipes/skaianet_denier.json +++ b/src/main/generated/resources/data/minestuck/recipes/skaianet_denier.json @@ -22,6 +22,5 @@ ], "result": { "item": "minestuck:skaianet_denier" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/sledge_hammer.json b/src/main/generated/resources/data/minestuck/recipes/sledge_hammer.json index f1be1101f3..c8e7b13e10 100644 --- a/src/main/generated/resources/data/minestuck/recipes/sledge_hammer.json +++ b/src/main/generated/resources/data/minestuck/recipes/sledge_hammer.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:sledge_hammer" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_slab.json b/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_slab.json index f8f2fe40cb..468af8c26b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:smooth_shade_stone_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_stairs.json b/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_stairs.json index 87f40a2d07..6902a96aaf 100644 --- a/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:smooth_shade_stone_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_wall.json b/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_wall.json index 86b0b5d969..e836482201 100644 --- a/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/smooth_shade_stone_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:smooth_shade_stone_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/solid_switch.json b/src/main/generated/resources/data/minestuck/recipes/solid_switch.json index 00fb414720..4bebe8453e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/solid_switch.json +++ b/src/main/generated/resources/data/minestuck/recipes/solid_switch.json @@ -20,6 +20,5 @@ "result": { "count": 2, "item": "minestuck:solid_switch" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_bookshelf.json index c55080c3af..e3c7bb24ce 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:space_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_carved_planks.json index f70e9bc008..8646872c03 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:space_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_door.json index 632cbfab35..e83d30c3cb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:space_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_fence.json index 0b3caa3240..31cec3fae7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:space_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_fence_gate.json index 219b699395..7f078c5c17 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:space_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_hanging_sign.json index 31df798f80..4553bc39df 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:space_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_ladder.json index 289bba39bd..e1bfaa8817 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:space_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_pressure_plate.json index 9034b9b735..748f0e9970 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:space_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_sign.json index 82d8b5dd1a..46a09e8865 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:space_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_slab.json index 790a0cb54e..f3210d9ec7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:space_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_stairs.json index ba27b2d3fb..58677bc75f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:space_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_stripped_wood.json index a02fbe69fb..66ef1d4c97 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:space_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_trapdoor.json index 1c71150c72..dad8874e9a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:space_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/space_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/space_aspect_wood.json index ce45855d53..ebcaf1df64 100644 --- a/src/main/generated/resources/data/minestuck/recipes/space_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/space_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:space_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/spikes.json b/src/main/generated/resources/data/minestuck/recipes/spikes.json index 5070c3f2c6..7cb585a1de 100644 --- a/src/main/generated/resources/data/minestuck/recipes/spikes.json +++ b/src/main/generated/resources/data/minestuck/recipes/spikes.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:spikes" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/stack_modus_card.json b/src/main/generated/resources/data/minestuck/recipes/stack_modus_card.json index fbc41ff5c0..e11d55565e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/stack_modus_card.json +++ b/src/main/generated/resources/data/minestuck/recipes/stack_modus_card.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:stack_modus_card" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/steep_green_stone_brick_stairs_base.json b/src/main/generated/resources/data/minestuck/recipes/steep_green_stone_brick_stairs_base.json index 5cdafa9f97..43a1196fc0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/steep_green_stone_brick_stairs_base.json +++ b/src/main/generated/resources/data/minestuck/recipes/steep_green_stone_brick_stairs_base.json @@ -12,6 +12,5 @@ "result": { "count": 2, "item": "minestuck:steep_green_stone_brick_stairs_base" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/steep_green_stone_brick_stairs_top.json b/src/main/generated/resources/data/minestuck/recipes/steep_green_stone_brick_stairs_top.json index e15143ec60..cc2de0e0ea 100644 --- a/src/main/generated/resources/data/minestuck/recipes/steep_green_stone_brick_stairs_top.json +++ b/src/main/generated/resources/data/minestuck/recipes/steep_green_stone_brick_stairs_top.json @@ -13,6 +13,5 @@ "result": { "count": 2, "item": "minestuck:steep_green_stone_brick_stairs_top" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/strawberry.json b/src/main/generated/resources/data/minestuck/recipes/strawberry.json index 3dcf843f3c..5dd1ce5c10 100644 --- a/src/main/generated/resources/data/minestuck/recipes/strawberry.json +++ b/src/main/generated/resources/data/minestuck/recipes/strawberry.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:strawberry" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/stripped_rotted_shadewood.json b/src/main/generated/resources/data/minestuck/recipes/stripped_rotted_shadewood.json index 2a759de362..627494146a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/stripped_rotted_shadewood.json +++ b/src/main/generated/resources/data/minestuck/recipes/stripped_rotted_shadewood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:stripped_rotted_shadewood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/stripped_scarred_shadewood.json b/src/main/generated/resources/data/minestuck/recipes/stripped_scarred_shadewood.json index 6c1c92686f..d3fdde1bad 100644 --- a/src/main/generated/resources/data/minestuck/recipes/stripped_scarred_shadewood.json +++ b/src/main/generated/resources/data/minestuck/recipes/stripped_scarred_shadewood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:stripped_scarred_shadewood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/stripped_shadewood.json b/src/main/generated/resources/data/minestuck/recipes/stripped_shadewood.json index 9bfbd403e0..9976dd9608 100644 --- a/src/main/generated/resources/data/minestuck/recipes/stripped_shadewood.json +++ b/src/main/generated/resources/data/minestuck/recipes/stripped_shadewood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:stripped_shadewood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/sugar_cube.json b/src/main/generated/resources/data/minestuck/recipes/sugar_cube.json index 4bf4ee2a48..7848932db8 100644 --- a/src/main/generated/resources/data/minestuck/recipes/sugar_cube.json +++ b/src/main/generated/resources/data/minestuck/recipes/sugar_cube.json @@ -13,6 +13,5 @@ ], "result": { "item": "minestuck:sugar_cube" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_slab.json index 54752f2c4d..6b2ab70b92 100644 --- a/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:tar_shade_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_stairs.json index 48814aec1c..ebecb8f213 100644 --- a/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:tar_shade_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_wall.json index 93d596b5e0..698bed41e6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/tar_shade_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:tar_shade_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/temple_scanner.json b/src/main/generated/resources/data/minestuck/recipes/temple_scanner.json index f5fe5650f4..b190e3a065 100644 --- a/src/main/generated/resources/data/minestuck/recipes/temple_scanner.json +++ b/src/main/generated/resources/data/minestuck/recipes/temple_scanner.json @@ -25,6 +25,5 @@ ], "result": { "item": "minestuck:temple_scanner" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_bookshelf.json index d52cc9e79e..4dc0c385a7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:time_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_carved_planks.json index 975df9b3c8..bda815518d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:time_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_door.json index 243143b7fa..dbc1b2ebea 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:time_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_fence.json index d0d2388e88..46da1aa139 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:time_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_fence_gate.json index e9478b631e..9e1b09135a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:time_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_hanging_sign.json index 0832fe7bb6..7631b3ec2b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:time_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_ladder.json index c3d3975c22..4d589ed2bc 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:time_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_pressure_plate.json index 1bdee32054..9638f7b37c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:time_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_sign.json index 259ab1db86..1d041bb98e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:time_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_slab.json index 8260bb33f8..49242fdc86 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:time_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_stairs.json index 2c40c7a773..84108ed796 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:time_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_stripped_wood.json index 065595123d..257044de37 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:time_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_trapdoor.json index 1d235b2ad2..8c8d0673ec 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:time_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/time_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/time_aspect_wood.json index dda0a93dc8..29c96d319a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/time_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/time_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:time_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/toggler.json b/src/main/generated/resources/data/minestuck/recipes/toggler.json index 7b477a5625..c2ac170b1f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/toggler.json +++ b/src/main/generated/resources/data/minestuck/recipes/toggler.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:toggler" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/treated_bookshelf.json index 149c62eb49..3389936b95 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:treated_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_fence.json b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_fence.json index 091d1357ec..98eb1fa48e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:treated_chipboard_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_fence_gate.json index ed8fd41556..08d765306b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:treated_chipboard_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_pressure_plate.json index 1403767ddb..54f8d81073 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:treated_chipboard_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_slab.json b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_slab.json index 4747e254ea..798c184198 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:treated_chipboard_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_stairs.json b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_stairs.json index b7eec22ce2..c02a36917f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_chipboard_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:treated_chipboard_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_door.json b/src/main/generated/resources/data/minestuck/recipes/treated_door.json index ab9a10ccbe..75e95aa8ef 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:treated_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_fence.json b/src/main/generated/resources/data/minestuck/recipes/treated_fence.json index 7506be7dd0..5b8ed7c10b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:treated_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/treated_fence_gate.json index a2b35ba8ca..8279773e74 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:treated_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/treated_hanging_sign.json index dc144e2fd7..2d9d3e1316 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:treated_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_heavy_plank_slab.json b/src/main/generated/resources/data/minestuck/recipes/treated_heavy_plank_slab.json index 319efb1357..8cfe07d310 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_heavy_plank_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_heavy_plank_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:treated_heavy_plank_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_heavy_plank_stairs.json b/src/main/generated/resources/data/minestuck/recipes/treated_heavy_plank_stairs.json index c5eb4305af..a3c3180e02 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_heavy_plank_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_heavy_plank_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:treated_heavy_plank_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_ladder.json b/src/main/generated/resources/data/minestuck/recipes/treated_ladder.json index 86765af9ee..5d8bc367f6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:treated_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_planks_slab.json b/src/main/generated/resources/data/minestuck/recipes/treated_planks_slab.json index 394ba9d30c..7fa72ee78b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_planks_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_planks_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:treated_planks_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_planks_stairs.json b/src/main/generated/resources/data/minestuck/recipes/treated_planks_stairs.json index 1e3e8cb26c..c9e2aa68e9 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_planks_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_planks_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:treated_planks_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/treated_pressure_plate.json index d22a76301f..cfa8ce970d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:treated_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_sign.json b/src/main/generated/resources/data/minestuck/recipes/treated_sign.json index e3e7bd2dec..0da7a603ad 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:treated_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/treated_trapdoor.json index c08c8e9c1c..8476fce24a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:treated_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_fence.json b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_fence.json index eb3bbe791b..4d39dab39f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:treated_uncarved_wood_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_fence_gate.json index 5cbb6a0aa5..af1c678beb 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:treated_uncarved_wood_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_pressure_plate.json index 49d8ff02bd..ba105ad116 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:treated_uncarved_wood_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_slab.json b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_slab.json index 150bd89498..f2ef6d6e22 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:treated_uncarved_wood_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_stairs.json b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_stairs.json index 41886da36b..3a5348f44d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/treated_uncarved_wood_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:treated_uncarved_wood_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/umbrella.json b/src/main/generated/resources/data/minestuck/recipes/umbrella.json index 0df38d5b36..2a1729d073 100644 --- a/src/main/generated/resources/data/minestuck/recipes/umbrella.json +++ b/src/main/generated/resources/data/minestuck/recipes/umbrella.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:umbrella" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_fence.json b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_fence.json index 644e0ff440..f78746855f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:uncarved_wood_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_fence_gate.json index f6d55de099..7bb45d00c6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:uncarved_wood_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_pressure_plate.json index d9415f63ba..4c4b5d418b 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:uncarved_wood_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_slab.json b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_slab.json index d4d636c8fe..4bf832f21d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:uncarved_wood_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_stairs.json b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_stairs.json index b4546501b5..849c33c536 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/uncarved_wood_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:uncarved_wood_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uranium_block.json b/src/main/generated/resources/data/minestuck/recipes/uranium_block.json index 528bf6abfc..8fde281d0d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uranium_block.json +++ b/src/main/generated/resources/data/minestuck/recipes/uranium_block.json @@ -13,6 +13,5 @@ ], "result": { "item": "minestuck:uranium_block" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uranium_cooker.json b/src/main/generated/resources/data/minestuck/recipes/uranium_cooker.json index f4da2b1849..9050c2ddb1 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uranium_cooker.json +++ b/src/main/generated/resources/data/minestuck/recipes/uranium_cooker.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:uranium_cooker" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uranium_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/uranium_pressure_plate.json index b3a98ec89a..b7fa51fcd3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uranium_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/uranium_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:uranium_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uranium_slab.json b/src/main/generated/resources/data/minestuck/recipes/uranium_slab.json index 96f4bb82cd..9127034326 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uranium_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/uranium_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:uranium_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uranium_stairs.json b/src/main/generated/resources/data/minestuck/recipes/uranium_stairs.json index f654dfd764..ca6aaea31d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uranium_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/uranium_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:uranium_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/uranium_wall.json b/src/main/generated/resources/data/minestuck/recipes/uranium_wall.json index 36e9eaa810..875e2df922 100644 --- a/src/main/generated/resources/data/minestuck/recipes/uranium_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/uranium_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:uranium_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_slab.json index d53b8d34f9..6913abf677 100644 --- a/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:vertical_green_stone_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_stairs.json index 3656f7fe18..9562a45bb6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:vertical_green_stone_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_wall.json index dff3a9efd7..cf5415bc22 100644 --- a/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:vertical_green_stone_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_bricks.json b/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_bricks.json index c5c2099792..1a5b41637e 100644 --- a/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_bricks.json +++ b/src/main/generated/resources/data/minestuck/recipes/vertical_green_stone_bricks.json @@ -13,6 +13,5 @@ "result": { "count": 2, "item": "minestuck:vertical_green_stone_bricks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/vine_wood.json b/src/main/generated/resources/data/minestuck/recipes/vine_wood.json index 93bb1131be..69cab00d4a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/vine_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/vine_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:vine_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_bookshelf.json index af8b805cfb..53092a71d7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_bookshelf.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_bookshelf.json @@ -17,6 +17,5 @@ ], "result": { "item": "minestuck:void_aspect_bookshelf" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_carved_planks.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_carved_planks.json index 40942fb2a4..5aeb46a6ab 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_carved_planks.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_carved_planks.json @@ -17,6 +17,5 @@ "result": { "count": 8, "item": "minestuck:void_aspect_carved_planks" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_door.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_door.json index 592aa6cb60..19b836bb70 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_door.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_door.json @@ -15,6 +15,5 @@ "result": { "count": 3, "item": "minestuck:void_aspect_door" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_fence.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_fence.json index e7e38aada3..4c092539b6 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_fence.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_fence.json @@ -17,6 +17,5 @@ "result": { "count": 3, "item": "minestuck:void_aspect_fence" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_fence_gate.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_fence_gate.json index c274a9cf57..d30ae0c793 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_fence_gate.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_fence_gate.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:void_aspect_fence_gate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_hanging_sign.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_hanging_sign.json index 7a8ced4029..d31982db00 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_hanging_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_hanging_sign.json @@ -18,6 +18,5 @@ "result": { "count": 6, "item": "minestuck:void_aspect_hanging_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_ladder.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_ladder.json index 36b0418449..f7a9a56a22 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_ladder.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_ladder.json @@ -18,6 +18,5 @@ "result": { "count": 4, "item": "minestuck:void_aspect_ladder" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_pressure_plate.json index 26fcaf96ce..134d24671c 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:void_aspect_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_sign.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_sign.json index fece9de840..fa160dc558 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_sign.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_sign.json @@ -18,6 +18,5 @@ "result": { "count": 3, "item": "minestuck:void_aspect_sign" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_slab.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_slab.json index 97b305f65e..c36f6b99a7 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:void_aspect_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_stairs.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_stairs.json index 4aa1b356e9..76d706bd1d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:void_aspect_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_stripped_wood.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_stripped_wood.json index 2a8c1f1896..825b376345 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_stripped_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_stripped_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:void_aspect_stripped_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_trapdoor.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_trapdoor.json index b83d744548..46e4fff2d3 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_trapdoor.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_trapdoor.json @@ -14,6 +14,5 @@ "result": { "count": 2, "item": "minestuck:void_aspect_trapdoor" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/void_aspect_wood.json b/src/main/generated/resources/data/minestuck/recipes/void_aspect_wood.json index 58dc8d1abc..5141dff58a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/void_aspect_wood.json +++ b/src/main/generated/resources/data/minestuck/recipes/void_aspect_wood.json @@ -14,6 +14,5 @@ "result": { "count": 3, "item": "minestuck:void_aspect_wood" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_slab.json b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_slab.json index 290f38d36c..310fafdd7d 100644 --- a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_slab.json @@ -12,6 +12,5 @@ "result": { "count": 6, "item": "minestuck:white_chess_brick_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_pressure_plate.json b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_pressure_plate.json index 8ce02349ec..72cc7a3328 100644 --- a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_pressure_plate.json +++ b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_pressure_plate.json @@ -12,6 +12,5 @@ ], "result": { "item": "minestuck:white_chess_brick_smooth_pressure_plate" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_slab.json b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_slab.json index 73271f40d8..0e4f199a9a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_slab.json +++ b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_slab.json @@ -13,6 +13,5 @@ "result": { "count": 6, "item": "minestuck:white_chess_brick_smooth_slab" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_stairs.json b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_stairs.json index 43e49aeee0..d1530745bf 100644 --- a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_stairs.json @@ -15,6 +15,5 @@ "result": { "count": 4, "item": "minestuck:white_chess_brick_smooth_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_wall.json b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_wall.json index b6544f02d7..2497d61043 100644 --- a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_smooth_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:white_chess_brick_smooth_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_stairs.json b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_stairs.json index 92fa7acf4c..91736fe24f 100644 --- a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_stairs.json +++ b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_stairs.json @@ -14,6 +14,5 @@ "result": { "count": 4, "item": "minestuck:white_chess_brick_stairs" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_wall.json b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_wall.json index 3e0c9ecf14..a566d667d0 100644 --- a/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_wall.json +++ b/src/main/generated/resources/data/minestuck/recipes/white_chess_brick_wall.json @@ -14,6 +14,5 @@ "result": { "count": 6, "item": "minestuck:white_chess_brick_wall" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/wireless_redstone_receiver.json b/src/main/generated/resources/data/minestuck/recipes/wireless_redstone_receiver.json index 289dafe689..34816cfa5a 100644 --- a/src/main/generated/resources/data/minestuck/recipes/wireless_redstone_receiver.json +++ b/src/main/generated/resources/data/minestuck/recipes/wireless_redstone_receiver.json @@ -25,6 +25,5 @@ ], "result": { "item": "minestuck:wireless_redstone_receiver" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/wireless_redstone_transmitter.json b/src/main/generated/resources/data/minestuck/recipes/wireless_redstone_transmitter.json index 653afd498f..376ebeab89 100644 --- a/src/main/generated/resources/data/minestuck/recipes/wireless_redstone_transmitter.json +++ b/src/main/generated/resources/data/minestuck/recipes/wireless_redstone_transmitter.json @@ -22,6 +22,5 @@ ], "result": { "item": "minestuck:wireless_redstone_transmitter" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/wooden_lance.json b/src/main/generated/resources/data/minestuck/recipes/wooden_lance.json index e82d66e892..7be27c7984 100644 --- a/src/main/generated/resources/data/minestuck/recipes/wooden_lance.json +++ b/src/main/generated/resources/data/minestuck/recipes/wooden_lance.json @@ -19,6 +19,5 @@ ], "result": { "item": "minestuck:wooden_lance" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/resources/data/minestuck/recipes/wooden_spoon.json b/src/main/generated/resources/data/minestuck/recipes/wooden_spoon.json index 18733b10f3..92bd737bba 100644 --- a/src/main/generated/resources/data/minestuck/recipes/wooden_spoon.json +++ b/src/main/generated/resources/data/minestuck/recipes/wooden_spoon.json @@ -16,6 +16,5 @@ ], "result": { "item": "minestuck:wooden_spoon" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/Minestuck.java b/src/main/java/com/mraof/minestuck/Minestuck.java index f6613ed1eb..289fe56c15 100644 --- a/src/main/java/com/mraof/minestuck/Minestuck.java +++ b/src/main/java/com/mraof/minestuck/Minestuck.java @@ -26,9 +26,9 @@ import com.mraof.minestuck.item.MSItems; import com.mraof.minestuck.item.crafting.MSRecipeTypes; import com.mraof.minestuck.item.loot.MSLootTables; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.KindAbstratusList; import com.mraof.minestuck.util.DispenserBehaviourUtil; +import com.mraof.minestuck.util.MSCapabilities; import com.mraof.minestuck.util.MSParticleType; import com.mraof.minestuck.util.MSSoundEvents; import com.mraof.minestuck.world.gen.MSSurfaceRules; @@ -46,7 +46,6 @@ import net.neoforged.fml.common.Mod; import net.neoforged.fml.config.ModConfig; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; import software.bernie.geckolib.GeckoLib; import static com.mraof.minestuck.Minestuck.MOD_ID; @@ -61,18 +60,17 @@ public static ResourceLocation id(String path) return new ResourceLocation(MOD_ID, path); } - public Minestuck() + public Minestuck(IEventBus eventBus) { - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + eventBus.addListener(this::setup); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, MinestuckConfig.commonSpec); ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, MinestuckConfig.clientSpec); ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, MinestuckConfig.serverSpec); - GeckoLib.initialize(); + GeckoLib.initialize(eventBus); - IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus(); MSBlocks.REGISTER.register(eventBus); MSItems.REGISTER.register(eventBus); MSFluids.REGISTER.register(eventBus); @@ -80,7 +78,7 @@ public Minestuck() MSBlockEntityTypes.REGISTER.register(eventBus); MSEntityTypes.REGISTER.register(eventBus); MSMenuTypes.REGISTER.register(eventBus); - GristTypes.register(); + GristTypes.register(eventBus); MSEffects.REGISTER.register(eventBus); MSParticleType.REGISTER.register(eventBus); MSSoundEvents.REGISTER.register(eventBus); @@ -89,6 +87,8 @@ public Minestuck() InterpreterTypes.REGISTER.register(eventBus); MSRecipeTypes.RECIPE_TYPE_REGISTER.register(eventBus); MSRecipeTypes.SERIALIZER_REGISTER.register(eventBus); + MSCriteriaTriggers.REGISTER.register(eventBus); + MSLootTables.CONDITION_REGISTER.register(eventBus); MSLootTables.FUNCTION_REGISTER.register(eventBus); MSLootTables.ENTRY_REGISTER.register(eventBus); @@ -112,6 +112,8 @@ public Minestuck() MSCreativeTabs.REGISTER.register(eventBus); + MSCapabilities.ATTACHMENT_REGISTER.register(eventBus); + SkaiaBlocks.init(); AspectTreeBlocks.init(); } @@ -123,9 +125,6 @@ public Minestuck() private void setup(final FMLCommonSetupEvent event) { event.enqueueWork(this::mainThreadSetup); - - //register channel handler - MSPacketHandler.setupChannel(); } /** @@ -134,7 +133,6 @@ private void setup(final FMLCommonSetupEvent event) */ private void mainThreadSetup() { - MSCriteriaTriggers.register(); MSSuggestionProviders.register(); KindAbstratusList.registerTypes(); diff --git a/src/main/java/com/mraof/minestuck/advancements/CaptchalogueTrigger.java b/src/main/java/com/mraof/minestuck/advancements/CaptchalogueTrigger.java index 7bee080c14..e6d53bb01d 100644 --- a/src/main/java/com/mraof/minestuck/advancements/CaptchalogueTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/CaptchalogueTrigger.java @@ -1,19 +1,17 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mraof.minestuck.inventory.captchalogue.Modus; import com.mraof.minestuck.inventory.captchalogue.ModusType; import com.mraof.minestuck.inventory.captchalogue.ModusTypes; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.critereon.*; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.util.GsonHelper; +import net.minecraft.util.ExtraCodecs; import net.minecraft.world.item.ItemStack; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -import java.util.Objects; import java.util.Optional; @ParametersAreNonnullByDefault @@ -21,12 +19,9 @@ public class CaptchalogueTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext context) + public Codec codec() { - ModusType modus = json.has("modus") ? ModusTypes.REGISTRY.get(new ResourceLocation(GsonHelper.getAsString(json, "modus"))) : null; - Optional item = ItemPredicate.fromJson(json.get("item")); - MinMaxBounds.Ints count = MinMaxBounds.Ints.fromJson(json.get("count")); - return new Instance(predicate, modus, item, count); + return Instance.CODEC; } public void trigger(ServerPlayer player, Modus modus, ItemStack item) @@ -34,38 +29,21 @@ public void trigger(ServerPlayer player, Modus modus, ItemStack item) trigger(player, instance -> instance.test(modus.getType(), item, modus.getNonEmptyCards())); } - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player, Optional> modus, + Optional item, MinMaxBounds.Ints count) implements SimpleCriterionTrigger.SimpleInstance { - @Nullable - private final ModusType modus; - private final Optional item; - private final MinMaxBounds.Ints count; - - public Instance(Optional predicate, @Nullable ModusType modus,Optional item, MinMaxBounds.Ints count) - { - super(predicate); - this.modus = modus; - this.item = item; - this.count = Objects.requireNonNull(count); - } + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(Instance::player), + ExtraCodecs.strictOptionalField(ModusTypes.REGISTRY.byNameCodec(), "modus").forGetter(Instance::modus), + ExtraCodecs.strictOptionalField(ItemPredicate.CODEC, "item").forGetter(Instance::item), + MinMaxBounds.Ints.CODEC.fieldOf("count").forGetter(Instance::count) + ).apply(instance, Instance::new)); public boolean test(ModusType modus, ItemStack item, int count) { - return (this.modus == null || this.modus.equals(modus)) && (this.item.isEmpty() || this.item.get().matches(item)) && this.count.matches(count); - } - - @Override - public JsonObject serializeToJson() - { - JsonObject json = super.serializeToJson(); - if(modus != null) - json.addProperty("modus", String.valueOf(ModusTypes.REGISTRY.getKey(modus))); - this.item.ifPresent(item -> json.add("item", item.serializeToJson())); - json.add("count", count.serializeToJson()); - - return json; + return (this.modus.isEmpty() || this.modus.get().equals(modus)) + && (this.item.isEmpty() || this.item.get().matches(item)) + && this.count.matches(count); } } - -} \ No newline at end of file +} diff --git a/src/main/java/com/mraof/minestuck/advancements/ChangeModusTrigger.java b/src/main/java/com/mraof/minestuck/advancements/ChangeModusTrigger.java index c6bf6ad7cf..11fea216d8 100644 --- a/src/main/java/com/mraof/minestuck/advancements/ChangeModusTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/ChangeModusTrigger.java @@ -1,20 +1,18 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mraof.minestuck.inventory.captchalogue.Modus; import com.mraof.minestuck.inventory.captchalogue.ModusType; import com.mraof.minestuck.inventory.captchalogue.ModusTypes; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance; import net.minecraft.advancements.critereon.ContextAwarePredicate; -import net.minecraft.advancements.critereon.DeserializationContext; +import net.minecraft.advancements.critereon.EntityPredicate; import net.minecraft.advancements.critereon.SimpleCriterionTrigger; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.util.GsonHelper; +import net.minecraft.util.ExtraCodecs; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Optional; @@ -23,10 +21,9 @@ public class ChangeModusTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext context) + public Codec codec() { - ModusType modusType = json.has("modus") ? ModusTypes.REGISTRY.get(new ResourceLocation(GsonHelper.getAsString(json, "modus"))) : null; - return new Instance(predicate, modusType); + return Instance.CODEC; } public void trigger(ServerPlayer player, Modus modus) @@ -34,40 +31,26 @@ public void trigger(ServerPlayer player, Modus modus) trigger(player, instance -> instance.test(modus.getType())); } - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player, Optional> modusType) implements SimpleCriterionTrigger.SimpleInstance { - @Nullable - private final ModusType modusType; - - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public Instance(Optional predicate, @Nullable ModusType modusType) - { - super(predicate); - this.modusType = modusType; - } + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(Instance::player), + ExtraCodecs.strictOptionalField(ModusTypes.REGISTRY.byNameCodec(), "modus").forGetter(Instance::modusType) + ).apply(instance, Instance::new)); public static Criterion any() { - return MSCriteriaTriggers.CHANGE_MODUS.createCriterion(new Instance(Optional.empty(), null)); + return MSCriteriaTriggers.CHANGE_MODUS.get().createCriterion(new Instance(Optional.empty(), Optional.empty())); } public static Criterion to(ModusType type) { - return MSCriteriaTriggers.CHANGE_MODUS.createCriterion(new Instance(Optional.empty(), type)); + return MSCriteriaTriggers.CHANGE_MODUS.get().createCriterion(new Instance(Optional.empty(), Optional.of(type))); } public boolean test(ModusType modusType) { - return this.modusType == null || this.modusType.equals(modusType); - } - - @Override - public JsonObject serializeToJson() - { - JsonObject json = super.serializeToJson(); - if(modusType != null) - json.addProperty("modus", String.valueOf(ModusTypes.REGISTRY.getKey(modusType))); - return json; + return this.modusType.isEmpty() || this.modusType.get().equals(modusType); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/mraof/minestuck/advancements/ConsortItemTrigger.java b/src/main/java/com/mraof/minestuck/advancements/ConsortItemTrigger.java index a3bb79e54c..9770c9c1bf 100644 --- a/src/main/java/com/mraof/minestuck/advancements/ConsortItemTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/ConsortItemTrigger.java @@ -1,16 +1,19 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mraof.minestuck.entity.consort.ConsortEntity; import com.mraof.minestuck.entity.consort.EnumConsort; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.*; +import net.minecraft.advancements.critereon.ContextAwarePredicate; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.ItemPredicate; +import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.util.GsonHelper; +import net.minecraft.util.ExtraCodecs; import net.minecraft.world.item.ItemStack; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Optional; @@ -19,12 +22,9 @@ public class ConsortItemTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext context) + public Codec codec() { - String table = json.has("table") ? GsonHelper.getAsString(json, "table") : null; - Optional item = ItemPredicate.fromJson(json.get("item")); - EnumConsort.MerchantType type = json.has("type") ? EnumConsort.MerchantType.getFromName(GsonHelper.getAsString(json, "type")) : null; - return new Instance(predicate, table, item, type); + return Instance.CODEC; } public void trigger(ServerPlayer player, String table, ItemStack item, ConsortEntity consort) @@ -32,46 +32,26 @@ public void trigger(ServerPlayer player, String table, ItemStack item, ConsortEn trigger(player, instance -> instance.test(table, item, consort.merchantType)); } - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player, Optional table, + Optional item, Optional type) implements SimpleCriterionTrigger.SimpleInstance { - @Nullable - private final String table; - private final Optional item; - @Nullable - private final EnumConsort.MerchantType type; - - public Instance(Optional predicate, @Nullable String table, Optional item, @Nullable EnumConsort.MerchantType type) - { - super(predicate); - this.table = table; - this.item = item; - this.type = type; - } + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(Instance::player), + ExtraCodecs.strictOptionalField(Codec.STRING, "table").forGetter(Instance::table), + ExtraCodecs.strictOptionalField(ItemPredicate.CODEC, "item").forGetter(Instance::item), + ExtraCodecs.strictOptionalField(EnumConsort.MerchantType.CODEC, "type").forGetter(Instance::type) + ).apply(instance, Instance::new)); public static Criterion forType(EnumConsort.MerchantType type) { - return MSCriteriaTriggers.CONSORT_ITEM.createCriterion(new Instance(Optional.empty(), null, Optional.empty(), type)); + return MSCriteriaTriggers.CONSORT_ITEM.get().createCriterion(new Instance(Optional.empty(), Optional.empty(), Optional.empty(), Optional.of(type))); } public boolean test(String table, ItemStack item, EnumConsort.MerchantType type) { - return (this.table == null || this.table.equals(table)) + return (this.table.isEmpty() || this.table.get().equals(table)) && (this.item.isEmpty() || this.item.get().matches(item)) - && (this.type == null || this.type == type); - } - - @Override - public JsonObject serializeToJson() - { - JsonObject json = super.serializeToJson(); - if(table != null) - json.addProperty("table", table); - this.item.ifPresent(item -> json.add("item", item.serializeToJson())); - if(type != null) - json.addProperty("type", type.toString().toLowerCase()); - - return json; + && (this.type.isEmpty() || this.type.get() == type); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/mraof/minestuck/advancements/ConsortTalkTrigger.java b/src/main/java/com/mraof/minestuck/advancements/ConsortTalkTrigger.java index 433d3d66dc..1e14b50503 100644 --- a/src/main/java/com/mraof/minestuck/advancements/ConsortTalkTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/ConsortTalkTrigger.java @@ -1,17 +1,16 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mraof.minestuck.entity.consort.ConsortEntity; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance; import net.minecraft.advancements.critereon.ContextAwarePredicate; -import net.minecraft.advancements.critereon.DeserializationContext; +import net.minecraft.advancements.critereon.EntityPredicate; import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.util.GsonHelper; +import net.minecraft.util.ExtraCodecs; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Optional; @@ -20,10 +19,9 @@ public class ConsortTalkTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext context) + public Codec codec() { - String message = json.has("message") ? GsonHelper.getAsString(json, "message") : null; - return new Instance(predicate, message); + return Instance.CODEC; } public void trigger(ServerPlayer player, String message, ConsortEntity consort) @@ -31,42 +29,26 @@ public void trigger(ServerPlayer player, String message, ConsortEntity consort) trigger(player, instance -> instance.test(message)); } - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player, Optional message) implements SimpleCriterionTrigger.SimpleInstance { - @Nullable - private final String message; - - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public Instance(Optional predicate, @Nullable String message) - { - super(predicate); - this.message = message; - } + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(Instance::player), + ExtraCodecs.strictOptionalField(Codec.STRING, "message").forGetter(Instance::message) + ).apply(instance, Instance::new)); public static Criterion any() { - return forMessage(null); + return MSCriteriaTriggers.CONSORT_TALK.get().createCriterion(new Instance(Optional.empty(), Optional.empty())); } - public static Criterion forMessage(@Nullable String message) + public static Criterion forMessage(String message) { - return MSCriteriaTriggers.CONSORT_TALK.createCriterion(new Instance(Optional.empty(), message)); + return MSCriteriaTriggers.CONSORT_TALK.get().createCriterion(new Instance(Optional.empty(), Optional.of(message))); } public boolean test(String message) { - return this.message == null || this.message.equals(message); - } - - @Override - public JsonObject serializeToJson() - { - JsonObject json = super.serializeToJson(); - if(message != null) - json.addProperty("message", message); - - return json; + return this.message.isEmpty() || this.message.get().equals(message); } } - -} \ No newline at end of file +} diff --git a/src/main/java/com/mraof/minestuck/advancements/EcheladderTrigger.java b/src/main/java/com/mraof/minestuck/advancements/EcheladderTrigger.java index d33ba5d730..f50fe2345e 100644 --- a/src/main/java/com/mraof/minestuck/advancements/EcheladderTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/EcheladderTrigger.java @@ -1,13 +1,17 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.*; +import net.minecraft.advancements.critereon.ContextAwarePredicate; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.MinMaxBounds; +import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.util.ExtraCodecs; import javax.annotation.ParametersAreNonnullByDefault; -import java.util.Objects; import java.util.Optional; @ParametersAreNonnullByDefault @@ -15,10 +19,9 @@ public class EcheladderTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext deserializationContext) + public Codec codec() { - MinMaxBounds.Ints rung = MinMaxBounds.Ints.fromJson(json.get("rung")); - return new EcheladderTrigger.Instance(predicate, rung); + return Instance.CODEC; } public void trigger(ServerPlayer player, int rung) @@ -26,34 +29,21 @@ public void trigger(ServerPlayer player, int rung) trigger(player, instance -> instance.test(rung)); } - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player, MinMaxBounds.Ints rung) implements SimpleCriterionTrigger.SimpleInstance { - private final MinMaxBounds.Ints rung; - - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public Instance(Optional predicate, MinMaxBounds.Ints rung) - { - super(predicate); - this.rung = Objects.requireNonNull(rung); - } + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(Instance::player), + MinMaxBounds.Ints.CODEC.fieldOf("rung").forGetter(Instance::rung) + ).apply(instance, Instance::new)); public static Criterion rung(MinMaxBounds.Ints rung) { - return MSCriteriaTriggers.ECHELADDER.createCriterion(new Instance(Optional.empty(), rung)); + return MSCriteriaTriggers.ECHELADDER.get().createCriterion(new Instance(Optional.empty(), rung)); } public boolean test(int count) { return this.rung.matches(count); } - - @Override - public JsonObject serializeToJson() - { - JsonObject json = super.serializeToJson(); - json.add("rung", rung.serializeToJson()); - - return json; - } } } diff --git a/src/main/java/com/mraof/minestuck/advancements/EventTrigger.java b/src/main/java/com/mraof/minestuck/advancements/EventTrigger.java index fe67cbd892..91a0d8c605 100644 --- a/src/main/java/com/mraof/minestuck/advancements/EventTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/EventTrigger.java @@ -1,13 +1,13 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance; import net.minecraft.advancements.critereon.ContextAwarePredicate; -import net.minecraft.advancements.critereon.DeserializationContext; +import net.minecraft.advancements.critereon.EntityPredicate; import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.util.ExtraCodecs; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Optional; @@ -17,9 +17,9 @@ public class EventTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext context) + public Codec codec() { - return new Instance(predicate); + return Instance.CODEC; } public void trigger(ServerPlayer player) @@ -27,37 +27,34 @@ public void trigger(ServerPlayer player) trigger(player, Instance::test); } - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player) implements SimpleCriterionTrigger.SimpleInstance { + private static final Codec CODEC = ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player") + .codec().xmap(Instance::new, Instance::player); + public static Criterion sburbConnection() { - return MSCriteriaTriggers.SBURB_CONNECTION.createCriterion(new Instance(Optional.empty())); + return MSCriteriaTriggers.SBURB_CONNECTION.get().createCriterion(new Instance(Optional.empty())); } public static Criterion cruxiteArtifact() { - return MSCriteriaTriggers.CRUXITE_ARTIFACT.createCriterion(new Instance(Optional.empty())); + return MSCriteriaTriggers.CRUXITE_ARTIFACT.get().createCriterion(new Instance(Optional.empty())); } public static Criterion returnNode() { - return MSCriteriaTriggers.RETURN_NODE.createCriterion(new Instance(Optional.empty())); + return MSCriteriaTriggers.RETURN_NODE.get().createCriterion(new Instance(Optional.empty())); } public static Criterion melonOverload() { - return MSCriteriaTriggers.MELON_OVERLOAD.createCriterion(new Instance(Optional.empty())); + return MSCriteriaTriggers.MELON_OVERLOAD.get().createCriterion(new Instance(Optional.empty())); } public static Criterion buyOutShop() { - return MSCriteriaTriggers.BUY_OUT_SHOP.createCriterion(new Instance(Optional.empty())); - } - - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public Instance(Optional predicate) - { - super(predicate); + return MSCriteriaTriggers.BUY_OUT_SHOP.get().createCriterion(new Instance(Optional.empty())); } public boolean test() @@ -65,4 +62,4 @@ public boolean test() return true; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/mraof/minestuck/advancements/IntellibeamLaserstationTrigger.java b/src/main/java/com/mraof/minestuck/advancements/IntellibeamLaserstationTrigger.java index 20f1640f24..97836c2336 100644 --- a/src/main/java/com/mraof/minestuck/advancements/IntellibeamLaserstationTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/IntellibeamLaserstationTrigger.java @@ -1,10 +1,15 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.*; +import net.minecraft.advancements.critereon.ContextAwarePredicate; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.ItemPredicate; +import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.util.ExtraCodecs; import net.minecraft.world.item.ItemStack; import javax.annotation.ParametersAreNonnullByDefault; @@ -15,9 +20,9 @@ public class IntellibeamLaserstationTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext context) + public Codec codec() { - return new Instance(predicate, ItemPredicate.fromJson(json.get("item"))); + return Instance.CODEC; } public void trigger(ServerPlayer player, ItemStack item) @@ -25,38 +30,26 @@ public void trigger(ServerPlayer player, ItemStack item) trigger(player, instance -> instance.test(item)); } - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player, Optional item) implements SimpleCriterionTrigger.SimpleInstance { - private final Optional item; - - public Instance(Optional predicate, Optional item) - { - super(predicate); - this.item = item; - } + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(Instance::player), + ExtraCodecs.strictOptionalField(ItemPredicate.CODEC, "item").forGetter(Instance::item) + ).apply(instance, Instance::new)); public static Criterion any() { - return create(Optional.empty()); + return MSCriteriaTriggers.INTELLIBEAM_LASERSTATION.get().createCriterion(new Instance(Optional.empty(), Optional.empty())); } - public static Criterion create(Optional item) + public static Criterion create(ItemPredicate item) { - return MSCriteriaTriggers.INTELLIBEAM_LASERSTATION.createCriterion(new Instance(Optional.empty(), item)); + return MSCriteriaTriggers.INTELLIBEAM_LASERSTATION.get().createCriterion(new Instance(Optional.empty(), Optional.of(item))); } public boolean test(ItemStack item) { return this.item.isEmpty() || this.item.get().matches(item); } - - @Override - public JsonObject serializeToJson() - { - JsonObject json = super.serializeToJson(); - this.item.ifPresent(item -> json.add("item", item.serializeToJson())); - return json; - } } } diff --git a/src/main/java/com/mraof/minestuck/advancements/MSCriteriaTriggers.java b/src/main/java/com/mraof/minestuck/advancements/MSCriteriaTriggers.java index 2d37f215cd..66d60fa9da 100644 --- a/src/main/java/com/mraof/minestuck/advancements/MSCriteriaTriggers.java +++ b/src/main/java/com/mraof/minestuck/advancements/MSCriteriaTriggers.java @@ -1,44 +1,28 @@ package com.mraof.minestuck.advancements; import com.mraof.minestuck.Minestuck; -import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.CriterionTrigger; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.registries.BuiltInRegistries; +import net.neoforged.neoforge.registries.DeferredRegister; -import java.util.HashMap; -import java.util.Map; +import java.util.function.Supplier; public class MSCriteriaTriggers { - private static final Map> triggers = new HashMap<>(); + public static final DeferredRegister> REGISTER = DeferredRegister.create(BuiltInRegistries.TRIGGER_TYPES, Minestuck.MOD_ID); - public static final EventTrigger SBURB_CONNECTION = registerLater("sburb_connection", new EventTrigger()); - public static final EventTrigger CRUXITE_ARTIFACT = registerLater("cruxite_artifact", new EventTrigger()); - public static final EventTrigger RETURN_NODE = registerLater("return_node", new EventTrigger()); - public static final EventTrigger MELON_OVERLOAD = registerLater("melon_overload", new EventTrigger()); - public static final EventTrigger BUY_OUT_SHOP = registerLater("buy_out_shop", new EventTrigger()); + public static final Supplier SBURB_CONNECTION = REGISTER.register("sburb_connection", EventTrigger::new); + public static final Supplier CRUXITE_ARTIFACT = REGISTER.register("cruxite_artifact", EventTrigger::new); + public static final Supplier RETURN_NODE = REGISTER.register("return_node", EventTrigger::new); + public static final Supplier MELON_OVERLOAD = REGISTER.register("melon_overload", EventTrigger::new); + public static final Supplier BUY_OUT_SHOP = REGISTER.register("buy_out_shop", EventTrigger::new); - public static final PunchDesignixTrigger PUNCH_DESIGNIX = registerLater("punch_designix", new PunchDesignixTrigger()); - public static final IntellibeamLaserstationTrigger INTELLIBEAM_LASERSTATION = registerLater("intellibeam_laserstation", new IntellibeamLaserstationTrigger()); - public static final CaptchalogueTrigger CAPTCHALOGUE = registerLater("captchalogue", new CaptchalogueTrigger()); - public static final ChangeModusTrigger CHANGE_MODUS = registerLater("change_modus", new ChangeModusTrigger()); - public static final TreeModusRootTrigger TREE_MODUS_ROOT = registerLater("tree_modus_root", new TreeModusRootTrigger()); - public static final EcheladderTrigger ECHELADDER = registerLater("echeladder", new EcheladderTrigger()); - public static final ConsortItemTrigger CONSORT_ITEM = registerLater("consort_item", new ConsortItemTrigger()); - public static final ConsortTalkTrigger CONSORT_TALK = registerLater("consort_talk", new ConsortTalkTrigger()); - - private static > T registerLater(String name, T trigger) - { - triggers.put(Minestuck.id(name), trigger); - return trigger; - } - - /** - * Currently (1.15), this is not thread safe and need to be deferred - */ - public static void register() - { - for(Map.Entry> entry : triggers.entrySet()) - CriteriaTriggers.register(entry.getKey().toString(), entry.getValue()); - } + public static final Supplier PUNCH_DESIGNIX = REGISTER.register("punch_designix", PunchDesignixTrigger::new); + public static final Supplier INTELLIBEAM_LASERSTATION = REGISTER.register("intellibeam_laserstation", IntellibeamLaserstationTrigger::new); + public static final Supplier CAPTCHALOGUE = REGISTER.register("captchalogue", CaptchalogueTrigger::new); + public static final Supplier CHANGE_MODUS = REGISTER.register("change_modus", ChangeModusTrigger::new); + public static final Supplier TREE_MODUS_ROOT = REGISTER.register("tree_modus_root", TreeModusRootTrigger::new); + public static final Supplier ECHELADDER = REGISTER.register("echeladder", EcheladderTrigger::new); + public static final Supplier CONSORT_ITEM = REGISTER.register("consort_item", ConsortItemTrigger::new); + public static final Supplier CONSORT_TALK = REGISTER.register("consort_talk", ConsortTalkTrigger::new); } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/advancements/PunchDesignixTrigger.java b/src/main/java/com/mraof/minestuck/advancements/PunchDesignixTrigger.java index 1e8397a82b..0cf91f1f53 100644 --- a/src/main/java/com/mraof/minestuck/advancements/PunchDesignixTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/PunchDesignixTrigger.java @@ -1,10 +1,15 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.*; +import net.minecraft.advancements.critereon.ContextAwarePredicate; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.ItemPredicate; +import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.util.ExtraCodecs; import net.minecraft.world.item.ItemStack; import javax.annotation.ParametersAreNonnullByDefault; @@ -15,12 +20,9 @@ public class PunchDesignixTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext context) + public Codec codec() { - Optional input = ItemPredicate.fromJson(json.get("input")); - Optional target = ItemPredicate.fromJson(json.get("target")); - Optional output = ItemPredicate.fromJson(json.get("output")); - return new Instance(predicate, input, target, output); + return Instance.CODEC; } public void trigger(ServerPlayer player, ItemStack input, ItemStack target, ItemStack result) @@ -29,19 +31,15 @@ public void trigger(ServerPlayer player, ItemStack input, ItemStack target, Item } @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player, Optional input, + Optional target, Optional output) implements SimpleCriterionTrigger.SimpleInstance { - private final Optional input; - private final Optional target; - private final Optional output; - - public Instance(Optional predicate, Optional input, Optional target, Optional output) - { - super(predicate); - this.input = input; - this.target = target; - this.output = output; - } + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(Instance::player), + ExtraCodecs.strictOptionalField(ItemPredicate.CODEC, "input").forGetter(Instance::input), + ExtraCodecs.strictOptionalField(ItemPredicate.CODEC, "target").forGetter(Instance::target), + ExtraCodecs.strictOptionalField(ItemPredicate.CODEC, "output").forGetter(Instance::output) + ).apply(instance, Instance::new)); public static Criterion any() { @@ -50,7 +48,7 @@ public static Criterion any() public static Criterion create(Optional input, Optional target, Optional output) { - return MSCriteriaTriggers.PUNCH_DESIGNIX.createCriterion(new Instance(Optional.empty(), input, target, output)); + return MSCriteriaTriggers.PUNCH_DESIGNIX.get().createCriterion(new Instance(Optional.empty(), input, target, output)); } public boolean test(ItemStack input, ItemStack target, ItemStack output) @@ -59,16 +57,5 @@ public boolean test(ItemStack input, ItemStack target, ItemStack output) && (this.target.isEmpty() || this.target.get().matches(target)) && (this.output.isEmpty() || this.output.get().matches(output)); } - - @Override - public JsonObject serializeToJson() - { - JsonObject json = super.serializeToJson(); - this.input.ifPresent(input -> json.add("input", input.serializeToJson())); - this.target.ifPresent(target -> json.add("target", target.serializeToJson())); - this.output.ifPresent(output -> json.add("output", output.serializeToJson())); - - return json; - } } -} \ No newline at end of file +} diff --git a/src/main/java/com/mraof/minestuck/advancements/TreeModusRootTrigger.java b/src/main/java/com/mraof/minestuck/advancements/TreeModusRootTrigger.java index fea277e93c..f251504351 100644 --- a/src/main/java/com/mraof/minestuck/advancements/TreeModusRootTrigger.java +++ b/src/main/java/com/mraof/minestuck/advancements/TreeModusRootTrigger.java @@ -1,13 +1,17 @@ package com.mraof.minestuck.advancements; -import com.google.gson.JsonObject; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.*; +import net.minecraft.advancements.critereon.ContextAwarePredicate; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.MinMaxBounds; +import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.util.ExtraCodecs; import javax.annotation.ParametersAreNonnullByDefault; -import java.util.Objects; import java.util.Optional; @ParametersAreNonnullByDefault @@ -15,9 +19,9 @@ public class TreeModusRootTrigger extends SimpleCriterionTrigger { @Override - protected Instance createInstance(JsonObject json, Optional predicate, DeserializationContext context) + public Codec codec() { - return new Instance(predicate, MinMaxBounds.Ints.fromJson(json.get("count"))); + return Instance.CODEC; } public void trigger(ServerPlayer player, int count) @@ -25,34 +29,21 @@ public void trigger(ServerPlayer player, int count) trigger(player, instance -> instance.test(count)); } - public static class Instance extends AbstractCriterionTriggerInstance + public record Instance(Optional player, MinMaxBounds.Ints count) implements SimpleCriterionTrigger.SimpleInstance { - private final MinMaxBounds.Ints count; - - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - public Instance(Optional predicate, MinMaxBounds.Ints count) - { - super(predicate); - this.count = Objects.requireNonNull(count); - } + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ExtraCodecs.strictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(Instance::player), + MinMaxBounds.Ints.CODEC.fieldOf("count").forGetter(Instance::count) + ).apply(instance, Instance::new)); public static Criterion count(MinMaxBounds.Ints count) { - return MSCriteriaTriggers.TREE_MODUS_ROOT.createCriterion(new Instance(Optional.empty(), count)); + return MSCriteriaTriggers.TREE_MODUS_ROOT.get().createCriterion(new Instance(Optional.empty(), count)); } public boolean test(int count) { return this.count.matches(count); } - - @Override - public JsonObject serializeToJson() - { - JsonObject json = super.serializeToJson(); - json.add("count", count.serializeToJson()); - - return json; - } } -} \ No newline at end of file +} diff --git a/src/main/java/com/mraof/minestuck/alchemy/recipe/RegularCombinationRecipe.java b/src/main/java/com/mraof/minestuck/alchemy/recipe/RegularCombinationRecipe.java index 574759e66c..0b00859305 100644 --- a/src/main/java/com/mraof/minestuck/alchemy/recipe/RegularCombinationRecipe.java +++ b/src/main/java/com/mraof/minestuck/alchemy/recipe/RegularCombinationRecipe.java @@ -12,7 +12,6 @@ import net.minecraft.core.RegistryAccess; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.CraftingRecipeCodecs; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.Level; @@ -81,7 +80,7 @@ public static class Serializer implements RecipeSerializer recipe.input1), Ingredient.CODEC_NONEMPTY.fieldOf("input2").forGetter(recipe -> recipe.input2), CombinationMode.CODEC.fieldOf("mode").forGetter(recipe -> recipe.mode), - CraftingRecipeCodecs.ITEMSTACK_OBJECT_CODEC.fieldOf("output").forGetter(recipe -> recipe.output) + ItemStack.ITEM_WITH_COUNT_CODEC.fieldOf("output").forGetter(recipe -> recipe.output) ).apply(instance, RegularCombinationRecipe::new)); @Override diff --git a/src/main/java/com/mraof/minestuck/alchemy/recipe/generator/SourceGristCost.java b/src/main/java/com/mraof/minestuck/alchemy/recipe/generator/SourceGristCost.java index 872d6423c8..45c48eee35 100644 --- a/src/main/java/com/mraof/minestuck/alchemy/recipe/generator/SourceGristCost.java +++ b/src/main/java/com/mraof/minestuck/alchemy/recipe/generator/SourceGristCost.java @@ -47,7 +47,7 @@ public final class SourceGristCost implements GristCostRecipe private final GeneratedGristCostCache cache = new GeneratedGristCostCache(); @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - private SourceGristCost(Ingredient ingredient, List sources, float multiplier, ImmutableGristSet addedCost, Optional priority) + public SourceGristCost(Ingredient ingredient, List sources, float multiplier, ImmutableGristSet addedCost, Optional priority) { this.ingredient = ingredient; this.sources = sources; @@ -148,8 +148,9 @@ public SourceGristCost fromNetwork(FriendlyByteBuf buffer) } } - private sealed interface Source + public sealed interface Source { + //todo handle resource location parse errors Codec CODEC = Codec.STRING.xmap( name -> name.startsWith("#") ? new TagSource(new ResourceLocation(name.substring(1))) @@ -161,13 +162,11 @@ private sealed interface Source GristSet getCostFor(GeneratorCallback callback); } - private static final class ItemSource implements Source + public record ItemSource(Item item) implements Source { - final Item item; - private ItemSource(ResourceLocation name) { - this.item = BuiltInRegistries.ITEM.get(name); + this(BuiltInRegistries.ITEM.get(name)); } @Override @@ -183,18 +182,11 @@ public String toString() } } - public static String itemString(Item item) - { - return Objects.requireNonNull(BuiltInRegistries.ITEM.getKey(item)).toString(); - } - - private static final class TagSource implements Source + public record TagSource(TagKey tag) implements Source { - final TagKey tag; - private TagSource(ResourceLocation name) { - this.tag = TagKey.create(Registries.ITEM, name); + this(TagKey.create(Registries.ITEM, name)); } @Override @@ -217,9 +209,4 @@ public String toString() return "#" + this.tag.location(); } } - - public static String tagString(TagKey tag) - { - return "#" + tag.location(); - } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/alchemy/recipe/generator/recipe/RecipeGeneratedGristCost.java b/src/main/java/com/mraof/minestuck/alchemy/recipe/generator/recipe/RecipeGeneratedGristCost.java index f06436e123..eb7495edcb 100644 --- a/src/main/java/com/mraof/minestuck/alchemy/recipe/generator/recipe/RecipeGeneratedGristCost.java +++ b/src/main/java/com/mraof/minestuck/alchemy/recipe/generator/recipe/RecipeGeneratedGristCost.java @@ -29,6 +29,11 @@ public final class RecipeGeneratedGristCost implements GristCostRecipe @Nullable private RecipeGeneratedCostHandler handler; + public RecipeGeneratedGristCost() + { + this(null); + } + private RecipeGeneratedGristCost(@Nullable RecipeGeneratedCostHandler handler) { this.handler = handler; @@ -88,7 +93,7 @@ public RecipeSerializer getSerializer() public static class Serializer implements RecipeSerializer { - private static final Codec CODEC = Codec.unit(() -> new RecipeGeneratedGristCost(null)); + private static final Codec CODEC = Codec.unit(RecipeGeneratedGristCost::new); @Override public Codec codec() diff --git a/src/main/java/com/mraof/minestuck/api/alchemy/GristTypes.java b/src/main/java/com/mraof/minestuck/api/alchemy/GristTypes.java index 2a32c796c3..71ee309bd1 100644 --- a/src/main/java/com/mraof/minestuck/api/alchemy/GristTypes.java +++ b/src/main/java/com/mraof/minestuck/api/alchemy/GristTypes.java @@ -4,8 +4,7 @@ import com.mraof.minestuck.item.MSItems; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; +import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredRegister; import org.jetbrains.annotations.ApiStatus; @@ -13,7 +12,7 @@ public final class GristTypes { - public static final ResourceKey> REGISTRY_KEY = ResourceKey.createRegistryKey(new ResourceLocation(Minestuck.MOD_ID, "grist")); + public static final ResourceKey> REGISTRY_KEY = ResourceKey.createRegistryKey(Minestuck.id("grist")); private static final DeferredRegister GRIST_TYPES = DeferredRegister.create(REGISTRY_KEY, Minestuck.MOD_ID); public static final Registry REGISTRY = GRIST_TYPES.makeRegistry(builder -> builder.sync(true)); @@ -41,8 +40,8 @@ public final class GristTypes public static final Supplier ZILLIUM = GRIST_TYPES.register("zillium", () -> new GristType(new GristType.Properties(0.0F, 10).candy(MSItems.ZILLIUM_SKITTLES))); @ApiStatus.Internal - public static void register() + public static void register(IEventBus eventBus) { - GRIST_TYPES.register(FMLJavaModLoadingContext.get().getModEventBus()); + GRIST_TYPES.register(eventBus); } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/ContainerGristCostBuilder.java b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/ContainerGristCostBuilder.java index cc4ebc8865..c4f45596aa 100644 --- a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/ContainerGristCostBuilder.java +++ b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/ContainerGristCostBuilder.java @@ -1,29 +1,22 @@ package com.mraof.minestuck.api.alchemy.recipe; import com.google.common.collect.ImmutableMap; -import com.google.gson.JsonObject; -import com.mojang.serialization.JsonOps; +import com.mraof.minestuck.alchemy.recipe.generator.ContainerGristCost; import com.mraof.minestuck.api.alchemy.DefaultImmutableGristSet; import com.mraof.minestuck.api.alchemy.GristType; -import com.mraof.minestuck.api.alchemy.ImmutableGristSet; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Objects; +import java.util.Optional; import java.util.function.Supplier; /** @@ -33,8 +26,6 @@ @MethodsReturnNonnullByDefault public final class ContainerGristCostBuilder { - private static final Logger LOGGER = LogManager.getLogger(); - @Nullable private final ResourceLocation defaultName; private final Ingredient ingredient; @@ -94,37 +85,6 @@ public void buildFor(RecipeOutput recipeOutput, String modId) public void build(RecipeOutput recipeOutput, ResourceLocation id) { - recipeOutput.accept(new Result(id.withPrefix("grist_costs/"), ingredient, new DefaultImmutableGristSet(costBuilder), priority)); - } - - private record Result(ResourceLocation id, Ingredient ingredient, ImmutableGristSet cost, @Nullable Integer priority) implements FinishedRecipe - { - @Override - public void serializeRecipeData(JsonObject jsonObject) - { - jsonObject.add("ingredient", ingredient.toJson(false)); - jsonObject.add("grist_cost", ImmutableGristSet.MAP_CODEC.encodeStart(JsonOps.INSTANCE, cost).getOrThrow(false, LOGGER::error)); - if(priority != null) - jsonObject.addProperty("priority", priority); - } - - @Override - public ResourceLocation id() - { - return id; - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.CONTAINER_GRIST_COST.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + recipeOutput.accept(id.withPrefix("grist_costs/"), new ContainerGristCost(ingredient, new DefaultImmutableGristSet(costBuilder), Optional.ofNullable(priority)), null); } } diff --git a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/GristCostRecipeBuilder.java b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/GristCostRecipeBuilder.java index 7229ca0d59..1f6fba8312 100644 --- a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/GristCostRecipeBuilder.java +++ b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/GristCostRecipeBuilder.java @@ -1,29 +1,22 @@ package com.mraof.minestuck.api.alchemy.recipe; import com.google.common.collect.ImmutableMap; -import com.google.gson.JsonObject; -import com.mojang.serialization.JsonOps; +import com.mraof.minestuck.alchemy.recipe.GristCost; import com.mraof.minestuck.api.alchemy.DefaultImmutableGristSet; import com.mraof.minestuck.api.alchemy.GristType; -import com.mraof.minestuck.api.alchemy.ImmutableGristSet; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Objects; +import java.util.Optional; import java.util.function.Supplier; /** @@ -33,8 +26,6 @@ @MethodsReturnNonnullByDefault public final class GristCostRecipeBuilder { - private static final Logger LOGGER = LogManager.getLogger(); - @Nullable private final ResourceLocation defaultName; private final Ingredient ingredient; @@ -94,37 +85,6 @@ public void buildFor(RecipeOutput recipeOutput, String modId) public void build(RecipeOutput recipeOutput, ResourceLocation id) { - recipeOutput.accept(new Result(id.withPrefix("grist_costs/"), ingredient, new DefaultImmutableGristSet(costBuilder), priority)); - } - - private record Result(ResourceLocation id, Ingredient ingredient, ImmutableGristSet cost, @Nullable Integer priority) implements FinishedRecipe - { - @Override - public void serializeRecipeData(JsonObject jsonObject) - { - jsonObject.add("ingredient", ingredient.toJson(false)); - jsonObject.add("grist_cost", ImmutableGristSet.MAP_CODEC.encodeStart(JsonOps.INSTANCE, cost).getOrThrow(false, LOGGER::error)); - if(priority != null) - jsonObject.addProperty("priority", priority); - } - - @Override - public ResourceLocation id() - { - return id; - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.GRIST_COST.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + recipeOutput.accept(id.withPrefix("grist_costs/"), new GristCost(ingredient, new DefaultImmutableGristSet(costBuilder), Optional.ofNullable(priority)), null); } } diff --git a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/SourceGristCostBuilder.java b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/SourceGristCostBuilder.java index 9403c99897..cdc5b4094b 100644 --- a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/SourceGristCostBuilder.java +++ b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/SourceGristCostBuilder.java @@ -1,33 +1,24 @@ package com.mraof.minestuck.api.alchemy.recipe; import com.google.common.collect.ImmutableMap; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import com.mojang.serialization.JsonOps; import com.mraof.minestuck.alchemy.recipe.generator.SourceGristCost; import com.mraof.minestuck.api.alchemy.DefaultImmutableGristSet; import com.mraof.minestuck.api.alchemy.GristType; -import com.mraof.minestuck.api.alchemy.ImmutableGristSet; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.function.Supplier; /** @@ -37,13 +28,11 @@ @MethodsReturnNonnullByDefault public final class SourceGristCostBuilder { - private static final Logger LOGGER = LogManager.getLogger(); - @Nullable private final ResourceLocation defaultName; private final Ingredient ingredient; private final ImmutableMap.Builder costBuilder = ImmutableMap.builder(); - private final List sources = new ArrayList<>(); + private final List sources = new ArrayList<>(); private float multiplier = 1; @Nullable private Integer priority = null; @@ -88,14 +77,14 @@ public SourceGristCostBuilder priority(int priority) public SourceGristCostBuilder source(TagKey source) { - sources.add(SourceGristCost.tagString(source)); + sources.add(new SourceGristCost.TagSource(source)); return this; } public SourceGristCostBuilder source(Item source) { - sources.add(SourceGristCost.itemString(source)); + sources.add(new SourceGristCost.ItemSource(source)); return this; } @@ -119,46 +108,6 @@ public void buildFor(RecipeOutput recipeOutput, String modId) public void build(RecipeOutput recipeOutput, ResourceLocation id) { - recipeOutput.accept(new Result(id.withPrefix("grist_costs/"), ingredient, priority, sources, multiplier, new DefaultImmutableGristSet(costBuilder))); - } - - private record Result(ResourceLocation id, Ingredient ingredient, @Nullable Integer priority, - List sources, float multiplier, ImmutableGristSet cost) implements FinishedRecipe - { - @Override - public void serializeRecipeData(JsonObject jsonObject) - { - jsonObject.add("ingredient", ingredient.toJson(false)); - - if(priority != null) - jsonObject.addProperty("priority", priority); - - JsonArray sourceArray = new JsonArray(); - sources.forEach(sourceArray::add); - jsonObject.add("sources", sourceArray); - - if(multiplier != 1) - jsonObject.addProperty("multiplier", multiplier); - - jsonObject.add("grist_cost", ImmutableGristSet.MAP_CODEC.encodeStart(JsonOps.INSTANCE, cost).getOrThrow(false, LOGGER::error)); - } - - @Override - public ResourceLocation id() - { - return id; - } - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.SOURCE_GRIST_COST.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + recipeOutput.accept(id.withPrefix("grist_costs/"), new SourceGristCost(ingredient, sources, multiplier, new DefaultImmutableGristSet(costBuilder), Optional.ofNullable(priority)), null); } } diff --git a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/UnavailableGristCostBuilder.java b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/UnavailableGristCostBuilder.java index 1e7e66c089..5e056d757f 100644 --- a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/UnavailableGristCostBuilder.java +++ b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/UnavailableGristCostBuilder.java @@ -1,22 +1,19 @@ package com.mraof.minestuck.api.alchemy.recipe; -import com.google.gson.JsonObject; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; +import com.mraof.minestuck.alchemy.recipe.UnavailableGristCost; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Objects; +import java.util.Optional; /** * Used to datagen a grist cost that makes the ingredient unalchemizable. @@ -73,36 +70,6 @@ public void buildFor(RecipeOutput recipeOutput, String modId) public void build(RecipeOutput recipeOutput, ResourceLocation id) { - recipeOutput.accept(new Result(id.withPrefix("grist_costs/"), ingredient, priority)); - } - - private record Result(ResourceLocation id, Ingredient ingredient, @Nullable Integer priority) implements FinishedRecipe - { - @Override - public void serializeRecipeData(JsonObject jsonObject) - { - jsonObject.add("ingredient", ingredient.toJson(false)); - if(priority != null) - jsonObject.addProperty("priority", priority); - } - - @Override - public ResourceLocation id() - { - return id; - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.UNAVAILABLE_GRIST_COST.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + recipeOutput.accept(id.withPrefix("grist_costs/"), new UnavailableGristCost(ingredient, Optional.ofNullable(priority)), null); } } diff --git a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/WildcardGristCostBuilder.java b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/WildcardGristCostBuilder.java index 4294669bdb..19c6ff17d8 100644 --- a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/WildcardGristCostBuilder.java +++ b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/WildcardGristCostBuilder.java @@ -1,22 +1,19 @@ package com.mraof.minestuck.api.alchemy.recipe; -import com.google.gson.JsonObject; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; +import com.mraof.minestuck.alchemy.recipe.WildcardGristCost; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Objects; +import java.util.Optional; /** * Used to datagen a grist cost which accepts an amount of any grist type chosen by the player. @@ -82,37 +79,6 @@ public void build(RecipeOutput recipeOutput, ResourceLocation id) { if(this.cost == 0) throw new IllegalStateException("Must set the wildcard cost before building!"); - recipeOutput.accept(new Result(id.withPrefix("grist_costs/"), ingredient, cost, priority)); - } - - private record Result(ResourceLocation id, Ingredient ingredient, long cost, @Nullable Integer priority) implements FinishedRecipe - { - @Override - public void serializeRecipeData(JsonObject jsonObject) - { - jsonObject.add("ingredient", ingredient.toJson(false)); - jsonObject.addProperty("grist_cost", cost); - if(priority != null) - jsonObject.addProperty("priority", priority); - } - - @Override - public ResourceLocation id() - { - return id; - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.WILDCARD_GRIST_COST.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + recipeOutput.accept(id.withPrefix("grist_costs/"), new WildcardGristCost(ingredient, cost, Optional.ofNullable(priority)), null); } } diff --git a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/combination/CombinationRecipeBuilder.java b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/combination/CombinationRecipeBuilder.java index c38b0f09f0..f10df0fb78 100644 --- a/src/main/java/com/mraof/minestuck/api/alchemy/recipe/combination/CombinationRecipeBuilder.java +++ b/src/main/java/com/mraof/minestuck/api/alchemy/recipe/combination/CombinationRecipeBuilder.java @@ -1,21 +1,16 @@ package com.mraof.minestuck.api.alchemy.recipe.combination; -import com.google.gson.JsonObject; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; +import com.mraof.minestuck.alchemy.recipe.RegularCombinationRecipe; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Objects; @@ -118,44 +113,6 @@ public void buildFor(RecipeOutput recipeOutput, String modId) public void build(RecipeOutput recipeOutput, ResourceLocation id) { - recipeOutput.accept(new Result(id.withPrefix("combinations/"), output, input1, input2, mode)); - } - - private record Result(ResourceLocation id, ItemStack output, Ingredient input1, Ingredient input2, CombinationMode mode) implements FinishedRecipe - { - @Override - public void serializeRecipeData(JsonObject json) - { - json.add("input1", input1.toJson(false)); - json.add("input2", input2.toJson(false)); - json.addProperty("mode", mode.getSerializedName()); - JsonObject outputJson = new JsonObject(); - ResourceLocation outputId = Objects.requireNonNull(BuiltInRegistries.ITEM.getKey(output.getItem())); - outputJson.addProperty("item", outputId.toString()); - if(output.getCount() > 1) - { - outputJson.addProperty("count", output.getCount()); - } - json.add("output", outputJson); - } - - @Override - public ResourceLocation id() - { - return id; - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.COMBINATION.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + recipeOutput.accept(id.withPrefix("combinations/"), new RegularCombinationRecipe(input1, input2, mode, output), null); } } diff --git a/src/main/java/com/mraof/minestuck/block/AspectTreeBlocks.java b/src/main/java/com/mraof/minestuck/block/AspectTreeBlocks.java index 493d797657..185e353a22 100644 --- a/src/main/java/com/mraof/minestuck/block/AspectTreeBlocks.java +++ b/src/main/java/com/mraof/minestuck/block/AspectTreeBlocks.java @@ -1,14 +1,16 @@ package com.mraof.minestuck.block; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.block.plant.AspectSaplingBlock; import com.mraof.minestuck.block.plant.FlammableLeavesBlock; import com.mraof.minestuck.block.plant.FlammableLogBlock; import com.mraof.minestuck.block.plant.StrippableFlammableLogBlock; import com.mraof.minestuck.item.MSItems; -import com.mraof.minestuck.world.gen.feature.tree.aspect.*; +import com.mraof.minestuck.world.gen.feature.MSCFeatures; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.*; import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.grower.TreeGrower; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; import net.minecraft.world.level.material.MapColor; @@ -16,7 +18,9 @@ import net.neoforged.neoforge.registries.DeferredBlock; import net.neoforged.neoforge.registries.DeferredItem; -import static net.minecraft.world.level.block.state.BlockBehaviour.Properties.copy; +import java.util.Optional; + +import static net.minecraft.world.level.block.state.BlockBehaviour.Properties.ofFullCopy; public final class AspectTreeBlocks { @@ -47,7 +51,8 @@ public static void init() {} public static final DeferredItem BLOOD_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_LEAVES); public static final DeferredBlock BLOOD_ASPECT_SAPLING = MSBlocks.REGISTER.register("blood_aspect_sapling", - () -> new AspectSaplingBlock(new BloodAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("blood_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.BLOOD_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem BLOOD_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock BLOOD_ASPECT_PLANKS = MSBlocks.REGISTER.register("blood_aspect_planks", @@ -59,35 +64,35 @@ public static void init() {} public static final DeferredItem BLOOD_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_CARVED_PLANKS); public static final DeferredBlock BLOOD_ASPECT_STAIRS = MSBlocks.REGISTER.register("blood_aspect_stairs", - () -> new StairBlock(() -> BLOOD_ASPECT_PLANKS.get().defaultBlockState(), copy(BLOOD_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> BLOOD_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(BLOOD_ASPECT_PLANKS.get()))); public static final DeferredItem BLOOD_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_STAIRS); public static final DeferredBlock BLOOD_ASPECT_SLAB = MSBlocks.REGISTER.register("blood_aspect_slab", - () -> new SlabBlock(copy(BLOOD_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(BLOOD_ASPECT_PLANKS.get()))); public static final DeferredItem BLOOD_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_SLAB); public static final DeferredBlock BLOOD_ASPECT_FENCE = MSBlocks.REGISTER.register("blood_aspect_fence", - () -> new FenceBlock(copy(BLOOD_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(BLOOD_ASPECT_PLANKS.get()))); public static final DeferredItem BLOOD_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_FENCE); public static final DeferredBlock BLOOD_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("blood_aspect_fence_gate", - () -> new FenceGateBlock(copy(BLOOD_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(BLOOD_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem BLOOD_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_FENCE_GATE); public static final DeferredBlock BLOOD_ASPECT_DOOR = MSBlocks.REGISTER.register("blood_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.BLOOD)); + () -> new DoorBlock(MSBlockSetType.BLOOD, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem BLOOD_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_DOOR); public static final DeferredBlock BLOOD_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("blood_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR),MSBlockSetType.BLOOD)); + () -> new TrapDoorBlock(MSBlockSetType.BLOOD, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem BLOOD_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_TRAPDOOR); public static final DeferredBlock BLOOD_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("blood_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(BLOOD_ASPECT_PLANKS.get()), MSBlockSetType.BLOOD)); + () -> new PressurePlateBlock(MSBlockSetType.BLOOD, ofFullCopy(BLOOD_ASPECT_PLANKS.get()))); public static final DeferredItem BLOOD_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_PRESSURE_PLATE); public static final DeferredBlock BLOOD_ASPECT_BUTTON = MSBlocks.REGISTER.register("blood_aspect_button", - () -> new ButtonBlock(copy(BLOOD_ASPECT_PLANKS.get()), MSBlockSetType.BLOOD, 10, true)); + () -> new ButtonBlock(MSBlockSetType.BLOOD, 10, ofFullCopy(BLOOD_ASPECT_PLANKS.get()))); public static final DeferredItem BLOOD_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_BUTTON); public static final DeferredBlock BLOOD_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("blood_aspect_bookshelf", @@ -99,15 +104,15 @@ public static void init() {} public static final DeferredItem BLOOD_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BLOOD_ASPECT_LADDER); public static final DeferredBlock BLOOD_ASPECT_SIGN = MSBlocks.REGISTER.register("blood_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.BLOOD)); + () -> new MSStandingSignBlock(MSWoodTypes.BLOOD, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock BLOOD_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("blood_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.BLOOD)); + () -> new MSWallSignBlock(MSWoodTypes.BLOOD, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem BLOOD_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("blood_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), BLOOD_ASPECT_SIGN.get(), BLOOD_ASPECT_WALL_SIGN.get())); public static final DeferredBlock BLOOD_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("blood_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.BLOOD)); + () -> new MSHangingSignBlock(MSWoodTypes.BLOOD, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock BLOOD_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("blood_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.BLOOD)); + () -> new MSWallHangingSignBlock(MSWoodTypes.BLOOD, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem BLOOD_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("blood_aspect_hanging_sign", () -> new HangingSignItem(BLOOD_ASPECT_HANGING_SIGN.get(), BLOOD_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -137,7 +142,8 @@ public static void init() {} public static final DeferredItem BREATH_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_LEAVES); public static final DeferredBlock BREATH_ASPECT_SAPLING = MSBlocks.REGISTER.register("breath_aspect_sapling", - () -> new AspectSaplingBlock(new BreathAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("breath_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.BREATH_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem BREATH_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock BREATH_ASPECT_PLANKS = MSBlocks.REGISTER.register("breath_aspect_planks", @@ -149,35 +155,35 @@ public static void init() {} public static final DeferredItem BREATH_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_CARVED_PLANKS); public static final DeferredBlock BREATH_ASPECT_STAIRS = MSBlocks.REGISTER.register("breath_aspect_stairs", - () -> new StairBlock(() -> BREATH_ASPECT_PLANKS.get().defaultBlockState(), copy(BREATH_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> BREATH_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(BREATH_ASPECT_PLANKS.get()))); public static final DeferredItem BREATH_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_STAIRS); public static final DeferredBlock BREATH_ASPECT_SLAB = MSBlocks.REGISTER.register("breath_aspect_slab", - () -> new SlabBlock(copy(BREATH_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(BREATH_ASPECT_PLANKS.get()))); public static final DeferredItem BREATH_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_SLAB); public static final DeferredBlock BREATH_ASPECT_FENCE = MSBlocks.REGISTER.register("breath_aspect_fence", - () -> new FenceBlock(copy(BREATH_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(BREATH_ASPECT_PLANKS.get()))); public static final DeferredItem BREATH_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_FENCE); public static final DeferredBlock BREATH_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("breath_aspect_fence_gate", - () -> new FenceGateBlock(copy(BREATH_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(BREATH_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem BREATH_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_FENCE_GATE); public static final DeferredBlock BREATH_ASPECT_DOOR = MSBlocks.REGISTER.register("breath_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.BREATH)); + () -> new DoorBlock(MSBlockSetType.BREATH, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem BREATH_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_DOOR); public static final DeferredBlock BREATH_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("breath_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.BREATH)); + () -> new TrapDoorBlock(MSBlockSetType.BREATH, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem BREATH_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_TRAPDOOR); public static final DeferredBlock BREATH_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("breath_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(BREATH_ASPECT_PLANKS.get()), MSBlockSetType.BREATH)); + () -> new PressurePlateBlock(MSBlockSetType.BREATH, ofFullCopy(BREATH_ASPECT_PLANKS.get()))); public static final DeferredItem BREATH_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_PRESSURE_PLATE); public static final DeferredBlock BREATH_ASPECT_BUTTON = MSBlocks.REGISTER.register("breath_aspect_button", - () -> new ButtonBlock(copy(BREATH_ASPECT_PLANKS.get()), MSBlockSetType.BREATH, 10, true)); + () -> new ButtonBlock(MSBlockSetType.BREATH, 10, ofFullCopy(BREATH_ASPECT_PLANKS.get()))); public static final DeferredItem BREATH_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_BUTTON); public static final DeferredBlock BREATH_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("breath_aspect_bookshelf", @@ -189,15 +195,15 @@ public static void init() {} public static final DeferredItem BREATH_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.BREATH_ASPECT_LADDER); public static final DeferredBlock BREATH_ASPECT_SIGN = MSBlocks.REGISTER.register("breath_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.BREATH)); + () -> new MSStandingSignBlock(MSWoodTypes.BREATH, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock BREATH_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("breath_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.BREATH)); + () -> new MSWallSignBlock(MSWoodTypes.BREATH, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem BREATH_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("breath_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), BREATH_ASPECT_SIGN.get(), BREATH_ASPECT_WALL_SIGN.get())); public static final DeferredBlock BREATH_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("breath_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.BREATH)); + () -> new MSHangingSignBlock(MSWoodTypes.BREATH, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock BREATH_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("breath_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.BREATH)); + () -> new MSWallHangingSignBlock(MSWoodTypes.BREATH, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem BREATH_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("breath_aspect_hanging_sign", () -> new HangingSignItem(BREATH_ASPECT_HANGING_SIGN.get(), BREATH_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -227,7 +233,8 @@ public static void init() {} public static final DeferredItem DOOM_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_LEAVES); public static final DeferredBlock DOOM_ASPECT_SAPLING = MSBlocks.REGISTER.register("doom_aspect_sapling", - () -> new AspectSaplingBlock(new DoomAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("doom_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.DOOM_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem DOOM_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock DOOM_ASPECT_PLANKS = MSBlocks.REGISTER.register("doom_aspect_planks", @@ -239,35 +246,35 @@ public static void init() {} public static final DeferredItem DOOM_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_CARVED_PLANKS); public static final DeferredBlock DOOM_ASPECT_STAIRS = MSBlocks.REGISTER.register("doom_aspect_stairs", - () -> new StairBlock(() -> DOOM_ASPECT_PLANKS.get().defaultBlockState(), copy(DOOM_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> DOOM_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(DOOM_ASPECT_PLANKS.get()))); public static final DeferredItem DOOM_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_STAIRS); public static final DeferredBlock DOOM_ASPECT_SLAB = MSBlocks.REGISTER.register("doom_aspect_slab", - () -> new SlabBlock(copy(DOOM_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(DOOM_ASPECT_PLANKS.get()))); public static final DeferredItem DOOM_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_SLAB); public static final DeferredBlock DOOM_ASPECT_FENCE = MSBlocks.REGISTER.register("doom_aspect_fence", - () -> new FenceBlock(copy(DOOM_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(DOOM_ASPECT_PLANKS.get()))); public static final DeferredItem DOOM_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_FENCE); public static final DeferredBlock DOOM_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("doom_aspect_fence_gate", - () -> new FenceGateBlock(copy(DOOM_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(DOOM_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem DOOM_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_FENCE_GATE); public static final DeferredBlock DOOM_ASPECT_DOOR = MSBlocks.REGISTER.register("doom_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.DOOM)); + () -> new DoorBlock(MSBlockSetType.DOOM, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem DOOM_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_DOOR); public static final DeferredBlock DOOM_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("doom_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.DOOM)); + () -> new TrapDoorBlock(MSBlockSetType.DOOM, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem DOOM_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_TRAPDOOR); public static final DeferredBlock DOOM_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("doom_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(DOOM_ASPECT_PLANKS.get()), MSBlockSetType.DOOM)); + () -> new PressurePlateBlock(MSBlockSetType.DOOM, ofFullCopy(DOOM_ASPECT_PLANKS.get()))); public static final DeferredItem DOOM_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_PRESSURE_PLATE); public static final DeferredBlock DOOM_ASPECT_BUTTON = MSBlocks.REGISTER.register("doom_aspect_button", - () -> new ButtonBlock(copy(DOOM_ASPECT_PLANKS.get()), MSBlockSetType.DOOM, 10, true)); + () -> new ButtonBlock(MSBlockSetType.DOOM, 10, ofFullCopy(DOOM_ASPECT_PLANKS.get()))); public static final DeferredItem DOOM_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_BUTTON); public static final DeferredBlock DOOM_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("doom_aspect_bookshelf", @@ -279,15 +286,15 @@ public static void init() {} public static final DeferredItem DOOM_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.DOOM_ASPECT_LADDER); public static final DeferredBlock DOOM_ASPECT_SIGN = MSBlocks.REGISTER.register("doom_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.DOOM)); + () -> new MSStandingSignBlock(MSWoodTypes.DOOM, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock DOOM_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("doom_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.DOOM)); + () -> new MSWallSignBlock(MSWoodTypes.DOOM, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem DOOM_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("doom_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), DOOM_ASPECT_SIGN.get(), DOOM_ASPECT_WALL_SIGN.get())); public static final DeferredBlock DOOM_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("doom_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.DOOM)); + () -> new MSHangingSignBlock(MSWoodTypes.DOOM, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock DOOM_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("doom_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.DOOM)); + () -> new MSWallHangingSignBlock(MSWoodTypes.DOOM, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem DOOM_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("doom_aspect_hanging_sign", () -> new HangingSignItem(DOOM_ASPECT_HANGING_SIGN.get(), DOOM_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -317,7 +324,8 @@ public static void init() {} public static final DeferredItem HEART_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_LEAVES); public static final DeferredBlock HEART_ASPECT_SAPLING = MSBlocks.REGISTER.register("heart_aspect_sapling", - () -> new AspectSaplingBlock(new HeartAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("heart_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.HEART_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem HEART_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock HEART_ASPECT_PLANKS = MSBlocks.REGISTER.register("heart_aspect_planks", @@ -329,35 +337,35 @@ public static void init() {} public static final DeferredItem HEART_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_CARVED_PLANKS); public static final DeferredBlock HEART_ASPECT_STAIRS = MSBlocks.REGISTER.register("heart_aspect_stairs", - () -> new StairBlock(() -> HEART_ASPECT_PLANKS.get().defaultBlockState(), copy(HEART_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> HEART_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(HEART_ASPECT_PLANKS.get()))); public static final DeferredItem HEART_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_STAIRS); public static final DeferredBlock HEART_ASPECT_SLAB = MSBlocks.REGISTER.register("heart_aspect_slab", - () -> new SlabBlock(copy(HEART_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(HEART_ASPECT_PLANKS.get()))); public static final DeferredItem HEART_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_SLAB); public static final DeferredBlock HEART_ASPECT_FENCE = MSBlocks.REGISTER.register("heart_aspect_fence", - () -> new FenceBlock(copy(HEART_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(HEART_ASPECT_PLANKS.get()))); public static final DeferredItem HEART_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_FENCE); public static final DeferredBlock HEART_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("heart_aspect_fence_gate", - () -> new FenceGateBlock(copy(HEART_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(HEART_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem HEART_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_FENCE_GATE); public static final DeferredBlock HEART_ASPECT_DOOR = MSBlocks.REGISTER.register("heart_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.HEART)); + () -> new DoorBlock(MSBlockSetType.HEART, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem HEART_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_DOOR); public static final DeferredBlock HEART_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("heart_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.HEART)); + () -> new TrapDoorBlock(MSBlockSetType.HEART, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem HEART_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_TRAPDOOR); public static final DeferredBlock HEART_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("heart_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(HEART_ASPECT_PLANKS.get()), MSBlockSetType.HEART)); + () -> new PressurePlateBlock(MSBlockSetType.HEART, ofFullCopy(HEART_ASPECT_PLANKS.get()))); public static final DeferredItem HEART_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_PRESSURE_PLATE); public static final DeferredBlock HEART_ASPECT_BUTTON = MSBlocks.REGISTER.register("heart_aspect_button", - () -> new ButtonBlock(copy(HEART_ASPECT_PLANKS.get()), MSBlockSetType.HEART, 10, true)); + () -> new ButtonBlock(MSBlockSetType.HEART, 10, ofFullCopy(HEART_ASPECT_PLANKS.get()))); public static final DeferredItem HEART_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_BUTTON); public static final DeferredBlock HEART_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("heart_aspect_bookshelf", @@ -369,15 +377,15 @@ public static void init() {} public static final DeferredItem HEART_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HEART_ASPECT_LADDER); public static final DeferredBlock HEART_ASPECT_SIGN = MSBlocks.REGISTER.register("heart_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.HEART)); + () -> new MSStandingSignBlock(MSWoodTypes.HEART, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock HEART_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("heart_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.HEART)); + () -> new MSWallSignBlock(MSWoodTypes.HEART, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem HEART_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("heart_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), HEART_ASPECT_SIGN.get(), HEART_ASPECT_WALL_SIGN.get())); public static final DeferredBlock HEART_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("heart_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.HEART)); + () -> new MSHangingSignBlock(MSWoodTypes.HEART, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock HEART_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("heart_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.HEART)); + () -> new MSWallHangingSignBlock(MSWoodTypes.HEART, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem HEART_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("heart_aspect_hanging_sign", () -> new HangingSignItem(HEART_ASPECT_HANGING_SIGN.get(), HEART_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -407,7 +415,8 @@ public static void init() {} public static final DeferredItem HOPE_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_LEAVES); public static final DeferredBlock HOPE_ASPECT_SAPLING = MSBlocks.REGISTER.register("hope_aspect_sapling", - () -> new AspectSaplingBlock(new HopeAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("hope_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.HOPE_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem HOPE_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock HOPE_ASPECT_PLANKS = MSBlocks.REGISTER.register("hope_aspect_planks", @@ -419,35 +428,35 @@ public static void init() {} public static final DeferredItem HOPE_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_CARVED_PLANKS); public static final DeferredBlock HOPE_ASPECT_STAIRS = MSBlocks.REGISTER.register("hope_aspect_stairs", - () -> new StairBlock(() -> HOPE_ASPECT_PLANKS.get().defaultBlockState(), copy(HOPE_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> HOPE_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(HOPE_ASPECT_PLANKS.get()))); public static final DeferredItem HOPE_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_STAIRS); public static final DeferredBlock HOPE_ASPECT_SLAB = MSBlocks.REGISTER.register("hope_aspect_slab", - () -> new SlabBlock(copy(HOPE_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(HOPE_ASPECT_PLANKS.get()))); public static final DeferredItem HOPE_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_SLAB); public static final DeferredBlock HOPE_ASPECT_FENCE = MSBlocks.REGISTER.register("hope_aspect_fence", - () -> new FenceBlock(copy(HOPE_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(HOPE_ASPECT_PLANKS.get()))); public static final DeferredItem HOPE_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_FENCE); public static final DeferredBlock HOPE_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("hope_aspect_fence_gate", - () -> new FenceGateBlock(copy(HOPE_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(HOPE_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem HOPE_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_FENCE_GATE); public static final DeferredBlock HOPE_ASPECT_DOOR = MSBlocks.REGISTER.register("hope_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.HOPE)); + () -> new DoorBlock(MSBlockSetType.HOPE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem HOPE_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_DOOR); public static final DeferredBlock HOPE_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("hope_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.HOPE)); + () -> new TrapDoorBlock(MSBlockSetType.HOPE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem HOPE_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_TRAPDOOR); public static final DeferredBlock HOPE_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("hope_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(HOPE_ASPECT_PLANKS.get()), MSBlockSetType.HOPE)); + () -> new PressurePlateBlock(MSBlockSetType.HOPE, ofFullCopy(HOPE_ASPECT_PLANKS.get()))); public static final DeferredItem HOPE_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_PRESSURE_PLATE); public static final DeferredBlock HOPE_ASPECT_BUTTON = MSBlocks.REGISTER.register("hope_aspect_button", - () -> new ButtonBlock(copy(HOPE_ASPECT_PLANKS.get()), MSBlockSetType.HOPE, 10, true)); + () -> new ButtonBlock(MSBlockSetType.HOPE, 10, ofFullCopy(HOPE_ASPECT_PLANKS.get()))); public static final DeferredItem HOPE_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_BUTTON); public static final DeferredBlock HOPE_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("hope_aspect_bookshelf", @@ -459,15 +468,15 @@ public static void init() {} public static final DeferredItem HOPE_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.HOPE_ASPECT_LADDER); public static final DeferredBlock HOPE_ASPECT_SIGN = MSBlocks.REGISTER.register("hope_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.HOPE)); + () -> new MSStandingSignBlock(MSWoodTypes.HOPE, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock HOPE_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("hope_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.HOPE)); + () -> new MSWallSignBlock(MSWoodTypes.HOPE, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem HOPE_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("hope_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), HOPE_ASPECT_SIGN.get(), HOPE_ASPECT_WALL_SIGN.get())); public static final DeferredBlock HOPE_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("hope_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.HOPE)); + () -> new MSHangingSignBlock(MSWoodTypes.HOPE, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock HOPE_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("hope_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.HOPE)); + () -> new MSWallHangingSignBlock(MSWoodTypes.HOPE, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem HOPE_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("hope_aspect_hanging_sign", () -> new HangingSignItem(HOPE_ASPECT_HANGING_SIGN.get(), HOPE_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -497,7 +506,8 @@ public static void init() {} public static final DeferredItem LIFE_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_LEAVES); public static final DeferredBlock LIFE_ASPECT_SAPLING = MSBlocks.REGISTER.register("life_aspect_sapling", - () -> new AspectSaplingBlock(new LifeAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("life_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.LIFE_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem LIFE_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock LIFE_ASPECT_PLANKS = MSBlocks.REGISTER.register("life_aspect_planks", @@ -509,35 +519,35 @@ public static void init() {} public static final DeferredItem LIFE_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_CARVED_PLANKS); public static final DeferredBlock LIFE_ASPECT_STAIRS = MSBlocks.REGISTER.register("life_aspect_stairs", - () -> new StairBlock(() -> LIFE_ASPECT_PLANKS.get().defaultBlockState(), copy(LIFE_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> LIFE_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(LIFE_ASPECT_PLANKS.get()))); public static final DeferredItem LIFE_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_STAIRS); public static final DeferredBlock LIFE_ASPECT_SLAB = MSBlocks.REGISTER.register("life_aspect_slab", - () -> new SlabBlock(copy(LIFE_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(LIFE_ASPECT_PLANKS.get()))); public static final DeferredItem LIFE_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_SLAB); public static final DeferredBlock LIFE_ASPECT_FENCE = MSBlocks.REGISTER.register("life_aspect_fence", - () -> new FenceBlock(copy(LIFE_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(LIFE_ASPECT_PLANKS.get()))); public static final DeferredItem LIFE_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_FENCE); public static final DeferredBlock LIFE_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("life_aspect_fence_gate", - () -> new FenceGateBlock(copy(LIFE_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(LIFE_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem LIFE_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_FENCE_GATE); public static final DeferredBlock LIFE_ASPECT_DOOR = MSBlocks.REGISTER.register("life_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.LIFE)); + () -> new DoorBlock(MSBlockSetType.LIFE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem LIFE_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_DOOR); public static final DeferredBlock LIFE_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("life_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.LIFE)); + () -> new TrapDoorBlock(MSBlockSetType.LIFE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem LIFE_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_TRAPDOOR); public static final DeferredBlock LIFE_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("life_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(LIFE_ASPECT_PLANKS.get()), MSBlockSetType.LIFE)); + () -> new PressurePlateBlock(MSBlockSetType.LIFE, ofFullCopy(LIFE_ASPECT_PLANKS.get()))); public static final DeferredItem LIFE_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_PRESSURE_PLATE); public static final DeferredBlock LIFE_ASPECT_BUTTON = MSBlocks.REGISTER.register("life_aspect_button", - () -> new ButtonBlock(copy(LIFE_ASPECT_PLANKS.get()), MSBlockSetType.LIFE, 10, true)); + () -> new ButtonBlock(MSBlockSetType.LIFE, 10, ofFullCopy(LIFE_ASPECT_PLANKS.get()))); public static final DeferredItem LIFE_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_BUTTON); public static final DeferredBlock LIFE_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("life_aspect_bookshelf", @@ -549,15 +559,15 @@ public static void init() {} public static final DeferredItem LIFE_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIFE_ASPECT_LADDER); public static final DeferredBlock LIFE_ASPECT_SIGN = MSBlocks.REGISTER.register("life_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.LIFE)); + () -> new MSStandingSignBlock(MSWoodTypes.LIFE, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock LIFE_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("life_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.LIFE)); + () -> new MSWallSignBlock(MSWoodTypes.LIFE, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem LIFE_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("life_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), LIFE_ASPECT_SIGN.get(), LIFE_ASPECT_WALL_SIGN.get())); public static final DeferredBlock LIFE_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("life_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.LIFE)); + () -> new MSHangingSignBlock(MSWoodTypes.LIFE, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock LIFE_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("life_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.LIFE)); + () -> new MSWallHangingSignBlock(MSWoodTypes.LIFE, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem LIFE_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("life_aspect_hanging_sign", () -> new HangingSignItem(LIFE_ASPECT_HANGING_SIGN.get(), LIFE_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -587,7 +597,8 @@ public static void init() {} public static final DeferredItem LIGHT_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_LEAVES); public static final DeferredBlock LIGHT_ASPECT_SAPLING = MSBlocks.REGISTER.register("light_aspect_sapling", - () -> new AspectSaplingBlock(new LightAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("light_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.LIGHT_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem LIGHT_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock LIGHT_ASPECT_PLANKS = MSBlocks.REGISTER.register("light_aspect_planks", @@ -599,35 +610,35 @@ public static void init() {} public static final DeferredItem LIGHT_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_CARVED_PLANKS); public static final DeferredBlock LIGHT_ASPECT_STAIRS = MSBlocks.REGISTER.register("light_aspect_stairs", - () -> new StairBlock(() -> LIGHT_ASPECT_PLANKS.get().defaultBlockState(), copy(LIGHT_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> LIGHT_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(LIGHT_ASPECT_PLANKS.get()))); public static final DeferredItem LIGHT_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_STAIRS); public static final DeferredBlock LIGHT_ASPECT_SLAB = MSBlocks.REGISTER.register("light_aspect_slab", - () -> new SlabBlock(copy(LIGHT_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(LIGHT_ASPECT_PLANKS.get()))); public static final DeferredItem LIGHT_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_SLAB); public static final DeferredBlock LIGHT_ASPECT_FENCE = MSBlocks.REGISTER.register("light_aspect_fence", - () -> new FenceBlock(copy(LIGHT_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(LIGHT_ASPECT_PLANKS.get()))); public static final DeferredItem LIGHT_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_FENCE); public static final DeferredBlock LIGHT_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("light_aspect_fence_gate", - () -> new FenceGateBlock(copy(LIGHT_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(LIGHT_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem LIGHT_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_FENCE_GATE); public static final DeferredBlock LIGHT_ASPECT_DOOR = MSBlocks.REGISTER.register("light_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.LIGHT)); + () -> new DoorBlock(MSBlockSetType.LIGHT, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem LIGHT_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_DOOR); public static final DeferredBlock LIGHT_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("light_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.LIGHT)); + () -> new TrapDoorBlock(MSBlockSetType.LIGHT, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem LIGHT_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_TRAPDOOR); public static final DeferredBlock LIGHT_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("light_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(LIGHT_ASPECT_PLANKS.get()), MSBlockSetType.LIGHT)); + () -> new PressurePlateBlock(MSBlockSetType.LIGHT, ofFullCopy(LIGHT_ASPECT_PLANKS.get()))); public static final DeferredItem LIGHT_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_PRESSURE_PLATE); public static final DeferredBlock LIGHT_ASPECT_BUTTON = MSBlocks.REGISTER.register("light_aspect_button", - () -> new ButtonBlock(copy(LIGHT_ASPECT_PLANKS.get()), MSBlockSetType.LIGHT, 10, true)); + () -> new ButtonBlock(MSBlockSetType.LIGHT, 10, ofFullCopy(LIGHT_ASPECT_PLANKS.get()))); public static final DeferredItem LIGHT_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_BUTTON); public static final DeferredBlock LIGHT_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("light_aspect_bookshelf", @@ -639,15 +650,15 @@ public static void init() {} public static final DeferredItem LIGHT_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.LIGHT_ASPECT_LADDER); public static final DeferredBlock LIGHT_ASPECT_SIGN = MSBlocks.REGISTER.register("light_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.LIGHT)); + () -> new MSStandingSignBlock(MSWoodTypes.LIGHT, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock LIGHT_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("light_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.LIGHT)); + () -> new MSWallSignBlock(MSWoodTypes.LIGHT, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem LIGHT_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("light_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), LIGHT_ASPECT_SIGN.get(), LIGHT_ASPECT_WALL_SIGN.get())); public static final DeferredBlock LIGHT_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("light_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.LIGHT)); + () -> new MSHangingSignBlock(MSWoodTypes.LIGHT, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock LIGHT_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("light_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.LIGHT)); + () -> new MSWallHangingSignBlock(MSWoodTypes.LIGHT, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem LIGHT_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("light_aspect_hanging_sign", () -> new HangingSignItem(LIGHT_ASPECT_HANGING_SIGN.get(), LIGHT_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -677,7 +688,8 @@ public static void init() {} public static final DeferredItem MIND_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_LEAVES); public static final DeferredBlock MIND_ASPECT_SAPLING = MSBlocks.REGISTER.register("mind_aspect_sapling", - () -> new AspectSaplingBlock(new MindAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("mind_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.MIND_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem MIND_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock MIND_ASPECT_PLANKS = MSBlocks.REGISTER.register("mind_aspect_planks", @@ -689,35 +701,35 @@ public static void init() {} public static final DeferredItem MIND_ASPECT_PLANKS_CARVED_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_CARVED_PLANKS); public static final DeferredBlock MIND_ASPECT_STAIRS = MSBlocks.REGISTER.register("mind_aspect_stairs", - () -> new StairBlock(() -> MIND_ASPECT_PLANKS.get().defaultBlockState(), copy(MIND_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> MIND_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(MIND_ASPECT_PLANKS.get()))); public static final DeferredItem MIND_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_STAIRS); public static final DeferredBlock MIND_ASPECT_SLAB = MSBlocks.REGISTER.register("mind_aspect_slab", - () -> new SlabBlock(copy(MIND_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(MIND_ASPECT_PLANKS.get()))); public static final DeferredItem MIND_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_SLAB); public static final DeferredBlock MIND_ASPECT_FENCE = MSBlocks.REGISTER.register("mind_aspect_fence", - () -> new FenceBlock(copy(MIND_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(MIND_ASPECT_PLANKS.get()))); public static final DeferredItem MIND_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_FENCE); public static final DeferredBlock MIND_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("mind_aspect_fence_gate", - () -> new FenceGateBlock(copy(MIND_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(MIND_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem MIND_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_FENCE_GATE); public static final DeferredBlock MIND_ASPECT_DOOR = MSBlocks.REGISTER.register("mind_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.MIND)); + () -> new DoorBlock(MSBlockSetType.MIND, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem MIND_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_DOOR); public static final DeferredBlock MIND_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("mind_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.MIND)); + () -> new TrapDoorBlock(MSBlockSetType.MIND, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem MIND_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_TRAPDOOR); public static final DeferredBlock MIND_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("mind_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(MIND_ASPECT_PLANKS.get()), MSBlockSetType.MIND)); + () -> new PressurePlateBlock(MSBlockSetType.MIND, ofFullCopy(MIND_ASPECT_PLANKS.get()))); public static final DeferredItem MIND_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_PRESSURE_PLATE); public static final DeferredBlock MIND_ASPECT_BUTTON = MSBlocks.REGISTER.register("mind_aspect_button", - () -> new ButtonBlock(copy(MIND_ASPECT_PLANKS.get()), MSBlockSetType.MIND, 10, true)); + () -> new ButtonBlock(MSBlockSetType.MIND, 10, ofFullCopy(MIND_ASPECT_PLANKS.get()))); public static final DeferredItem MIND_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_BUTTON); public static final DeferredBlock MIND_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("mind_aspect_bookshelf", @@ -729,15 +741,15 @@ public static void init() {} public static final DeferredItem MIND_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.MIND_ASPECT_LADDER); public static final DeferredBlock MIND_ASPECT_SIGN = MSBlocks.REGISTER.register("mind_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.MIND)); + () -> new MSStandingSignBlock(MSWoodTypes.MIND, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock MIND_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("mind_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.MIND)); + () -> new MSWallSignBlock(MSWoodTypes.MIND, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem MIND_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("mind_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), MIND_ASPECT_SIGN.get(), MIND_ASPECT_WALL_SIGN.get())); public static final DeferredBlock MIND_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("mind_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.MIND)); + () -> new MSHangingSignBlock(MSWoodTypes.MIND, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock MIND_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("mind_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.MIND)); + () -> new MSWallHangingSignBlock(MSWoodTypes.MIND, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem MIND_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("mind_aspect_hanging_sign", () -> new HangingSignItem(MIND_ASPECT_HANGING_SIGN.get(), MIND_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -767,7 +779,8 @@ public static void init() {} public static final DeferredItem RAGE_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_LEAVES); public static final DeferredBlock RAGE_ASPECT_SAPLING = MSBlocks.REGISTER.register("rage_aspect_sapling", - () -> new AspectSaplingBlock(new RageAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("rage_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.RAGE_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem RAGE_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock RAGE_ASPECT_PLANKS = MSBlocks.REGISTER.register("rage_aspect_planks", @@ -779,35 +792,35 @@ public static void init() {} public static final DeferredItem RAGE_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_CARVED_PLANKS); public static final DeferredBlock RAGE_ASPECT_STAIRS = MSBlocks.REGISTER.register("rage_aspect_stairs", - () -> new StairBlock(() -> RAGE_ASPECT_PLANKS.get().defaultBlockState(), copy(RAGE_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> RAGE_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(RAGE_ASPECT_PLANKS.get()))); public static final DeferredItem RAGE_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_STAIRS); public static final DeferredBlock RAGE_ASPECT_SLAB = MSBlocks.REGISTER.register("rage_aspect_slab", - () -> new SlabBlock(copy(RAGE_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(RAGE_ASPECT_PLANKS.get()))); public static final DeferredItem RAGE_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_SLAB); public static final DeferredBlock RAGE_ASPECT_FENCE = MSBlocks.REGISTER.register("rage_aspect_fence", - () -> new FenceBlock(copy(RAGE_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(RAGE_ASPECT_PLANKS.get()))); public static final DeferredItem RAGE_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_FENCE); public static final DeferredBlock RAGE_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("rage_aspect_fence_gate", - () -> new FenceGateBlock(copy(RAGE_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(RAGE_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem RAGE_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_FENCE_GATE); public static final DeferredBlock RAGE_ASPECT_DOOR = MSBlocks.REGISTER.register("rage_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.RAGE)); + () -> new DoorBlock(MSBlockSetType.RAGE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem RAGE_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_DOOR); public static final DeferredBlock RAGE_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("rage_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.RAGE)); + () -> new TrapDoorBlock(MSBlockSetType.RAGE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem RAGE_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_TRAPDOOR); public static final DeferredBlock RAGE_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("rage_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(RAGE_ASPECT_PLANKS.get()), MSBlockSetType.RAGE)); + () -> new PressurePlateBlock(MSBlockSetType.RAGE, ofFullCopy(RAGE_ASPECT_PLANKS.get()))); public static final DeferredItem RAGE_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_PRESSURE_PLATE); public static final DeferredBlock RAGE_ASPECT_BUTTON = MSBlocks.REGISTER.register("rage_aspect_button", - () -> new ButtonBlock(copy(RAGE_ASPECT_PLANKS.get()), MSBlockSetType.RAGE, 10, true)); + () -> new ButtonBlock(MSBlockSetType.RAGE, 10, ofFullCopy(RAGE_ASPECT_PLANKS.get()))); public static final DeferredItem RAGE_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_BUTTON); public static final DeferredBlock RAGE_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("rage_aspect_bookshelf", @@ -819,15 +832,15 @@ public static void init() {} public static final DeferredItem RAGE_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.RAGE_ASPECT_LADDER); public static final DeferredBlock RAGE_ASPECT_SIGN = MSBlocks.REGISTER.register("rage_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.RAGE)); + () -> new MSStandingSignBlock(MSWoodTypes.RAGE, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock RAGE_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("rage_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.RAGE)); + () -> new MSWallSignBlock(MSWoodTypes.RAGE, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem RAGE_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("rage_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), RAGE_ASPECT_SIGN.get(), RAGE_ASPECT_WALL_SIGN.get())); public static final DeferredBlock RAGE_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("rage_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.RAGE)); + () -> new MSHangingSignBlock(MSWoodTypes.RAGE, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock RAGE_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("rage_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.RAGE)); + () -> new MSWallHangingSignBlock(MSWoodTypes.RAGE, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem RAGE_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("rage_aspect_hanging_sign", () -> new HangingSignItem(RAGE_ASPECT_HANGING_SIGN.get(), RAGE_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -857,7 +870,8 @@ public static void init() {} public static final DeferredItem SPACE_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_LEAVES); public static final DeferredBlock SPACE_ASPECT_SAPLING = MSBlocks.REGISTER.register("space_aspect_sapling", - () -> new AspectSaplingBlock(new SpaceAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("space_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.SPACE_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem SPACE_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock SPACE_ASPECT_PLANKS = MSBlocks.REGISTER.register("space_aspect_planks", @@ -869,35 +883,35 @@ public static void init() {} public static final DeferredItem SPACE_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_CARVED_PLANKS); public static final DeferredBlock SPACE_ASPECT_STAIRS = MSBlocks.REGISTER.register("space_aspect_stairs", - () -> new StairBlock(() -> SPACE_ASPECT_PLANKS.get().defaultBlockState(), copy(SPACE_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> SPACE_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(SPACE_ASPECT_PLANKS.get()))); public static final DeferredItem SPACE_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_STAIRS); public static final DeferredBlock SPACE_ASPECT_SLAB = MSBlocks.REGISTER.register("space_aspect_slab", - () -> new SlabBlock(copy(SPACE_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(SPACE_ASPECT_PLANKS.get()))); public static final DeferredItem SPACE_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_SLAB); public static final DeferredBlock SPACE_ASPECT_FENCE = MSBlocks.REGISTER.register("space_aspect_fence", - () -> new FenceBlock(copy(SPACE_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(SPACE_ASPECT_PLANKS.get()))); public static final DeferredItem SPACE_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_FENCE); public static final DeferredBlock SPACE_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("space_aspect_fence_gate", - () -> new FenceGateBlock(copy(SPACE_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(SPACE_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem SPACE_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_FENCE_GATE); public static final DeferredBlock SPACE_ASPECT_DOOR = MSBlocks.REGISTER.register("space_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.SPACE)); + () -> new DoorBlock(MSBlockSetType.SPACE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem SPACE_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_DOOR); public static final DeferredBlock SPACE_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("space_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.SPACE)); + () -> new TrapDoorBlock(MSBlockSetType.SPACE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem SPACE_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_TRAPDOOR); public static final DeferredBlock SPACE_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("space_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(SPACE_ASPECT_PLANKS.get()), MSBlockSetType.SPACE)); + () -> new PressurePlateBlock(MSBlockSetType.SPACE, ofFullCopy(SPACE_ASPECT_PLANKS.get()))); public static final DeferredItem SPACE_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_PRESSURE_PLATE); public static final DeferredBlock SPACE_ASPECT_BUTTON = MSBlocks.REGISTER.register("space_aspect_button", - () -> new ButtonBlock(copy(SPACE_ASPECT_PLANKS.get()), MSBlockSetType.SPACE, 10, true)); + () -> new ButtonBlock(MSBlockSetType.SPACE, 10, ofFullCopy(SPACE_ASPECT_PLANKS.get()))); public static final DeferredItem SPACE_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_BUTTON); public static final DeferredBlock SPACE_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("space_aspect_bookshelf", @@ -909,15 +923,15 @@ public static void init() {} public static final DeferredItem SPACE_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.SPACE_ASPECT_LADDER); public static final DeferredBlock SPACE_ASPECT_SIGN = MSBlocks.REGISTER.register("space_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.SPACE)); + () -> new MSStandingSignBlock(MSWoodTypes.SPACE, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock SPACE_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("space_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.SPACE)); + () -> new MSWallSignBlock(MSWoodTypes.SPACE, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem SPACE_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("space_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), SPACE_ASPECT_SIGN.get(), SPACE_ASPECT_WALL_SIGN.get())); public static final DeferredBlock SPACE_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("space_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.SPACE)); + () -> new MSHangingSignBlock(MSWoodTypes.SPACE, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock SPACE_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("space_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.SPACE)); + () -> new MSWallHangingSignBlock(MSWoodTypes.SPACE, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem SPACE_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("space_aspect_hanging_sign", () -> new HangingSignItem(SPACE_ASPECT_HANGING_SIGN.get(), SPACE_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -947,7 +961,8 @@ public static void init() {} public static final DeferredItem TIME_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_LEAVES); public static final DeferredBlock TIME_ASPECT_SAPLING = MSBlocks.REGISTER.register("time_aspect_sapling", - () -> new AspectSaplingBlock(new TimeAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("time_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.TIME_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem TIME_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock TIME_ASPECT_PLANKS = MSBlocks.REGISTER.register("time_aspect_planks", @@ -959,35 +974,35 @@ public static void init() {} public static final DeferredItem TIME_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_CARVED_PLANKS); public static final DeferredBlock TIME_ASPECT_STAIRS = MSBlocks.REGISTER.register("time_aspect_stairs", - () -> new StairBlock(() -> TIME_ASPECT_PLANKS.get().defaultBlockState(), copy(TIME_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> TIME_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(TIME_ASPECT_PLANKS.get()))); public static final DeferredItem TIME_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_STAIRS); public static final DeferredBlock TIME_ASPECT_SLAB = MSBlocks.REGISTER.register("time_aspect_slab", - () -> new SlabBlock(copy(TIME_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(TIME_ASPECT_PLANKS.get()))); public static final DeferredItem TIME_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_SLAB); public static final DeferredBlock TIME_ASPECT_FENCE = MSBlocks.REGISTER.register("time_aspect_fence", - () -> new FenceBlock(copy(TIME_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(TIME_ASPECT_PLANKS.get()))); public static final DeferredItem TIME_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_FENCE); public static final DeferredBlock TIME_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("time_aspect_fence_gate", - () -> new FenceGateBlock(copy(TIME_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(TIME_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem TIME_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_FENCE_GATE); public static final DeferredBlock TIME_ASPECT_DOOR = MSBlocks.REGISTER.register("time_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.TIME)); + () -> new DoorBlock(MSBlockSetType.TIME, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem TIME_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_DOOR); public static final DeferredBlock TIME_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("time_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.TIME)); + () -> new TrapDoorBlock(MSBlockSetType.TIME, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem TIME_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_TRAPDOOR); public static final DeferredBlock TIME_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("time_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(TIME_ASPECT_PLANKS.get()), MSBlockSetType.TIME)); + () -> new PressurePlateBlock(MSBlockSetType.TIME, ofFullCopy(TIME_ASPECT_PLANKS.get()))); public static final DeferredItem TIME_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_PRESSURE_PLATE); public static final DeferredBlock TIME_ASPECT_BUTTON = MSBlocks.REGISTER.register("time_aspect_button", - () -> new ButtonBlock(copy(TIME_ASPECT_PLANKS.get()), MSBlockSetType.TIME, 10, true)); + () -> new ButtonBlock(MSBlockSetType.TIME, 10, ofFullCopy(TIME_ASPECT_PLANKS.get()))); public static final DeferredItem TIME_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_BUTTON); public static final DeferredBlock TIME_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("time_aspect_bookshelf", @@ -999,15 +1014,15 @@ public static void init() {} public static final DeferredItem TIME_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.TIME_ASPECT_LADDER); public static final DeferredBlock TIME_ASPECT_SIGN = MSBlocks.REGISTER.register("time_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.TIME)); + () -> new MSStandingSignBlock(MSWoodTypes.TIME, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock TIME_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("time_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.TIME)); + () -> new MSWallSignBlock(MSWoodTypes.TIME, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem TIME_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("time_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), TIME_ASPECT_SIGN.get(), TIME_ASPECT_WALL_SIGN.get())); public static final DeferredBlock TIME_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("time_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.TIME)); + () -> new MSHangingSignBlock(MSWoodTypes.TIME, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock TIME_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("time_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.TIME)); + () -> new MSWallHangingSignBlock(MSWoodTypes.TIME, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem TIME_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("time_aspect_hanging_sign", () -> new HangingSignItem(TIME_ASPECT_HANGING_SIGN.get(), TIME_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); @@ -1037,7 +1052,8 @@ public static void init() {} public static final DeferredItem VOID_ASPECT_LEAVES_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_LEAVES); public static final DeferredBlock VOID_ASPECT_SAPLING = MSBlocks.REGISTER.register("void_aspect_sapling", - () -> new AspectSaplingBlock(new VoidAspectTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); + () -> new AspectSaplingBlock(new TreeGrower(Minestuck.id("void_aspect").toString(), Optional.empty(), Optional.of(MSCFeatures.VOID_TREE), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredItem VOID_ASPECT_SAPLING_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_SAPLING, new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredBlock VOID_ASPECT_PLANKS = MSBlocks.REGISTER.register("void_aspect_planks", @@ -1049,35 +1065,35 @@ public static void init() {} public static final DeferredItem VOID_ASPECT_CARVED_PLANKS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_CARVED_PLANKS); public static final DeferredBlock VOID_ASPECT_STAIRS = MSBlocks.REGISTER.register("void_aspect_stairs", - () -> new StairBlock(() -> VOID_ASPECT_PLANKS.get().defaultBlockState(), copy(VOID_ASPECT_PLANKS.get()))); + () -> new StairBlock(() -> VOID_ASPECT_PLANKS.get().defaultBlockState(), ofFullCopy(VOID_ASPECT_PLANKS.get()))); public static final DeferredItem VOID_ASPECT_STAIRS_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_STAIRS); public static final DeferredBlock VOID_ASPECT_SLAB = MSBlocks.REGISTER.register("void_aspect_slab", - () -> new SlabBlock(copy(VOID_ASPECT_PLANKS.get()))); + () -> new SlabBlock(ofFullCopy(VOID_ASPECT_PLANKS.get()))); public static final DeferredItem VOID_ASPECT_SLAB_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_SLAB); public static final DeferredBlock VOID_ASPECT_FENCE = MSBlocks.REGISTER.register("void_aspect_fence", - () -> new FenceBlock(copy(VOID_ASPECT_PLANKS.get()))); + () -> new FenceBlock(ofFullCopy(VOID_ASPECT_PLANKS.get()))); public static final DeferredItem VOID_ASPECT_FENCE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_FENCE); public static final DeferredBlock VOID_ASPECT_FENCE_GATE = MSBlocks.REGISTER.register("void_aspect_fence_gate", - () -> new FenceGateBlock(copy(VOID_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + () -> new FenceGateBlock(ofFullCopy(VOID_ASPECT_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredItem VOID_ASPECT_FENCE_GATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_FENCE_GATE); public static final DeferredBlock VOID_ASPECT_DOOR = MSBlocks.REGISTER.register("void_aspect_door", - () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.VOID)); + () -> new DoorBlock(MSBlockSetType.VOID, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem VOID_ASPECT_DOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_DOOR); public static final DeferredBlock VOID_ASPECT_TRAPDOOR = MSBlocks.REGISTER.register("void_aspect_trapdoor", - () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.VOID)); + () -> new TrapDoorBlock(MSBlockSetType.VOID, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredItem VOID_ASPECT_TRAPDOOR_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_TRAPDOOR); public static final DeferredBlock VOID_ASPECT_PRESSURE_PLATE = MSBlocks.REGISTER.register("void_aspect_pressure_plate", - () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(VOID_ASPECT_PLANKS.get()), MSBlockSetType.VOID)); + () -> new PressurePlateBlock(MSBlockSetType.VOID, ofFullCopy(VOID_ASPECT_PLANKS.get()))); public static final DeferredItem VOID_ASPECT_PRESSURE_PLATE_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_PRESSURE_PLATE); public static final DeferredBlock VOID_ASPECT_BUTTON = MSBlocks.REGISTER.register("void_aspect_button", - () -> new ButtonBlock(copy(VOID_ASPECT_PLANKS.get()), MSBlockSetType.VOID, 10, true)); + () -> new ButtonBlock(MSBlockSetType.VOID, 10, ofFullCopy(VOID_ASPECT_PLANKS.get()))); public static final DeferredItem VOID_ASPECT_BUTTON_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_BUTTON); public static final DeferredBlock VOID_ASPECT_BOOKSHELF = MSBlocks.REGISTER.register("void_aspect_bookshelf", @@ -1089,15 +1105,15 @@ public static void init() {} public static final DeferredItem VOID_ASPECT_LADDER_ITEM = MSItems.registerBlockItem(AspectTreeBlocks.VOID_ASPECT_LADDER); public static final DeferredBlock VOID_ASPECT_SIGN = MSBlocks.REGISTER.register("void_aspect_sign", - () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.VOID)); + () -> new MSStandingSignBlock(MSWoodTypes.VOID, ofFullCopy(Blocks.OAK_SIGN))); public static final DeferredBlock VOID_ASPECT_WALL_SIGN = MSBlocks.REGISTER.register("void_aspect_wall_sign", - () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.VOID)); + () -> new MSWallSignBlock(MSWoodTypes.VOID, ofFullCopy(Blocks.OAK_WALL_SIGN))); public static final DeferredItem VOID_ASPECT_SIGN_ITEM = MSItems.REGISTER.register("void_aspect_sign", () -> new SignItem(new Item.Properties().stacksTo(16), VOID_ASPECT_SIGN.get(), VOID_ASPECT_WALL_SIGN.get())); public static final DeferredBlock VOID_ASPECT_HANGING_SIGN = MSBlocks.REGISTER.register("void_aspect_hanging_sign", - () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.VOID)); + () -> new MSHangingSignBlock(MSWoodTypes.VOID, ofFullCopy(Blocks.OAK_HANGING_SIGN))); public static final DeferredBlock VOID_ASPECT_WALL_HANGING_SIGN = MSBlocks.REGISTER.register("void_aspect_wall_hanging_sign", - () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.VOID)); + () -> new MSWallHangingSignBlock(MSWoodTypes.VOID, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredItem VOID_ASPECT_HANGING_SIGN_ITEM = MSItems.REGISTER.register("void_aspect_hanging_sign", () -> new HangingSignItem(VOID_ASPECT_HANGING_SIGN.get(), VOID_ASPECT_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); } diff --git a/src/main/java/com/mraof/minestuck/block/CruxiteDowelBlock.java b/src/main/java/com/mraof/minestuck/block/CruxiteDowelBlock.java index ddd6248f80..4350102d21 100644 --- a/src/main/java/com/mraof/minestuck/block/CruxiteDowelBlock.java +++ b/src/main/java/com/mraof/minestuck/block/CruxiteDowelBlock.java @@ -12,6 +12,7 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.entity.BlockEntity; @@ -87,7 +88,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) } @Override - public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, Player player) + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { if (level.getBlockEntity(pos) instanceof ItemStackBlockEntity stackEntity) { diff --git a/src/main/java/com/mraof/minestuck/block/EmergingCruxiteDowelBlock.java b/src/main/java/com/mraof/minestuck/block/EmergingCruxiteDowelBlock.java index 324ca7e519..0e10791ae4 100644 --- a/src/main/java/com/mraof/minestuck/block/EmergingCruxiteDowelBlock.java +++ b/src/main/java/com/mraof/minestuck/block/EmergingCruxiteDowelBlock.java @@ -94,7 +94,7 @@ public boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) } @Override - public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, Player player) + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { if (level.getBlockEntity(pos) instanceof ItemStackBlockEntity stackEntity) { diff --git a/src/main/java/com/mraof/minestuck/block/MSBlockSetType.java b/src/main/java/com/mraof/minestuck/block/MSBlockSetType.java index 0c09a5cadf..fab8cd5c3b 100644 --- a/src/main/java/com/mraof/minestuck/block/MSBlockSetType.java +++ b/src/main/java/com/mraof/minestuck/block/MSBlockSetType.java @@ -35,19 +35,76 @@ public class MSBlockSetType public static final BlockSetType VOID = new BlockSetType(Minestuck.MOD_ID + ":void"); //STONE/METAL - public static final BlockSetType CRUXITE = new BlockSetType(Minestuck.MOD_ID + ":cruxite", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType URANIUM = new BlockSetType(Minestuck.MOD_ID + ":uranium", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType COARSE_STONE = new BlockSetType(Minestuck.MOD_ID + ":coarse_stone", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType SHADE_STONE = new BlockSetType(Minestuck.MOD_ID + ":shade_stone", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType CAST_IRON = new BlockSetType(Minestuck.MOD_ID + ":cast_iron", false, SoundType.METAL, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.METAL_PRESSURE_PLATE_CLICK_OFF, SoundEvents.METAL_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType MYCELIUM_STONE = new BlockSetType(Minestuck.MOD_ID + ":mycelium_stone", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType BLACK_STONE = new BlockSetType(Minestuck.MOD_ID + ":black_stone", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType CHALK = new BlockSetType(Minestuck.MOD_ID + ":chalk", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType PINK_STONE = new BlockSetType(Minestuck.MOD_ID + ":pink_stone", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType BROWN_STONE = new BlockSetType(Minestuck.MOD_ID + ":brown_stone", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType BLACK_CHESS = new BlockSetType(Minestuck.MOD_ID + ":black_chess", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType DARK_GRAY_CHESS = new BlockSetType(Minestuck.MOD_ID + ":dark_gray_chess", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType LIGHT_GRAY_CHESS = new BlockSetType(Minestuck.MOD_ID + ":light_gray_chess", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); - public static final BlockSetType WHITE_CHESS = new BlockSetType(Minestuck.MOD_ID + ":white_chess", true, SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType CRUXITE = new BlockSetType(Minestuck.MOD_ID + ":cruxite", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType URANIUM = new BlockSetType(Minestuck.MOD_ID + ":uranium", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType COARSE_STONE = new BlockSetType(Minestuck.MOD_ID + ":coarse_stone", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType SHADE_STONE = new BlockSetType(Minestuck.MOD_ID + ":shade_stone", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType CAST_IRON = new BlockSetType(Minestuck.MOD_ID + ":cast_iron", + false, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.METAL, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.METAL_PRESSURE_PLATE_CLICK_OFF, SoundEvents.METAL_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType MYCELIUM_STONE = new BlockSetType(Minestuck.MOD_ID + ":mycelium_stone", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + + public static final BlockSetType BLACK_STONE = new BlockSetType(Minestuck.MOD_ID + ":black_stone", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType IGNEOUS_STONE = new BlockSetType(Minestuck.id("igneous_stone").toString(), + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType PUMICE_STONE = new BlockSetType(Minestuck.id("pumice_stone").toString(), + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + + public static final BlockSetType CHALK = new BlockSetType(Minestuck.MOD_ID + ":chalk", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType PINK_STONE = new BlockSetType(Minestuck.MOD_ID + ":pink_stone", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType BROWN_STONE = new BlockSetType(Minestuck.MOD_ID + ":brown_stone", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType GREEN_STONE = new BlockSetType(Minestuck.id("green_stone").toString(), + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + + public static final BlockSetType BLACK_CHESS = new BlockSetType(Minestuck.MOD_ID + ":black_chess", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType DARK_GRAY_CHESS = new BlockSetType(Minestuck.MOD_ID + ":dark_gray_chess", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType LIGHT_GRAY_CHESS = new BlockSetType(Minestuck.MOD_ID + ":light_gray_chess", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); + public static final BlockSetType WHITE_CHESS = new BlockSetType(Minestuck.MOD_ID + ":white_chess", + true, true, true, BlockSetType.PressurePlateSensitivity.EVERYTHING, + SoundType.STONE, SoundEvents.IRON_DOOR_CLOSE, SoundEvents.IRON_DOOR_OPEN, SoundEvents.IRON_TRAPDOOR_CLOSE, SoundEvents.IRON_TRAPDOOR_OPEN, + SoundEvents.STONE_PRESSURE_PLATE_CLICK_OFF, SoundEvents.STONE_PRESSURE_PLATE_CLICK_ON, SoundEvents.STONE_BUTTON_CLICK_OFF, SoundEvents.STONE_BUTTON_CLICK_ON); } diff --git a/src/main/java/com/mraof/minestuck/block/MSBlocks.java b/src/main/java/com/mraof/minestuck/block/MSBlocks.java index 5ce43d0c21..5239fdc631 100644 --- a/src/main/java/com/mraof/minestuck/block/MSBlocks.java +++ b/src/main/java/com/mraof/minestuck/block/MSBlocks.java @@ -11,10 +11,12 @@ import com.mraof.minestuck.fluid.MSFluids; import com.mraof.minestuck.item.MSItems; import com.mraof.minestuck.util.CustomVoxelShape; -import com.mraof.minestuck.world.gen.feature.tree.ShadewoodTree; +import com.mraof.minestuck.world.gen.feature.MSCFeatures; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; +import net.minecraft.util.ColorRGBA; +import net.minecraft.util.valueproviders.ConstantInt; import net.minecraft.util.valueproviders.UniformInt; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; @@ -22,6 +24,7 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.grower.TreeGrower; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockSetType; @@ -32,9 +35,10 @@ import net.neoforged.neoforge.registries.DeferredBlock; import net.neoforged.neoforge.registries.DeferredRegister; +import java.util.Optional; import java.util.function.Function; -import static net.minecraft.world.level.block.state.BlockBehaviour.Properties.copy; +import static net.minecraft.world.level.block.state.BlockBehaviour.Properties.ofFullCopy; public final class MSBlocks { @@ -42,95 +46,95 @@ public final class MSBlocks //Cruxite ores public static final DeferredBlock STONE_CRUXITE_ORE = REGISTER.register("stone_cruxite_ore", () -> cruxiteOre(Block.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(3.0F, 3.0F).requiresCorrectToolForDrops())); - public static final DeferredBlock NETHERRACK_CRUXITE_ORE = REGISTER.register("netherrack_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock COBBLESTONE_CRUXITE_ORE = REGISTER.register("cobblestone_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock SANDSTONE_CRUXITE_ORE = REGISTER.register("sandstone_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock RED_SANDSTONE_CRUXITE_ORE = REGISTER.register("red_sandstone_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock END_STONE_CRUXITE_ORE = REGISTER.register("end_stone_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock SHADE_STONE_CRUXITE_ORE = REGISTER.register("shade_stone_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock PINK_STONE_CRUXITE_ORE = REGISTER.register("pink_stone_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock MYCELIUM_STONE_CRUXITE_ORE = REGISTER.register("mycelium_stone_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock UNCARVED_WOOD_CRUXITE_ORE = REGISTER.register("uncarved_wood_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); - public static final DeferredBlock BLACK_STONE_CRUXITE_ORE = REGISTER.register("black_stone_cruxite_ore", () -> cruxiteOre(copy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock NETHERRACK_CRUXITE_ORE = REGISTER.register("netherrack_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock COBBLESTONE_CRUXITE_ORE = REGISTER.register("cobblestone_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock SANDSTONE_CRUXITE_ORE = REGISTER.register("sandstone_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock RED_SANDSTONE_CRUXITE_ORE = REGISTER.register("red_sandstone_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock END_STONE_CRUXITE_ORE = REGISTER.register("end_stone_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock SHADE_STONE_CRUXITE_ORE = REGISTER.register("shade_stone_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock PINK_STONE_CRUXITE_ORE = REGISTER.register("pink_stone_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock MYCELIUM_STONE_CRUXITE_ORE = REGISTER.register("mycelium_stone_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock UNCARVED_WOOD_CRUXITE_ORE = REGISTER.register("uncarved_wood_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); + public static final DeferredBlock BLACK_STONE_CRUXITE_ORE = REGISTER.register("black_stone_cruxite_ore", () -> cruxiteOre(ofFullCopy(STONE_CRUXITE_ORE.get()))); private static Block cruxiteOre(BlockBehaviour.Properties properties) { - return new DropExperienceBlock(properties, UniformInt.of(2, 5)); + return new DropExperienceBlock(UniformInt.of(2, 5), properties); } //Uranium ores public static final DeferredBlock STONE_URANIUM_ORE = REGISTER.register("stone_uranium_ore", () -> uraniumOre(Block.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(3.0F, 3.0F).requiresCorrectToolForDrops().lightLevel(state -> 3))); - public static final DeferredBlock DEEPSLATE_URANIUM_ORE = REGISTER.register("deepslate_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sound(SoundType.DEEPSLATE))); - public static final DeferredBlock NETHERRACK_URANIUM_ORE = REGISTER.register("netherrack_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock COBBLESTONE_URANIUM_ORE = REGISTER.register("cobblestone_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock SANDSTONE_URANIUM_ORE = REGISTER.register("sandstone_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock RED_SANDSTONE_URANIUM_ORE = REGISTER.register("red_sandstone_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock END_STONE_URANIUM_ORE = REGISTER.register("end_stone_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock SHADE_STONE_URANIUM_ORE = REGISTER.register("shade_stone_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock PINK_STONE_URANIUM_ORE = REGISTER.register("pink_stone_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock MYCELIUM_STONE_URANIUM_ORE = REGISTER.register("mycelium_stone_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock UNCARVED_WOOD_URANIUM_ORE = REGISTER.register("uncarved_wood_uranium_ore", () -> uraniumOre(copy(STONE_URANIUM_ORE.get()))); - public static final DeferredBlock BLACK_STONE_URANIUM_ORE = REGISTER.register("black_stone_uranium_ore", () -> cruxiteOre(copy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock DEEPSLATE_URANIUM_ORE = REGISTER.register("deepslate_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sound(SoundType.DEEPSLATE))); + public static final DeferredBlock NETHERRACK_URANIUM_ORE = REGISTER.register("netherrack_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock COBBLESTONE_URANIUM_ORE = REGISTER.register("cobblestone_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock SANDSTONE_URANIUM_ORE = REGISTER.register("sandstone_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock RED_SANDSTONE_URANIUM_ORE = REGISTER.register("red_sandstone_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock END_STONE_URANIUM_ORE = REGISTER.register("end_stone_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock SHADE_STONE_URANIUM_ORE = REGISTER.register("shade_stone_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock PINK_STONE_URANIUM_ORE = REGISTER.register("pink_stone_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock MYCELIUM_STONE_URANIUM_ORE = REGISTER.register("mycelium_stone_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock UNCARVED_WOOD_URANIUM_ORE = REGISTER.register("uncarved_wood_uranium_ore", () -> uraniumOre(ofFullCopy(STONE_URANIUM_ORE.get()))); + public static final DeferredBlock BLACK_STONE_URANIUM_ORE = REGISTER.register("black_stone_uranium_ore", () -> cruxiteOre(ofFullCopy(STONE_URANIUM_ORE.get()))); private static Block uraniumOre(BlockBehaviour.Properties properties) { - return new DropExperienceBlock(properties, UniformInt.of(2, 5)); + return new DropExperienceBlock(UniformInt.of(2, 5), properties); } //Land-specific vanilla ores - public static final DeferredBlock NETHERRACK_COAL_ORE = REGISTER.register("netherrack_coal_ore", () -> coalOre(copy(Blocks.COAL_ORE))); - public static final DeferredBlock SHADE_STONE_COAL_ORE = REGISTER.register("shade_stone_coal_ore", () -> coalOre(copy(Blocks.COAL_ORE))); - public static final DeferredBlock PINK_STONE_COAL_ORE = REGISTER.register("pink_stone_coal_ore", () -> coalOre(copy(Blocks.COAL_ORE))); + public static final DeferredBlock NETHERRACK_COAL_ORE = REGISTER.register("netherrack_coal_ore", () -> coalOre(ofFullCopy(Blocks.COAL_ORE))); + public static final DeferredBlock SHADE_STONE_COAL_ORE = REGISTER.register("shade_stone_coal_ore", () -> coalOre(ofFullCopy(Blocks.COAL_ORE))); + public static final DeferredBlock PINK_STONE_COAL_ORE = REGISTER.register("pink_stone_coal_ore", () -> coalOre(ofFullCopy(Blocks.COAL_ORE))); private static Block coalOre(BlockBehaviour.Properties properties) { - return new DropExperienceBlock(properties, UniformInt.of(0, 2)); + return new DropExperienceBlock(UniformInt.of(0, 2), properties); } - public static final DeferredBlock END_STONE_IRON_ORE = REGISTER.register("end_stone_iron_ore", () -> new DropExperienceBlock(copy(Blocks.IRON_ORE))); - public static final DeferredBlock SANDSTONE_IRON_ORE = REGISTER.register("sandstone_iron_ore", () -> new DropExperienceBlock(copy(Blocks.IRON_ORE))); - public static final DeferredBlock RED_SANDSTONE_IRON_ORE = REGISTER.register("red_sandstone_iron_ore", () -> new DropExperienceBlock(copy(Blocks.IRON_ORE))); - public static final DeferredBlock UNCARVED_WOOD_IRON_ORE = REGISTER.register("uncarved_wood_iron_ore", () -> new DropExperienceBlock(copy(Blocks.IRON_ORE))); + public static final DeferredBlock END_STONE_IRON_ORE = REGISTER.register("end_stone_iron_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.IRON_ORE))); + public static final DeferredBlock SANDSTONE_IRON_ORE = REGISTER.register("sandstone_iron_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.IRON_ORE))); + public static final DeferredBlock RED_SANDSTONE_IRON_ORE = REGISTER.register("red_sandstone_iron_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.IRON_ORE))); + public static final DeferredBlock UNCARVED_WOOD_IRON_ORE = REGISTER.register("uncarved_wood_iron_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.IRON_ORE))); - public static final DeferredBlock SANDSTONE_GOLD_ORE = REGISTER.register("sandstone_gold_ore", () -> new DropExperienceBlock(copy(Blocks.GOLD_ORE))); - public static final DeferredBlock RED_SANDSTONE_GOLD_ORE = REGISTER.register("red_sandstone_gold_ore", () -> new DropExperienceBlock(copy(Blocks.GOLD_ORE))); - public static final DeferredBlock SHADE_STONE_GOLD_ORE = REGISTER.register("shade_stone_gold_ore", () -> new DropExperienceBlock(copy(Blocks.GOLD_ORE))); - public static final DeferredBlock PINK_STONE_GOLD_ORE = REGISTER.register("pink_stone_gold_ore", () -> new DropExperienceBlock(copy(Blocks.GOLD_ORE))); - public static final DeferredBlock BLACK_STONE_GOLD_ORE = REGISTER.register("black_stone_gold_ore", () -> new DropExperienceBlock(copy(Blocks.GOLD_ORE))); + public static final DeferredBlock SANDSTONE_GOLD_ORE = REGISTER.register("sandstone_gold_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.GOLD_ORE))); + public static final DeferredBlock RED_SANDSTONE_GOLD_ORE = REGISTER.register("red_sandstone_gold_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.GOLD_ORE))); + public static final DeferredBlock SHADE_STONE_GOLD_ORE = REGISTER.register("shade_stone_gold_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.GOLD_ORE))); + public static final DeferredBlock PINK_STONE_GOLD_ORE = REGISTER.register("pink_stone_gold_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.GOLD_ORE))); + public static final DeferredBlock BLACK_STONE_GOLD_ORE = REGISTER.register("black_stone_gold_ore", () -> new DropExperienceBlock(ConstantInt.of(0), ofFullCopy(Blocks.GOLD_ORE))); - public static final DeferredBlock END_STONE_REDSTONE_ORE = REGISTER.register("end_stone_redstone_ore", () -> new RedStoneOreBlock(copy(Blocks.REDSTONE_ORE))); - public static final DeferredBlock UNCARVED_WOOD_REDSTONE_ORE = REGISTER.register("uncarved_wood_redstone_ore", () -> new RedStoneOreBlock(copy(Blocks.REDSTONE_ORE))); - public static final DeferredBlock BLACK_STONE_REDSTONE_ORE = REGISTER.register("black_stone_redstone_ore", () -> new RedStoneOreBlock(copy(Blocks.REDSTONE_ORE))); + public static final DeferredBlock END_STONE_REDSTONE_ORE = REGISTER.register("end_stone_redstone_ore", () -> new RedStoneOreBlock(ofFullCopy(Blocks.REDSTONE_ORE))); + public static final DeferredBlock UNCARVED_WOOD_REDSTONE_ORE = REGISTER.register("uncarved_wood_redstone_ore", () -> new RedStoneOreBlock(ofFullCopy(Blocks.REDSTONE_ORE))); + public static final DeferredBlock BLACK_STONE_REDSTONE_ORE = REGISTER.register("black_stone_redstone_ore", () -> new RedStoneOreBlock(ofFullCopy(Blocks.REDSTONE_ORE))); - public static final DeferredBlock STONE_QUARTZ_ORE = REGISTER.register("stone_quartz_ore", () -> new DropExperienceBlock(copy(Blocks.NETHER_QUARTZ_ORE), UniformInt.of(2, 5))); - public static final DeferredBlock BLACK_STONE_QUARTZ_ORE = REGISTER.register("black_stone_quartz_ore", () -> new DropExperienceBlock(copy(Blocks.NETHER_QUARTZ_ORE), UniformInt.of(2, 5))); + public static final DeferredBlock STONE_QUARTZ_ORE = REGISTER.register("stone_quartz_ore", () -> new DropExperienceBlock(UniformInt.of(2, 5), ofFullCopy(Blocks.NETHER_QUARTZ_ORE))); + public static final DeferredBlock BLACK_STONE_QUARTZ_ORE = REGISTER.register("black_stone_quartz_ore", () -> new DropExperienceBlock(UniformInt.of(2, 5), ofFullCopy(Blocks.NETHER_QUARTZ_ORE))); - public static final DeferredBlock PINK_STONE_LAPIS_ORE = REGISTER.register("pink_stone_lapis_ore", () -> new DropExperienceBlock(copy(Blocks.LAPIS_ORE), UniformInt.of(2, 5))); + public static final DeferredBlock PINK_STONE_LAPIS_ORE = REGISTER.register("pink_stone_lapis_ore", () -> new DropExperienceBlock(UniformInt.of(2, 5), ofFullCopy(Blocks.LAPIS_ORE))); - public static final DeferredBlock PINK_STONE_DIAMOND_ORE = REGISTER.register("pink_stone_diamond_ore", () -> new DropExperienceBlock(copy(Blocks.DIAMOND_ORE), UniformInt.of(3, 7))); + public static final DeferredBlock PINK_STONE_DIAMOND_ORE = REGISTER.register("pink_stone_diamond_ore", () -> new DropExperienceBlock(UniformInt.of(3, 7), ofFullCopy(Blocks.DIAMOND_ORE))); - public static final DeferredBlock UNCARVED_WOOD_EMERALD_ORE = REGISTER.register("uncarved_wood_emerald_ore", () -> new DropExperienceBlock(copy(Blocks.EMERALD_ORE), UniformInt.of(3, 7))); + public static final DeferredBlock UNCARVED_WOOD_EMERALD_ORE = REGISTER.register("uncarved_wood_emerald_ore", () -> new DropExperienceBlock(UniformInt.of(3, 7), ofFullCopy(Blocks.EMERALD_ORE))); //Resource Blocks public static final DeferredBlock CRUXITE_BLOCK = REGISTER.register("cruxite_block", () -> new Block(Block.Properties.of().mapColor(DyeColor.LIGHT_BLUE).instrument(NoteBlockInstrument.CHIME).strength(3.0F).requiresCorrectToolForDrops())); - public static final DeferredBlock CRUXITE_STAIRS = REGISTER.register("cruxite_stairs", () -> new StairBlock(() -> MSBlocks.CRUXITE_BLOCK.get().defaultBlockState(), copy(CRUXITE_BLOCK.get()))); - public static final DeferredBlock CRUXITE_SLAB = REGISTER.register("cruxite_slab", () -> new SlabBlock(copy(CRUXITE_BLOCK.get()))); - public static final DeferredBlock CRUXITE_WALL = REGISTER.register("cruxite_wall", () -> new WallBlock(copy(CRUXITE_BLOCK.get()))); - public static final DeferredBlock CRUXITE_BUTTON = REGISTER.register("cruxite_button", () -> new ButtonBlock(copy(CRUXITE_BLOCK.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock CRUXITE_PRESSURE_PLATE = REGISTER.register("cruxite_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(CRUXITE_BLOCK.get()), BlockSetType.OAK)); - public static final DeferredBlock CRUXITE_DOOR = REGISTER.register("cruxite_door", () -> new DoorBlock(BlockBehaviour.Properties.copy(Blocks.OAK_DOOR), BlockSetType.OAK)); - public static final DeferredBlock CRUXITE_TRAPDOOR = REGISTER.register("cruxite_trapdoor", () -> new TrapDoorBlock(BlockBehaviour.Properties.copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); + public static final DeferredBlock CRUXITE_STAIRS = REGISTER.register("cruxite_stairs", () -> new StairBlock(() -> MSBlocks.CRUXITE_BLOCK.get().defaultBlockState(), ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock CRUXITE_SLAB = REGISTER.register("cruxite_slab", () -> new SlabBlock(ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock CRUXITE_WALL = REGISTER.register("cruxite_wall", () -> new WallBlock(ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock CRUXITE_BUTTON = REGISTER.register("cruxite_button", () -> new ButtonBlock(MSBlockSetType.CRUXITE, 10, ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock CRUXITE_PRESSURE_PLATE = REGISTER.register("cruxite_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.CRUXITE, ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock CRUXITE_DOOR = REGISTER.register("cruxite_door", () -> new DoorBlock(MSBlockSetType.CRUXITE, ofFullCopy(Blocks.OAK_DOOR))); + public static final DeferredBlock CRUXITE_TRAPDOOR = REGISTER.register("cruxite_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.CRUXITE, ofFullCopy(Blocks.OAK_TRAPDOOR))); public static final DeferredBlock POLISHED_CRUXITE_BLOCK = REGISTER.register("polished_cruxite_block", () -> new Block(Block.Properties.of().mapColor(DyeColor.LIGHT_BLUE).instrument(NoteBlockInstrument.CHIME).strength(3.0F).requiresCorrectToolForDrops())); - public static final DeferredBlock POLISHED_CRUXITE_STAIRS = REGISTER.register("polished_cruxite_stairs", () -> new StairBlock(() -> MSBlocks.CRUXITE_BLOCK.get().defaultBlockState(), copy(CRUXITE_BLOCK.get()))); - public static final DeferredBlock POLISHED_CRUXITE_SLAB = REGISTER.register("polished_cruxite_slab", () -> new SlabBlock(copy(CRUXITE_BLOCK.get()))); - public static final DeferredBlock POLISHED_CRUXITE_WALL = REGISTER.register("polished_cruxite_wall", () -> new WallBlock(copy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock POLISHED_CRUXITE_STAIRS = REGISTER.register("polished_cruxite_stairs", () -> new StairBlock(() -> MSBlocks.CRUXITE_BLOCK.get().defaultBlockState(), ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock POLISHED_CRUXITE_SLAB = REGISTER.register("polished_cruxite_slab", () -> new SlabBlock(ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock POLISHED_CRUXITE_WALL = REGISTER.register("polished_cruxite_wall", () -> new WallBlock(ofFullCopy(CRUXITE_BLOCK.get()))); public static final DeferredBlock CRUXITE_BRICKS = REGISTER.register("cruxite_bricks", () -> new Block(Block.Properties.of().mapColor(DyeColor.LIGHT_BLUE).instrument(NoteBlockInstrument.CHIME).strength(3.0F).requiresCorrectToolForDrops())); - public static final DeferredBlock CRUXITE_BRICK_STAIRS = REGISTER.register("cruxite_brick_stairs", () -> new StairBlock(() -> MSBlocks.CRUXITE_BLOCK.get().defaultBlockState(), copy(CRUXITE_BLOCK.get()))); - public static final DeferredBlock CRUXITE_BRICK_SLAB = REGISTER.register("cruxite_brick_slab", () -> new SlabBlock(copy(CRUXITE_BLOCK.get()))); - public static final DeferredBlock CRUXITE_BRICK_WALL = REGISTER.register("cruxite_brick_wall", () -> new WallBlock(copy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock CRUXITE_BRICK_STAIRS = REGISTER.register("cruxite_brick_stairs", () -> new StairBlock(() -> MSBlocks.CRUXITE_BLOCK.get().defaultBlockState(), ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock CRUXITE_BRICK_SLAB = REGISTER.register("cruxite_brick_slab", () -> new SlabBlock(ofFullCopy(CRUXITE_BLOCK.get()))); + public static final DeferredBlock CRUXITE_BRICK_WALL = REGISTER.register("cruxite_brick_wall", () -> new WallBlock(ofFullCopy(CRUXITE_BLOCK.get()))); public static final DeferredBlock SMOOTH_CRUXITE_BLOCK = REGISTER.register("smooth_cruxite_block", () -> new Block(Block.Properties.of().mapColor(DyeColor.LIGHT_BLUE).instrument(NoteBlockInstrument.CHIME).strength(3.0F).requiresCorrectToolForDrops())); public static final DeferredBlock CHISELED_CRUXITE_BLOCK = REGISTER.register("chiseled_cruxite_block", () -> new Block(Block.Properties.of().mapColor(DyeColor.LIGHT_BLUE).instrument(NoteBlockInstrument.CHIME).strength(3.0F).requiresCorrectToolForDrops())); @@ -139,27 +143,27 @@ private static Block coalOre(BlockBehaviour.Properties properties) .strength(1f).lightLevel(state -> state.getValue(CustomLampBlock.CLICKED) ? 15 : 0))); public static final DeferredBlock URANIUM_BLOCK = REGISTER.register("uranium_block", () -> new Block(Block.Properties.of().mapColor(DyeColor.LIME).instrument(NoteBlockInstrument.BASEDRUM).strength(3.0F).requiresCorrectToolForDrops().lightLevel(state -> 7))); - public static final DeferredBlock URANIUM_STAIRS = REGISTER.register("uranium_stairs", () -> new StairBlock(() -> MSBlocks.URANIUM_BLOCK.get().defaultBlockState(), copy(URANIUM_BLOCK.get()))); - public static final DeferredBlock URANIUM_SLAB = REGISTER.register("uranium_slab", () -> new SlabBlock(copy(URANIUM_BLOCK.get()))); - public static final DeferredBlock URANIUM_WALL = REGISTER.register("uranium_wall", () -> new WallBlock(copy(URANIUM_BLOCK.get()))); - public static final DeferredBlock URANIUM_BUTTON = REGISTER.register("uranium_button", () -> new ButtonBlock(copy(URANIUM_BLOCK.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock URANIUM_PRESSURE_PLATE = REGISTER.register("uranium_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(URANIUM_BLOCK.get()), BlockSetType.OAK)); + public static final DeferredBlock URANIUM_STAIRS = REGISTER.register("uranium_stairs", () -> new StairBlock(() -> MSBlocks.URANIUM_BLOCK.get().defaultBlockState(), ofFullCopy(URANIUM_BLOCK.get()))); + public static final DeferredBlock URANIUM_SLAB = REGISTER.register("uranium_slab", () -> new SlabBlock(ofFullCopy(URANIUM_BLOCK.get()))); + public static final DeferredBlock URANIUM_WALL = REGISTER.register("uranium_wall", () -> new WallBlock(ofFullCopy(URANIUM_BLOCK.get()))); + public static final DeferredBlock URANIUM_BUTTON = REGISTER.register("uranium_button", () -> new ButtonBlock(MSBlockSetType.URANIUM, 10, ofFullCopy(URANIUM_BLOCK.get()))); + public static final DeferredBlock URANIUM_PRESSURE_PLATE = REGISTER.register("uranium_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.URANIUM, ofFullCopy(URANIUM_BLOCK.get()))); public static final DeferredBlock GENERIC_OBJECT = REGISTER.register("generic_object", () -> new Block(Block.Properties.of().mapColor(DyeColor.LIME).strength(1.0F).sound(SoundType.WOOD))); - public static final DeferredBlock PERFECTLY_GENERIC_STAIRS = REGISTER.register("perfectly_generic_stairs", () -> new StairBlock(() -> MSBlocks.GENERIC_OBJECT.get().defaultBlockState(), copy(GENERIC_OBJECT.get()))); - public static final DeferredBlock PERFECTLY_GENERIC_SLAB = REGISTER.register("perfectly_generic_slab", () -> new SlabBlock(copy(GENERIC_OBJECT.get()))); - public static final DeferredBlock PERFECTLY_GENERIC_WALL = REGISTER.register("perfectly_generic_wall", () -> new WallBlock(copy(GENERIC_OBJECT.get()))); - public static final DeferredBlock PERFECTLY_GENERIC_FENCE = REGISTER.register("perfectly_generic_fence", () -> new FenceBlock(copy(GENERIC_OBJECT.get()))); - public static final DeferredBlock PERFECTLY_GENERIC_FENCE_GATE = REGISTER.register("perfectly_generic_fence_gate", () -> new FenceGateBlock(copy(GENERIC_OBJECT.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock PERFECTLY_GENERIC_BUTTON = REGISTER.register("perfectly_generic_button", () -> new ButtonBlock(copy(GENERIC_OBJECT.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock PERFECTLY_GENERIC_PRESSURE_PLATE = REGISTER.register("perfectly_generic_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(GENERIC_OBJECT.get()), BlockSetType.OAK)); - public static final DeferredBlock PERFECTLY_GENERIC_DOOR = REGISTER.register("perfectly_generic_door", () -> new DoorBlock(copy(Blocks.OAK_DOOR), BlockSetType.OAK)); - public static final DeferredBlock PERFECTLY_GENERIC_TRAPDOOR = REGISTER.register("perfectly_generic_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); - - public static final DeferredBlock PERFECTLY_GENERIC_SIGN = REGISTER.register("perfectly_generic_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.PERFECTLY_GENERIC)); - public static final DeferredBlock PERFECTLY_GENERIC_WALL_SIGN = REGISTER.register("perfectly_generic_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.PERFECTLY_GENERIC)); - public static final DeferredBlock PERFECTLY_GENERIC_HANGING_SIGN = REGISTER.register("perfectly_generic_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.PERFECTLY_GENERIC)); - public static final DeferredBlock PERFECTLY_GENERIC_WALL_HANGING_SIGN = REGISTER.register("perfectly_generic_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.PERFECTLY_GENERIC)); + public static final DeferredBlock PERFECTLY_GENERIC_STAIRS = REGISTER.register("perfectly_generic_stairs", () -> new StairBlock(() -> MSBlocks.GENERIC_OBJECT.get().defaultBlockState(), ofFullCopy(GENERIC_OBJECT.get()))); + public static final DeferredBlock PERFECTLY_GENERIC_SLAB = REGISTER.register("perfectly_generic_slab", () -> new SlabBlock(ofFullCopy(GENERIC_OBJECT.get()))); + public static final DeferredBlock PERFECTLY_GENERIC_WALL = REGISTER.register("perfectly_generic_wall", () -> new WallBlock(ofFullCopy(GENERIC_OBJECT.get()))); + public static final DeferredBlock PERFECTLY_GENERIC_FENCE = REGISTER.register("perfectly_generic_fence", () -> new FenceBlock(ofFullCopy(GENERIC_OBJECT.get()))); + public static final DeferredBlock PERFECTLY_GENERIC_FENCE_GATE = REGISTER.register("perfectly_generic_fence_gate", () -> new FenceGateBlock(ofFullCopy(GENERIC_OBJECT.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock PERFECTLY_GENERIC_BUTTON = REGISTER.register("perfectly_generic_button", () -> new ButtonBlock(MSBlockSetType.PERFECTLY_GENERIC, 10, ofFullCopy(GENERIC_OBJECT.get()))); + public static final DeferredBlock PERFECTLY_GENERIC_PRESSURE_PLATE = REGISTER.register("perfectly_generic_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.PERFECTLY_GENERIC, ofFullCopy(GENERIC_OBJECT.get()))); + public static final DeferredBlock PERFECTLY_GENERIC_DOOR = REGISTER.register("perfectly_generic_door", () -> new DoorBlock(MSBlockSetType.PERFECTLY_GENERIC, ofFullCopy(Blocks.OAK_DOOR))); + public static final DeferredBlock PERFECTLY_GENERIC_TRAPDOOR = REGISTER.register("perfectly_generic_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.PERFECTLY_GENERIC, ofFullCopy(Blocks.OAK_TRAPDOOR))); + + public static final DeferredBlock PERFECTLY_GENERIC_SIGN = REGISTER.register("perfectly_generic_sign", () -> new MSStandingSignBlock(MSWoodTypes.PERFECTLY_GENERIC, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock PERFECTLY_GENERIC_WALL_SIGN = REGISTER.register("perfectly_generic_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.PERFECTLY_GENERIC, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock PERFECTLY_GENERIC_HANGING_SIGN = REGISTER.register("perfectly_generic_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.PERFECTLY_GENERIC, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock PERFECTLY_GENERIC_WALL_HANGING_SIGN = REGISTER.register("perfectly_generic_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.PERFECTLY_GENERIC, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); //Land Environment //Aspect Terrain Dirt @@ -168,99 +172,99 @@ private static Block coalOre(BlockBehaviour.Properties properties) //Coarse public static final DeferredBlock COARSE_STONE = REGISTER.register("coarse_stone", () -> new Block(Block.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(2.0F, 6.0F))); - public static final DeferredBlock COARSE_STONE_STAIRS = REGISTER.register("coarse_stone_stairs", () -> new StairBlock(() -> MSBlocks.COARSE_STONE.get().defaultBlockState(), copy(COARSE_STONE.get()))); - public static final DeferredBlock COARSE_STONE_SLAB = REGISTER.register("coarse_stone_slab", () -> new SlabBlock(copy(COARSE_STONE.get()))); - public static final DeferredBlock COARSE_STONE_WALL = REGISTER.register("coarse_stone_wall", () -> new WallBlock(copy(COARSE_STONE.get()))); - public static final DeferredBlock COARSE_STONE_BUTTON = REGISTER.register("coarse_stone_button", () -> new ButtonBlock(copy(COARSE_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock COARSE_STONE_PRESSURE_PLATE = REGISTER.register("coarse_stone_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(COARSE_STONE.get()), BlockSetType.STONE)); - - public static final DeferredBlock COARSE_STONE_BRICKS = REGISTER.register("coarse_stone_bricks", () -> new Block(copy(COARSE_STONE.get()))); - public static final DeferredBlock COARSE_STONE_BRICK_STAIRS = REGISTER.register("coarse_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.COARSE_STONE_BRICKS.get().defaultBlockState(), copy(COARSE_STONE_BRICKS.get()))); - public static final DeferredBlock COARSE_STONE_BRICK_SLAB = REGISTER.register("coarse_stone_brick_slab", () -> new SlabBlock(copy(COARSE_STONE_BRICKS.get()))); - public static final DeferredBlock COARSE_STONE_BRICK_WALL = REGISTER.register("coarse_stone_brick_wall", () -> new WallBlock(copy(COARSE_STONE_BRICKS.get()))); - - public static final DeferredBlock COARSE_STONE_COLUMN = REGISTER.register("coarse_stone_column", () -> new MSDirectionalBlock(copy(COARSE_STONE.get()))); - public static final DeferredBlock CHISELED_COARSE_STONE_BRICKS = REGISTER.register("chiseled_coarse_stone_bricks", () -> new Block(copy(COARSE_STONE.get()))); - public static final DeferredBlock CRACKED_COARSE_STONE_BRICKS = REGISTER.register("cracked_coarse_stone_bricks", () -> new Block(copy(COARSE_STONE.get()))); - public static final DeferredBlock MOSSY_COARSE_STONE_BRICKS = REGISTER.register("mossy_coarse_stone_bricks", () -> new Block(copy(COARSE_STONE.get()))); - public static final DeferredBlock CHISELED_COARSE_STONE = REGISTER.register("chiseled_coarse_stone", () -> new Block(copy(COARSE_STONE.get()))); + public static final DeferredBlock COARSE_STONE_STAIRS = REGISTER.register("coarse_stone_stairs", () -> new StairBlock(() -> MSBlocks.COARSE_STONE.get().defaultBlockState(), ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock COARSE_STONE_SLAB = REGISTER.register("coarse_stone_slab", () -> new SlabBlock(ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock COARSE_STONE_WALL = REGISTER.register("coarse_stone_wall", () -> new WallBlock(ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock COARSE_STONE_BUTTON = REGISTER.register("coarse_stone_button", () -> new ButtonBlock(MSBlockSetType.COARSE_STONE, 10, ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock COARSE_STONE_PRESSURE_PLATE = REGISTER.register("coarse_stone_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.COARSE_STONE, ofFullCopy(COARSE_STONE.get()))); + + public static final DeferredBlock COARSE_STONE_BRICKS = REGISTER.register("coarse_stone_bricks", () -> new Block(ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock COARSE_STONE_BRICK_STAIRS = REGISTER.register("coarse_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.COARSE_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(COARSE_STONE_BRICKS.get()))); + public static final DeferredBlock COARSE_STONE_BRICK_SLAB = REGISTER.register("coarse_stone_brick_slab", () -> new SlabBlock(ofFullCopy(COARSE_STONE_BRICKS.get()))); + public static final DeferredBlock COARSE_STONE_BRICK_WALL = REGISTER.register("coarse_stone_brick_wall", () -> new WallBlock(ofFullCopy(COARSE_STONE_BRICKS.get()))); + + public static final DeferredBlock COARSE_STONE_COLUMN = REGISTER.register("coarse_stone_column", () -> new MSDirectionalBlock(ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock CHISELED_COARSE_STONE_BRICKS = REGISTER.register("chiseled_coarse_stone_bricks", () -> new Block(ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock CRACKED_COARSE_STONE_BRICKS = REGISTER.register("cracked_coarse_stone_bricks", () -> new Block(ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock MOSSY_COARSE_STONE_BRICKS = REGISTER.register("mossy_coarse_stone_bricks", () -> new Block(ofFullCopy(COARSE_STONE.get()))); + public static final DeferredBlock CHISELED_COARSE_STONE = REGISTER.register("chiseled_coarse_stone", () -> new Block(ofFullCopy(COARSE_STONE.get()))); //Shade public static final DeferredBlock SHADE_STONE = REGISTER.register("shade_stone", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock SHADE_STAIRS = REGISTER.register("shade_stairs", () -> new StairBlock(() -> MSBlocks.SHADE_STONE.get().defaultBlockState(), copy(SHADE_STONE.get()))); - public static final DeferredBlock SHADE_SLAB = REGISTER.register("shade_slab", () -> new SlabBlock(copy(SHADE_STONE.get()))); - public static final DeferredBlock SHADE_WALL = REGISTER.register("shade_wall", () -> new WallBlock(copy(SHADE_STONE.get()))); - public static final DeferredBlock SHADE_BUTTON = REGISTER.register("shade_button", () -> new ButtonBlock(copy(SHADE_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock SHADE_PRESSURE_PLATE = REGISTER.register("shade_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(SHADE_STONE.get()), BlockSetType.STONE)); - - public static final DeferredBlock SHADE_BRICKS = REGISTER.register("shade_bricks", () -> new Block(copy(SHADE_STONE.get()))); - public static final DeferredBlock SHADE_BRICK_STAIRS = REGISTER.register("shade_brick_stairs", () -> new StairBlock(() -> MSBlocks.SHADE_BRICKS.get().defaultBlockState(), copy(SHADE_BRICKS.get()))); - public static final DeferredBlock SHADE_BRICK_SLAB = REGISTER.register("shade_brick_slab", () -> new SlabBlock(copy(SHADE_BRICKS.get()))); - public static final DeferredBlock SHADE_BRICK_WALL = REGISTER.register("shade_brick_wall", () -> new WallBlock(copy(SHADE_BRICKS.get()))); - - public static final DeferredBlock SMOOTH_SHADE_STONE = REGISTER.register("smooth_shade_stone", () -> new Block(copy(SHADE_STONE.get()))); - public static final DeferredBlock SMOOTH_SHADE_STONE_STAIRS = REGISTER.register("smooth_shade_stone_stairs", () -> new StairBlock(() -> MSBlocks.SMOOTH_SHADE_STONE.get().defaultBlockState(), copy(SMOOTH_SHADE_STONE.get()))); - public static final DeferredBlock SMOOTH_SHADE_STONE_SLAB = REGISTER.register("smooth_shade_stone_slab", () -> new SlabBlock(copy(SMOOTH_SHADE_STONE.get()))); - public static final DeferredBlock SMOOTH_SHADE_STONE_WALL = REGISTER.register("smooth_shade_stone_wall", () -> new WallBlock(copy(SMOOTH_SHADE_STONE.get()))); - - public static final DeferredBlock SHADE_COLUMN = REGISTER.register("shade_column", () -> new MSDirectionalBlock(copy(SHADE_STONE.get()))); - public static final DeferredBlock CHISELED_SHADE_BRICKS = REGISTER.register("chiseled_shade_bricks", () -> new Block(copy(SHADE_BRICKS.get()))); - public static final DeferredBlock CRACKED_SHADE_BRICKS = REGISTER.register("cracked_shade_bricks", () -> new Block(copy(SHADE_BRICKS.get()))); - - public static final DeferredBlock MOSSY_SHADE_BRICKS = REGISTER.register("mossy_shade_bricks", () -> new Block(copy(SHADE_BRICKS.get()))); - public static final DeferredBlock MOSSY_SHADE_BRICK_STAIRS = REGISTER.register("mossy_shade_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_SHADE_BRICKS.get().defaultBlockState(), copy(MOSSY_SHADE_BRICKS.get()))); - public static final DeferredBlock MOSSY_SHADE_BRICK_SLAB = REGISTER.register("mossy_shade_brick_slab", () -> new SlabBlock(copy(MOSSY_SHADE_BRICKS.get()))); - public static final DeferredBlock MOSSY_SHADE_BRICK_WALL = REGISTER.register("mossy_shade_brick_wall", () -> new WallBlock(copy(MOSSY_SHADE_BRICKS.get()))); - - public static final DeferredBlock BLOOD_SHADE_BRICKS = REGISTER.register("blood_shade_bricks", () -> new Block(copy(SHADE_BRICKS.get()))); - public static final DeferredBlock BLOOD_SHADE_BRICK_STAIRS = REGISTER.register("blood_shade_brick_stairs", () -> new StairBlock(() -> MSBlocks.BLOOD_SHADE_BRICKS.get().defaultBlockState(), copy(BLOOD_SHADE_BRICKS.get()))); - public static final DeferredBlock BLOOD_SHADE_BRICK_SLAB = REGISTER.register("blood_shade_brick_slab", () -> new SlabBlock(copy(BLOOD_SHADE_BRICKS.get()))); - public static final DeferredBlock BLOOD_SHADE_BRICK_WALL = REGISTER.register("blood_shade_brick_wall", () -> new WallBlock(copy(BLOOD_SHADE_BRICKS.get()))); - - public static final DeferredBlock TAR_SHADE_BRICKS = REGISTER.register("tar_shade_bricks", () -> new Block(copy(SHADE_BRICKS.get()))); - public static final DeferredBlock TAR_SHADE_BRICK_STAIRS = REGISTER.register("tar_shade_brick_stairs", () -> new StairBlock(() -> MSBlocks.TAR_SHADE_BRICKS.get().defaultBlockState(), copy(TAR_SHADE_BRICKS.get()))); - public static final DeferredBlock TAR_SHADE_BRICK_SLAB = REGISTER.register("tar_shade_brick_slab", () -> new SlabBlock(copy(TAR_SHADE_BRICKS.get()))); - public static final DeferredBlock TAR_SHADE_BRICK_WALL = REGISTER.register("tar_shade_brick_wall", () -> new WallBlock(copy(TAR_SHADE_BRICKS.get()))); + public static final DeferredBlock SHADE_STAIRS = REGISTER.register("shade_stairs", () -> new StairBlock(() -> MSBlocks.SHADE_STONE.get().defaultBlockState(), ofFullCopy(SHADE_STONE.get()))); + public static final DeferredBlock SHADE_SLAB = REGISTER.register("shade_slab", () -> new SlabBlock(ofFullCopy(SHADE_STONE.get()))); + public static final DeferredBlock SHADE_WALL = REGISTER.register("shade_wall", () -> new WallBlock(ofFullCopy(SHADE_STONE.get()))); + public static final DeferredBlock SHADE_BUTTON = REGISTER.register("shade_button", () -> new ButtonBlock(MSBlockSetType.SHADE_STONE, 10, ofFullCopy(SHADE_STONE.get()))); + public static final DeferredBlock SHADE_PRESSURE_PLATE = REGISTER.register("shade_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.SHADE_STONE, ofFullCopy(SHADE_STONE.get()))); + + public static final DeferredBlock SHADE_BRICKS = REGISTER.register("shade_bricks", () -> new Block(ofFullCopy(SHADE_STONE.get()))); + public static final DeferredBlock SHADE_BRICK_STAIRS = REGISTER.register("shade_brick_stairs", () -> new StairBlock(() -> MSBlocks.SHADE_BRICKS.get().defaultBlockState(), ofFullCopy(SHADE_BRICKS.get()))); + public static final DeferredBlock SHADE_BRICK_SLAB = REGISTER.register("shade_brick_slab", () -> new SlabBlock(ofFullCopy(SHADE_BRICKS.get()))); + public static final DeferredBlock SHADE_BRICK_WALL = REGISTER.register("shade_brick_wall", () -> new WallBlock(ofFullCopy(SHADE_BRICKS.get()))); + + public static final DeferredBlock SMOOTH_SHADE_STONE = REGISTER.register("smooth_shade_stone", () -> new Block(ofFullCopy(SHADE_STONE.get()))); + public static final DeferredBlock SMOOTH_SHADE_STONE_STAIRS = REGISTER.register("smooth_shade_stone_stairs", () -> new StairBlock(() -> MSBlocks.SMOOTH_SHADE_STONE.get().defaultBlockState(), ofFullCopy(SMOOTH_SHADE_STONE.get()))); + public static final DeferredBlock SMOOTH_SHADE_STONE_SLAB = REGISTER.register("smooth_shade_stone_slab", () -> new SlabBlock(ofFullCopy(SMOOTH_SHADE_STONE.get()))); + public static final DeferredBlock SMOOTH_SHADE_STONE_WALL = REGISTER.register("smooth_shade_stone_wall", () -> new WallBlock(ofFullCopy(SMOOTH_SHADE_STONE.get()))); + + public static final DeferredBlock SHADE_COLUMN = REGISTER.register("shade_column", () -> new MSDirectionalBlock(ofFullCopy(SHADE_STONE.get()))); + public static final DeferredBlock CHISELED_SHADE_BRICKS = REGISTER.register("chiseled_shade_bricks", () -> new Block(ofFullCopy(SHADE_BRICKS.get()))); + public static final DeferredBlock CRACKED_SHADE_BRICKS = REGISTER.register("cracked_shade_bricks", () -> new Block(ofFullCopy(SHADE_BRICKS.get()))); + + public static final DeferredBlock MOSSY_SHADE_BRICKS = REGISTER.register("mossy_shade_bricks", () -> new Block(ofFullCopy(SHADE_BRICKS.get()))); + public static final DeferredBlock MOSSY_SHADE_BRICK_STAIRS = REGISTER.register("mossy_shade_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_SHADE_BRICKS.get().defaultBlockState(), ofFullCopy(MOSSY_SHADE_BRICKS.get()))); + public static final DeferredBlock MOSSY_SHADE_BRICK_SLAB = REGISTER.register("mossy_shade_brick_slab", () -> new SlabBlock(ofFullCopy(MOSSY_SHADE_BRICKS.get()))); + public static final DeferredBlock MOSSY_SHADE_BRICK_WALL = REGISTER.register("mossy_shade_brick_wall", () -> new WallBlock(ofFullCopy(MOSSY_SHADE_BRICKS.get()))); + + public static final DeferredBlock BLOOD_SHADE_BRICKS = REGISTER.register("blood_shade_bricks", () -> new Block(ofFullCopy(SHADE_BRICKS.get()))); + public static final DeferredBlock BLOOD_SHADE_BRICK_STAIRS = REGISTER.register("blood_shade_brick_stairs", () -> new StairBlock(() -> MSBlocks.BLOOD_SHADE_BRICKS.get().defaultBlockState(), ofFullCopy(BLOOD_SHADE_BRICKS.get()))); + public static final DeferredBlock BLOOD_SHADE_BRICK_SLAB = REGISTER.register("blood_shade_brick_slab", () -> new SlabBlock(ofFullCopy(BLOOD_SHADE_BRICKS.get()))); + public static final DeferredBlock BLOOD_SHADE_BRICK_WALL = REGISTER.register("blood_shade_brick_wall", () -> new WallBlock(ofFullCopy(BLOOD_SHADE_BRICKS.get()))); + + public static final DeferredBlock TAR_SHADE_BRICKS = REGISTER.register("tar_shade_bricks", () -> new Block(ofFullCopy(SHADE_BRICKS.get()))); + public static final DeferredBlock TAR_SHADE_BRICK_STAIRS = REGISTER.register("tar_shade_brick_stairs", () -> new StairBlock(() -> MSBlocks.TAR_SHADE_BRICKS.get().defaultBlockState(), ofFullCopy(TAR_SHADE_BRICKS.get()))); + public static final DeferredBlock TAR_SHADE_BRICK_SLAB = REGISTER.register("tar_shade_brick_slab", () -> new SlabBlock(ofFullCopy(TAR_SHADE_BRICKS.get()))); + public static final DeferredBlock TAR_SHADE_BRICK_WALL = REGISTER.register("tar_shade_brick_wall", () -> new WallBlock(ofFullCopy(TAR_SHADE_BRICKS.get()))); //Frost public static final DeferredBlock FROST_TILE = REGISTER.register("frost_tile", () -> new Block(Block.Properties.of().mapColor(MapColor.ICE).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock FROST_TILE_STAIRS = REGISTER.register("frost_tile_stairs", () -> new StairBlock(() -> MSBlocks.FROST_TILE.get().defaultBlockState(), copy(FROST_TILE.get()))); - public static final DeferredBlock FROST_TILE_SLAB = REGISTER.register("frost_tile_slab", () -> new SlabBlock(copy(FROST_TILE.get()))); - public static final DeferredBlock FROST_TILE_WALL = REGISTER.register("frost_tile_wall", () -> new WallBlock(copy(FROST_TILE.get()))); + public static final DeferredBlock FROST_TILE_STAIRS = REGISTER.register("frost_tile_stairs", () -> new StairBlock(() -> MSBlocks.FROST_TILE.get().defaultBlockState(), ofFullCopy(FROST_TILE.get()))); + public static final DeferredBlock FROST_TILE_SLAB = REGISTER.register("frost_tile_slab", () -> new SlabBlock(ofFullCopy(FROST_TILE.get()))); + public static final DeferredBlock FROST_TILE_WALL = REGISTER.register("frost_tile_wall", () -> new WallBlock(ofFullCopy(FROST_TILE.get()))); - public static final DeferredBlock FROST_BRICKS = REGISTER.register("frost_bricks", () -> new Block(copy(FROST_TILE.get()))); - public static final DeferredBlock FROST_BRICK_STAIRS = REGISTER.register("frost_brick_stairs", () -> new StairBlock(() -> MSBlocks.FROST_BRICKS.get().defaultBlockState(), copy(FROST_BRICKS.get()))); - public static final DeferredBlock FROST_BRICK_SLAB = REGISTER.register("frost_brick_slab", () -> new SlabBlock(copy(FROST_BRICKS.get()))); - public static final DeferredBlock FROST_BRICK_WALL = REGISTER.register("frost_brick_wall", () -> new WallBlock(copy(FROST_BRICKS.get()))); + public static final DeferredBlock FROST_BRICKS = REGISTER.register("frost_bricks", () -> new Block(ofFullCopy(FROST_TILE.get()))); + public static final DeferredBlock FROST_BRICK_STAIRS = REGISTER.register("frost_brick_stairs", () -> new StairBlock(() -> MSBlocks.FROST_BRICKS.get().defaultBlockState(), ofFullCopy(FROST_BRICKS.get()))); + public static final DeferredBlock FROST_BRICK_SLAB = REGISTER.register("frost_brick_slab", () -> new SlabBlock(ofFullCopy(FROST_BRICKS.get()))); + public static final DeferredBlock FROST_BRICK_WALL = REGISTER.register("frost_brick_wall", () -> new WallBlock(ofFullCopy(FROST_BRICKS.get()))); - public static final DeferredBlock CHISELED_FROST_TILE = REGISTER.register("chiseled_frost_tile", () -> new Block(copy(FROST_TILE.get()))); - public static final DeferredBlock FROST_COLUMN = REGISTER.register("frost_column", () -> new MSDirectionalBlock(copy(FROST_TILE.get()))); - public static final DeferredBlock CHISELED_FROST_BRICKS = REGISTER.register("chiseled_frost_bricks", () -> new Block(copy(FROST_BRICKS.get()))); //while it is a pillar block, it cannot be rotated, making it similar to cut sandstone - public static final DeferredBlock CRACKED_FROST_BRICKS = REGISTER.register("cracked_frost_bricks", () -> new Block(copy(FROST_BRICKS.get()))); + public static final DeferredBlock CHISELED_FROST_TILE = REGISTER.register("chiseled_frost_tile", () -> new Block(ofFullCopy(FROST_TILE.get()))); + public static final DeferredBlock FROST_COLUMN = REGISTER.register("frost_column", () -> new MSDirectionalBlock(ofFullCopy(FROST_TILE.get()))); + public static final DeferredBlock CHISELED_FROST_BRICKS = REGISTER.register("chiseled_frost_bricks", () -> new Block(ofFullCopy(FROST_BRICKS.get()))); //while it is a pillar block, it cannot be rotated, making it similar to cut sandstone + public static final DeferredBlock CRACKED_FROST_BRICKS = REGISTER.register("cracked_frost_bricks", () -> new Block(ofFullCopy(FROST_BRICKS.get()))); - public static final DeferredBlock FLOWERY_FROST_BRICKS = REGISTER.register("flowery_frost_bricks", () -> new Block(copy(FROST_BRICKS.get()))); - public static final DeferredBlock FLOWERY_FROST_BRICK_STAIRS = REGISTER.register("flowery_frost_brick_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_FROST_BRICKS.get().defaultBlockState(), copy(FLOWERY_FROST_BRICKS.get()))); - public static final DeferredBlock FLOWERY_FROST_BRICK_SLAB = REGISTER.register("flowery_frost_brick_slab", () -> new SlabBlock(copy(FLOWERY_FROST_BRICKS.get()))); - public static final DeferredBlock FLOWERY_FROST_BRICK_WALL = REGISTER.register("flowery_frost_brick_wall", () -> new WallBlock(copy(FLOWERY_FROST_BRICKS.get()))); + public static final DeferredBlock FLOWERY_FROST_BRICKS = REGISTER.register("flowery_frost_bricks", () -> new Block(ofFullCopy(FROST_BRICKS.get()))); + public static final DeferredBlock FLOWERY_FROST_BRICK_STAIRS = REGISTER.register("flowery_frost_brick_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_FROST_BRICKS.get().defaultBlockState(), ofFullCopy(FLOWERY_FROST_BRICKS.get()))); + public static final DeferredBlock FLOWERY_FROST_BRICK_SLAB = REGISTER.register("flowery_frost_brick_slab", () -> new SlabBlock(ofFullCopy(FLOWERY_FROST_BRICKS.get()))); + public static final DeferredBlock FLOWERY_FROST_BRICK_WALL = REGISTER.register("flowery_frost_brick_wall", () -> new WallBlock(ofFullCopy(FLOWERY_FROST_BRICKS.get()))); //Cast Iron public static final DeferredBlock CAST_IRON = REGISTER.register("cast_iron", () -> new Block(Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(3.0F, 9.0F))); - public static final DeferredBlock CAST_IRON_STAIRS = REGISTER.register("cast_iron_stairs", () -> new StairBlock(() -> MSBlocks.CAST_IRON.get().defaultBlockState(), copy(CAST_IRON.get()))); - public static final DeferredBlock CAST_IRON_SLAB = REGISTER.register("cast_iron_slab", () -> new SlabBlock(copy(CAST_IRON.get()))); - public static final DeferredBlock CAST_IRON_WALL = REGISTER.register("cast_iron_wall", () -> new WallBlock(copy(CAST_IRON.get()))); - public static final DeferredBlock CAST_IRON_BUTTON = REGISTER.register("cast_iron_button", () -> new ButtonBlock(copy(CAST_IRON.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock CAST_IRON_PRESSURE_PLATE = REGISTER.register("cast_iron_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(CAST_IRON.get()), BlockSetType.IRON)); + public static final DeferredBlock CAST_IRON_STAIRS = REGISTER.register("cast_iron_stairs", () -> new StairBlock(() -> MSBlocks.CAST_IRON.get().defaultBlockState(), ofFullCopy(CAST_IRON.get()))); + public static final DeferredBlock CAST_IRON_SLAB = REGISTER.register("cast_iron_slab", () -> new SlabBlock(ofFullCopy(CAST_IRON.get()))); + public static final DeferredBlock CAST_IRON_WALL = REGISTER.register("cast_iron_wall", () -> new WallBlock(ofFullCopy(CAST_IRON.get()))); + public static final DeferredBlock CAST_IRON_BUTTON = REGISTER.register("cast_iron_button", () -> new ButtonBlock(MSBlockSetType.CAST_IRON, 10, ofFullCopy(CAST_IRON.get()))); + public static final DeferredBlock CAST_IRON_PRESSURE_PLATE = REGISTER.register("cast_iron_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.CAST_IRON, ofFullCopy(CAST_IRON.get()))); - public static final DeferredBlock CAST_IRON_TILE = REGISTER.register("cast_iron_tile", () -> new Block(copy(CAST_IRON.get()))); - public static final DeferredBlock CAST_IRON_TILE_STAIRS = REGISTER.register("cast_iron_tile_stairs", () -> new StairBlock(() -> MSBlocks.CAST_IRON_TILE.get().defaultBlockState(), copy(CAST_IRON_TILE.get()))); - public static final DeferredBlock CAST_IRON_TILE_SLAB = REGISTER.register("cast_iron_tile_slab", () -> new SlabBlock(copy(CAST_IRON_TILE.get()))); + public static final DeferredBlock CAST_IRON_TILE = REGISTER.register("cast_iron_tile", () -> new Block(ofFullCopy(CAST_IRON.get()))); + public static final DeferredBlock CAST_IRON_TILE_STAIRS = REGISTER.register("cast_iron_tile_stairs", () -> new StairBlock(() -> MSBlocks.CAST_IRON_TILE.get().defaultBlockState(), ofFullCopy(CAST_IRON_TILE.get()))); + public static final DeferredBlock CAST_IRON_TILE_SLAB = REGISTER.register("cast_iron_tile_slab", () -> new SlabBlock(ofFullCopy(CAST_IRON_TILE.get()))); - public static final DeferredBlock CAST_IRON_SHEET = REGISTER.register("cast_iron_sheet", () -> new Block(copy(CAST_IRON.get()))); - public static final DeferredBlock CAST_IRON_SHEET_STAIRS = REGISTER.register("cast_iron_sheet_stairs", () -> new StairBlock(() -> MSBlocks.CAST_IRON_SHEET.get().defaultBlockState(), copy(CAST_IRON_SHEET.get()))); - public static final DeferredBlock CAST_IRON_SHEET_SLAB = REGISTER.register("cast_iron_sheet_slab", () -> new SlabBlock(copy(CAST_IRON_SHEET.get()))); + public static final DeferredBlock CAST_IRON_SHEET = REGISTER.register("cast_iron_sheet", () -> new Block(ofFullCopy(CAST_IRON.get()))); + public static final DeferredBlock CAST_IRON_SHEET_STAIRS = REGISTER.register("cast_iron_sheet_stairs", () -> new StairBlock(() -> MSBlocks.CAST_IRON_SHEET.get().defaultBlockState(), ofFullCopy(CAST_IRON_SHEET.get()))); + public static final DeferredBlock CAST_IRON_SHEET_SLAB = REGISTER.register("cast_iron_sheet_slab", () -> new SlabBlock(ofFullCopy(CAST_IRON_SHEET.get()))); - public static final DeferredBlock CHISELED_CAST_IRON = REGISTER.register("chiseled_cast_iron", () -> new Block(copy(CAST_IRON.get()))); + public static final DeferredBlock CHISELED_CAST_IRON = REGISTER.register("chiseled_cast_iron", () -> new Block(ofFullCopy(CAST_IRON.get()))); public static final DeferredBlock CAST_IRON_FRAME = REGISTER.register("cast_iron_frame", () -> new MSDirectionalBlock(Block.Properties.of().noOcclusion().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(3.0F, 9.0F))); public static final DeferredBlock STEEL_BEAM = REGISTER.register("steel_beam", () -> new MSDirectionalBlock(Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(3.0F, 9.0F))); @@ -270,275 +274,275 @@ private static Block coalOre(BlockBehaviour.Properties properties) //Mycelium public static final DeferredBlock MYCELIUM_STONE = REGISTER.register("mycelium_stone", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_MAGENTA).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock MYCELIUM_STAIRS = REGISTER.register("mycelium_stairs", () -> new StairBlock(() -> MSBlocks.MYCELIUM_STONE.get().defaultBlockState(), copy(MYCELIUM_STONE.get()))); - public static final DeferredBlock MYCELIUM_SLAB = REGISTER.register("mycelium_slab", () -> new SlabBlock(copy(MYCELIUM_STONE.get()))); - public static final DeferredBlock MYCELIUM_STONE_WALL = REGISTER.register("mycelium_stone_wall", () -> new WallBlock(copy(MYCELIUM_STONE.get()))); - public static final DeferredBlock MYCELIUM_STONE_BUTTON = REGISTER.register("mycelium_stone_button", () -> new ButtonBlock(copy(MYCELIUM_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock MYCELIUM_STONE_PRESSURE_PLATE = REGISTER.register("mycelium_stone_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(MYCELIUM_STONE.get()), BlockSetType.STONE)); - - public static final DeferredBlock MYCELIUM_COBBLESTONE = REGISTER.register("mycelium_cobblestone", () -> new Block(copy(MYCELIUM_STONE.get()))); - public static final DeferredBlock MYCELIUM_COBBLESTONE_STAIRS = REGISTER.register("mycelium_cobblestone_stairs", () -> new StairBlock(() -> MSBlocks.MYCELIUM_COBBLESTONE.get().defaultBlockState(), copy(MYCELIUM_COBBLESTONE.get()))); - public static final DeferredBlock MYCELIUM_COBBLESTONE_SLAB = REGISTER.register("mycelium_cobblestone_slab", () -> new SlabBlock(copy(MYCELIUM_COBBLESTONE.get()))); - public static final DeferredBlock MYCELIUM_COBBLESTONE_WALL = REGISTER.register("mycelium_cobblestone_wall", () -> new WallBlock(copy(MYCELIUM_COBBLESTONE.get()))); - - public static final DeferredBlock POLISHED_MYCELIUM_STONE = REGISTER.register("polished_mycelium_stone", () -> new Block(copy(MYCELIUM_STONE.get()))); - public static final DeferredBlock POLISHED_MYCELIUM_STONE_STAIRS = REGISTER.register("polished_mycelium_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_MYCELIUM_STONE.get().defaultBlockState(), copy(POLISHED_MYCELIUM_STONE.get()))); - public static final DeferredBlock POLISHED_MYCELIUM_STONE_SLAB = REGISTER.register("polished_mycelium_stone_slab", () -> new SlabBlock(copy(POLISHED_MYCELIUM_STONE.get()))); - public static final DeferredBlock POLISHED_MYCELIUM_STONE_WALL = REGISTER.register("polished_mycelium_stone_wall", () -> new WallBlock(copy(POLISHED_MYCELIUM_STONE.get()))); - - public static final DeferredBlock MYCELIUM_BRICKS = REGISTER.register("mycelium_bricks", () -> new Block(copy(MYCELIUM_STONE.get()))); - public static final DeferredBlock MYCELIUM_BRICK_STAIRS = REGISTER.register("mycelium_brick_stairs", () -> new StairBlock(() -> MSBlocks.MYCELIUM_BRICKS.get().defaultBlockState(), copy(MYCELIUM_BRICKS.get()))); - public static final DeferredBlock MYCELIUM_BRICK_SLAB = REGISTER.register("mycelium_brick_slab", () -> new SlabBlock(copy(MYCELIUM_BRICKS.get()))); - public static final DeferredBlock MYCELIUM_BRICK_WALL = REGISTER.register("mycelium_brick_wall", () -> new WallBlock(copy(MYCELIUM_BRICKS.get()))); - - public static final DeferredBlock MYCELIUM_COLUMN = REGISTER.register("mycelium_column", () -> new MSDirectionalBlock(copy(MYCELIUM_STONE.get()))); - public static final DeferredBlock CHISELED_MYCELIUM_BRICKS = REGISTER.register("chiseled_mycelium_bricks", () -> new Block(copy(MYCELIUM_BRICKS.get()))); - public static final DeferredBlock SUSPICIOUS_CHISELED_MYCELIUM_BRICKS = REGISTER.register("suspicious_chiseled_mycelium_bricks", () -> new Block(copy(MYCELIUM_BRICKS.get()))); - public static final DeferredBlock CRACKED_MYCELIUM_BRICKS = REGISTER.register("cracked_mycelium_bricks", () -> new Block(copy(MYCELIUM_BRICKS.get()))); - - public static final DeferredBlock MOSSY_MYCELIUM_BRICKS = REGISTER.register("mossy_mycelium_bricks", () -> new Block(copy(MYCELIUM_BRICKS.get()))); - public static final DeferredBlock MOSSY_MYCELIUM_BRICK_STAIRS = REGISTER.register("mossy_mycelium_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_MYCELIUM_BRICKS.get().defaultBlockState(), copy(MOSSY_MYCELIUM_BRICKS.get()))); - public static final DeferredBlock MOSSY_MYCELIUM_BRICK_SLAB = REGISTER.register("mossy_mycelium_brick_slab", () -> new SlabBlock(copy(MOSSY_MYCELIUM_BRICKS.get()))); - public static final DeferredBlock MOSSY_MYCELIUM_BRICK_WALL = REGISTER.register("mossy_mycelium_brick_wall", () -> new WallBlock(copy(MOSSY_MYCELIUM_BRICKS.get()))); - - public static final DeferredBlock FLOWERY_MYCELIUM_BRICKS = REGISTER.register("flowery_mycelium_bricks", () -> new Block(copy(MYCELIUM_BRICKS.get()))); - public static final DeferredBlock FLOWERY_MYCELIUM_BRICK_STAIRS = REGISTER.register("flowery_mycelium_brick_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_MYCELIUM_BRICKS.get().defaultBlockState(), copy(FLOWERY_MYCELIUM_BRICKS.get()))); - public static final DeferredBlock FLOWERY_MYCELIUM_BRICK_SLAB = REGISTER.register("flowery_mycelium_brick_slab", () -> new SlabBlock(copy(FLOWERY_MYCELIUM_BRICKS.get()))); - public static final DeferredBlock FLOWERY_MYCELIUM_BRICK_WALL = REGISTER.register("flowery_mycelium_brick_wall", () -> new WallBlock(copy(FLOWERY_MYCELIUM_BRICKS.get()))); + public static final DeferredBlock MYCELIUM_STAIRS = REGISTER.register("mycelium_stairs", () -> new StairBlock(() -> MSBlocks.MYCELIUM_STONE.get().defaultBlockState(), ofFullCopy(MYCELIUM_STONE.get()))); + public static final DeferredBlock MYCELIUM_SLAB = REGISTER.register("mycelium_slab", () -> new SlabBlock(ofFullCopy(MYCELIUM_STONE.get()))); + public static final DeferredBlock MYCELIUM_STONE_WALL = REGISTER.register("mycelium_stone_wall", () -> new WallBlock(ofFullCopy(MYCELIUM_STONE.get()))); + public static final DeferredBlock MYCELIUM_STONE_BUTTON = REGISTER.register("mycelium_stone_button", () -> new ButtonBlock(MSBlockSetType.MYCELIUM_STONE, 10, ofFullCopy(MYCELIUM_STONE.get()))); + public static final DeferredBlock MYCELIUM_STONE_PRESSURE_PLATE = REGISTER.register("mycelium_stone_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.MYCELIUM_STONE, ofFullCopy(MYCELIUM_STONE.get()))); + + public static final DeferredBlock MYCELIUM_COBBLESTONE = REGISTER.register("mycelium_cobblestone", () -> new Block(ofFullCopy(MYCELIUM_STONE.get()))); + public static final DeferredBlock MYCELIUM_COBBLESTONE_STAIRS = REGISTER.register("mycelium_cobblestone_stairs", () -> new StairBlock(() -> MSBlocks.MYCELIUM_COBBLESTONE.get().defaultBlockState(), ofFullCopy(MYCELIUM_COBBLESTONE.get()))); + public static final DeferredBlock MYCELIUM_COBBLESTONE_SLAB = REGISTER.register("mycelium_cobblestone_slab", () -> new SlabBlock(ofFullCopy(MYCELIUM_COBBLESTONE.get()))); + public static final DeferredBlock MYCELIUM_COBBLESTONE_WALL = REGISTER.register("mycelium_cobblestone_wall", () -> new WallBlock(ofFullCopy(MYCELIUM_COBBLESTONE.get()))); + + public static final DeferredBlock POLISHED_MYCELIUM_STONE = REGISTER.register("polished_mycelium_stone", () -> new Block(ofFullCopy(MYCELIUM_STONE.get()))); + public static final DeferredBlock POLISHED_MYCELIUM_STONE_STAIRS = REGISTER.register("polished_mycelium_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_MYCELIUM_STONE.get().defaultBlockState(), ofFullCopy(POLISHED_MYCELIUM_STONE.get()))); + public static final DeferredBlock POLISHED_MYCELIUM_STONE_SLAB = REGISTER.register("polished_mycelium_stone_slab", () -> new SlabBlock(ofFullCopy(POLISHED_MYCELIUM_STONE.get()))); + public static final DeferredBlock POLISHED_MYCELIUM_STONE_WALL = REGISTER.register("polished_mycelium_stone_wall", () -> new WallBlock(ofFullCopy(POLISHED_MYCELIUM_STONE.get()))); + + public static final DeferredBlock MYCELIUM_BRICKS = REGISTER.register("mycelium_bricks", () -> new Block(ofFullCopy(MYCELIUM_STONE.get()))); + public static final DeferredBlock MYCELIUM_BRICK_STAIRS = REGISTER.register("mycelium_brick_stairs", () -> new StairBlock(() -> MSBlocks.MYCELIUM_BRICKS.get().defaultBlockState(), ofFullCopy(MYCELIUM_BRICKS.get()))); + public static final DeferredBlock MYCELIUM_BRICK_SLAB = REGISTER.register("mycelium_brick_slab", () -> new SlabBlock(ofFullCopy(MYCELIUM_BRICKS.get()))); + public static final DeferredBlock MYCELIUM_BRICK_WALL = REGISTER.register("mycelium_brick_wall", () -> new WallBlock(ofFullCopy(MYCELIUM_BRICKS.get()))); + + public static final DeferredBlock MYCELIUM_COLUMN = REGISTER.register("mycelium_column", () -> new MSDirectionalBlock(ofFullCopy(MYCELIUM_STONE.get()))); + public static final DeferredBlock CHISELED_MYCELIUM_BRICKS = REGISTER.register("chiseled_mycelium_bricks", () -> new Block(ofFullCopy(MYCELIUM_BRICKS.get()))); + public static final DeferredBlock SUSPICIOUS_CHISELED_MYCELIUM_BRICKS = REGISTER.register("suspicious_chiseled_mycelium_bricks", () -> new Block(ofFullCopy(MYCELIUM_BRICKS.get()))); + public static final DeferredBlock CRACKED_MYCELIUM_BRICKS = REGISTER.register("cracked_mycelium_bricks", () -> new Block(ofFullCopy(MYCELIUM_BRICKS.get()))); + + public static final DeferredBlock MOSSY_MYCELIUM_BRICKS = REGISTER.register("mossy_mycelium_bricks", () -> new Block(ofFullCopy(MYCELIUM_BRICKS.get()))); + public static final DeferredBlock MOSSY_MYCELIUM_BRICK_STAIRS = REGISTER.register("mossy_mycelium_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_MYCELIUM_BRICKS.get().defaultBlockState(), ofFullCopy(MOSSY_MYCELIUM_BRICKS.get()))); + public static final DeferredBlock MOSSY_MYCELIUM_BRICK_SLAB = REGISTER.register("mossy_mycelium_brick_slab", () -> new SlabBlock(ofFullCopy(MOSSY_MYCELIUM_BRICKS.get()))); + public static final DeferredBlock MOSSY_MYCELIUM_BRICK_WALL = REGISTER.register("mossy_mycelium_brick_wall", () -> new WallBlock(ofFullCopy(MOSSY_MYCELIUM_BRICKS.get()))); + + public static final DeferredBlock FLOWERY_MYCELIUM_BRICKS = REGISTER.register("flowery_mycelium_bricks", () -> new Block(ofFullCopy(MYCELIUM_BRICKS.get()))); + public static final DeferredBlock FLOWERY_MYCELIUM_BRICK_STAIRS = REGISTER.register("flowery_mycelium_brick_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_MYCELIUM_BRICKS.get().defaultBlockState(), ofFullCopy(FLOWERY_MYCELIUM_BRICKS.get()))); + public static final DeferredBlock FLOWERY_MYCELIUM_BRICK_SLAB = REGISTER.register("flowery_mycelium_brick_slab", () -> new SlabBlock(ofFullCopy(FLOWERY_MYCELIUM_BRICKS.get()))); + public static final DeferredBlock FLOWERY_MYCELIUM_BRICK_WALL = REGISTER.register("flowery_mycelium_brick_wall", () -> new WallBlock(ofFullCopy(FLOWERY_MYCELIUM_BRICKS.get()))); //Black - public static final DeferredBlock BLACK_SAND = REGISTER.register("black_sand", () -> new SandBlock(0x181915, Block.Properties.of().mapColor(MapColor.COLOR_BLACK).instrument(NoteBlockInstrument.SNARE).strength(0.5F).sound(SoundType.SAND))); + public static final DeferredBlock BLACK_SAND = REGISTER.register("black_sand", () -> new ColoredFallingBlock(new ColorRGBA(0x181915), Block.Properties.of().mapColor(MapColor.COLOR_BLACK).instrument(NoteBlockInstrument.SNARE).strength(0.5F).sound(SoundType.SAND))); public static final DeferredBlock BLACK_STONE = REGISTER.register("black_stone", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(2.5F, 6.0F))); - public static final DeferredBlock BLACK_STONE_STAIRS = REGISTER.register("black_stone_stairs", () -> new StairBlock(() -> MSBlocks.BLACK_STONE.get().defaultBlockState(), copy(BLACK_STONE.get()))); - public static final DeferredBlock BLACK_STONE_SLAB = REGISTER.register("black_stone_slab", () -> new SlabBlock(copy(BLACK_STONE.get()))); - public static final DeferredBlock BLACK_STONE_WALL = REGISTER.register("black_stone_wall", () -> new WallBlock(copy(BLACK_STONE.get()))); - public static final DeferredBlock BLACK_STONE_BUTTON = REGISTER.register("black_stone_button", () -> new ButtonBlock(copy(BLACK_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock BLACK_STONE_PRESSURE_PLATE = REGISTER.register("black_stone_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(BLACK_STONE.get()), BlockSetType.STONE)); - - public static final DeferredBlock BLACK_COBBLESTONE = REGISTER.register("black_cobblestone", () -> new Block(copy(BLACK_STONE.get()))); - public static final DeferredBlock BLACK_COBBLESTONE_STAIRS = REGISTER.register("black_cobblestone_stairs", () -> new StairBlock(() -> MSBlocks.BLACK_COBBLESTONE.get().defaultBlockState(), copy(BLACK_COBBLESTONE.get()))); - public static final DeferredBlock BLACK_COBBLESTONE_SLAB = REGISTER.register("black_cobblestone_slab", () -> new SlabBlock(copy(BLACK_COBBLESTONE.get()))); - public static final DeferredBlock BLACK_COBBLESTONE_WALL = REGISTER.register("black_cobblestone_wall", () -> new WallBlock(copy(BLACK_COBBLESTONE.get()))); - - public static final DeferredBlock POLISHED_BLACK_STONE = REGISTER.register("polished_black_stone", () -> new Block(copy(BLACK_STONE.get()))); - public static final DeferredBlock POLISHED_BLACK_STONE_STAIRS = REGISTER.register("polished_black_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_BLACK_STONE.get().defaultBlockState(), copy(POLISHED_BLACK_STONE.get()))); - public static final DeferredBlock POLISHED_BLACK_STONE_SLAB = REGISTER.register("polished_black_stone_slab", () -> new SlabBlock(copy(POLISHED_BLACK_STONE.get()))); - public static final DeferredBlock POLISHED_BLACK_STONE_WALL = REGISTER.register("polished_black_stone_wall", () -> new WallBlock(copy(POLISHED_BLACK_STONE.get()))); - - public static final DeferredBlock BLACK_STONE_BRICKS = REGISTER.register("black_stone_bricks", () -> new Block(copy(BLACK_STONE.get()))); - public static final DeferredBlock BLACK_STONE_BRICK_STAIRS = REGISTER.register("black_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.BLACK_STONE_BRICKS.get().defaultBlockState(), copy(BLACK_STONE_BRICKS.get()))); - public static final DeferredBlock BLACK_STONE_BRICK_SLAB = REGISTER.register("black_stone_brick_slab", () -> new SlabBlock(copy(BLACK_STONE_BRICKS.get()))); - public static final DeferredBlock BLACK_STONE_BRICK_WALL = REGISTER.register("black_stone_brick_wall", () -> new WallBlock(copy(BLACK_STONE_BRICKS.get()))); - - public static final DeferredBlock BLACK_STONE_COLUMN = REGISTER.register("black_stone_column", () -> new MSDirectionalBlock(copy(BLACK_STONE.get()))); - public static final DeferredBlock CHISELED_BLACK_STONE_BRICKS = REGISTER.register("chiseled_black_stone_bricks", () -> new Block(copy(BLACK_STONE_BRICKS.get()))); - public static final DeferredBlock CRACKED_BLACK_STONE_BRICKS = REGISTER.register("cracked_black_stone_bricks", () -> new Block(copy(BLACK_STONE_BRICKS.get()))); - - public static final DeferredBlock MAGMATIC_BLACK_STONE_BRICKS = REGISTER.register("magmatic_black_stone_bricks", () -> new Block(copy(BLACK_STONE_BRICKS.get()))); - public static final DeferredBlock MAGMATIC_BLACK_STONE_BRICK_STAIRS = REGISTER.register("magmatic_black_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.BLACK_STONE_BRICKS.get().defaultBlockState(), copy(BLACK_STONE_BRICKS.get()))); - public static final DeferredBlock MAGMATIC_BLACK_STONE_BRICK_SLAB = REGISTER.register("magmatic_black_stone_brick_slab", () -> new SlabBlock(copy(BLACK_STONE_BRICKS.get()))); - public static final DeferredBlock MAGMATIC_BLACK_STONE_BRICK_WALL = REGISTER.register("magmatic_black_stone_brick_wall", () -> new WallBlock(copy(BLACK_STONE_BRICKS.get()))); + public static final DeferredBlock BLACK_STONE_STAIRS = REGISTER.register("black_stone_stairs", () -> new StairBlock(() -> MSBlocks.BLACK_STONE.get().defaultBlockState(), ofFullCopy(BLACK_STONE.get()))); + public static final DeferredBlock BLACK_STONE_SLAB = REGISTER.register("black_stone_slab", () -> new SlabBlock(ofFullCopy(BLACK_STONE.get()))); + public static final DeferredBlock BLACK_STONE_WALL = REGISTER.register("black_stone_wall", () -> new WallBlock(ofFullCopy(BLACK_STONE.get()))); + public static final DeferredBlock BLACK_STONE_BUTTON = REGISTER.register("black_stone_button", () -> new ButtonBlock(MSBlockSetType.BLACK_STONE, 10, ofFullCopy(BLACK_STONE.get()))); + public static final DeferredBlock BLACK_STONE_PRESSURE_PLATE = REGISTER.register("black_stone_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.BLACK_STONE, ofFullCopy(BLACK_STONE.get()))); + + public static final DeferredBlock BLACK_COBBLESTONE = REGISTER.register("black_cobblestone", () -> new Block(ofFullCopy(BLACK_STONE.get()))); + public static final DeferredBlock BLACK_COBBLESTONE_STAIRS = REGISTER.register("black_cobblestone_stairs", () -> new StairBlock(() -> MSBlocks.BLACK_COBBLESTONE.get().defaultBlockState(), ofFullCopy(BLACK_COBBLESTONE.get()))); + public static final DeferredBlock BLACK_COBBLESTONE_SLAB = REGISTER.register("black_cobblestone_slab", () -> new SlabBlock(ofFullCopy(BLACK_COBBLESTONE.get()))); + public static final DeferredBlock BLACK_COBBLESTONE_WALL = REGISTER.register("black_cobblestone_wall", () -> new WallBlock(ofFullCopy(BLACK_COBBLESTONE.get()))); + + public static final DeferredBlock POLISHED_BLACK_STONE = REGISTER.register("polished_black_stone", () -> new Block(ofFullCopy(BLACK_STONE.get()))); + public static final DeferredBlock POLISHED_BLACK_STONE_STAIRS = REGISTER.register("polished_black_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_BLACK_STONE.get().defaultBlockState(), ofFullCopy(POLISHED_BLACK_STONE.get()))); + public static final DeferredBlock POLISHED_BLACK_STONE_SLAB = REGISTER.register("polished_black_stone_slab", () -> new SlabBlock(ofFullCopy(POLISHED_BLACK_STONE.get()))); + public static final DeferredBlock POLISHED_BLACK_STONE_WALL = REGISTER.register("polished_black_stone_wall", () -> new WallBlock(ofFullCopy(POLISHED_BLACK_STONE.get()))); + + public static final DeferredBlock BLACK_STONE_BRICKS = REGISTER.register("black_stone_bricks", () -> new Block(ofFullCopy(BLACK_STONE.get()))); + public static final DeferredBlock BLACK_STONE_BRICK_STAIRS = REGISTER.register("black_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.BLACK_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(BLACK_STONE_BRICKS.get()))); + public static final DeferredBlock BLACK_STONE_BRICK_SLAB = REGISTER.register("black_stone_brick_slab", () -> new SlabBlock(ofFullCopy(BLACK_STONE_BRICKS.get()))); + public static final DeferredBlock BLACK_STONE_BRICK_WALL = REGISTER.register("black_stone_brick_wall", () -> new WallBlock(ofFullCopy(BLACK_STONE_BRICKS.get()))); + + public static final DeferredBlock BLACK_STONE_COLUMN = REGISTER.register("black_stone_column", () -> new MSDirectionalBlock(ofFullCopy(BLACK_STONE.get()))); + public static final DeferredBlock CHISELED_BLACK_STONE_BRICKS = REGISTER.register("chiseled_black_stone_bricks", () -> new Block(ofFullCopy(BLACK_STONE_BRICKS.get()))); + public static final DeferredBlock CRACKED_BLACK_STONE_BRICKS = REGISTER.register("cracked_black_stone_bricks", () -> new Block(ofFullCopy(BLACK_STONE_BRICKS.get()))); + + public static final DeferredBlock MAGMATIC_BLACK_STONE_BRICKS = REGISTER.register("magmatic_black_stone_bricks", () -> new Block(ofFullCopy(BLACK_STONE_BRICKS.get()))); + public static final DeferredBlock MAGMATIC_BLACK_STONE_BRICK_STAIRS = REGISTER.register("magmatic_black_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.BLACK_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(BLACK_STONE_BRICKS.get()))); + public static final DeferredBlock MAGMATIC_BLACK_STONE_BRICK_SLAB = REGISTER.register("magmatic_black_stone_brick_slab", () -> new SlabBlock(ofFullCopy(BLACK_STONE_BRICKS.get()))); + public static final DeferredBlock MAGMATIC_BLACK_STONE_BRICK_WALL = REGISTER.register("magmatic_black_stone_brick_wall", () -> new WallBlock(ofFullCopy(BLACK_STONE_BRICKS.get()))); //Igneous public static final DeferredBlock IGNEOUS_STONE = REGISTER.register("igneous_stone", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.GUITAR).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock IGNEOUS_STONE_STAIRS = REGISTER.register("igneous_stone_stairs", () -> new StairBlock(() -> MSBlocks.IGNEOUS_STONE.get().defaultBlockState(), copy(IGNEOUS_STONE.get()))); - public static final DeferredBlock IGNEOUS_STONE_SLAB = REGISTER.register("igneous_stone_slab", () -> new SlabBlock(copy(IGNEOUS_STONE.get()))); - public static final DeferredBlock IGNEOUS_STONE_WALL = REGISTER.register("igneous_stone_wall", () -> new WallBlock(copy(IGNEOUS_STONE.get()))); - public static final DeferredBlock IGNEOUS_STONE_BUTTON = REGISTER.register("igneous_stone_button", () -> new ButtonBlock(copy(IGNEOUS_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock IGNEOUS_STONE_PRESSURE_PLATE = REGISTER.register("igneous_stone_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(IGNEOUS_STONE.get()), BlockSetType.STONE)); + public static final DeferredBlock IGNEOUS_STONE_STAIRS = REGISTER.register("igneous_stone_stairs", () -> new StairBlock(() -> MSBlocks.IGNEOUS_STONE.get().defaultBlockState(), ofFullCopy(IGNEOUS_STONE.get()))); + public static final DeferredBlock IGNEOUS_STONE_SLAB = REGISTER.register("igneous_stone_slab", () -> new SlabBlock(ofFullCopy(IGNEOUS_STONE.get()))); + public static final DeferredBlock IGNEOUS_STONE_WALL = REGISTER.register("igneous_stone_wall", () -> new WallBlock(ofFullCopy(IGNEOUS_STONE.get()))); + public static final DeferredBlock IGNEOUS_STONE_BUTTON = REGISTER.register("igneous_stone_button", () -> new ButtonBlock(MSBlockSetType.IGNEOUS_STONE, 10, ofFullCopy(IGNEOUS_STONE.get()))); + public static final DeferredBlock IGNEOUS_STONE_PRESSURE_PLATE = REGISTER.register("igneous_stone_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.IGNEOUS_STONE, ofFullCopy(IGNEOUS_STONE.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_STONE = REGISTER.register("polished_igneous_stone", () -> new Block(copy(IGNEOUS_STONE.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_STAIRS = REGISTER.register("polished_igneous_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_IGNEOUS_STONE.get().defaultBlockState(), copy(POLISHED_IGNEOUS_STONE.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_SLAB = REGISTER.register("polished_igneous_stone_slab", () -> new SlabBlock(copy(POLISHED_IGNEOUS_STONE.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_WALL = REGISTER.register("polished_igneous_stone_wall", () -> new WallBlock(copy(POLISHED_IGNEOUS_STONE.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_STONE = REGISTER.register("polished_igneous_stone", () -> new Block(ofFullCopy(IGNEOUS_STONE.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_STAIRS = REGISTER.register("polished_igneous_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_IGNEOUS_STONE.get().defaultBlockState(), ofFullCopy(POLISHED_IGNEOUS_STONE.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_SLAB = REGISTER.register("polished_igneous_stone_slab", () -> new SlabBlock(ofFullCopy(POLISHED_IGNEOUS_STONE.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_WALL = REGISTER.register("polished_igneous_stone_wall", () -> new WallBlock(ofFullCopy(POLISHED_IGNEOUS_STONE.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_BRICKS = REGISTER.register("polished_igneous_bricks", () -> new Block(copy(POLISHED_IGNEOUS_STONE.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_BRICK_STAIRS = REGISTER.register("polished_igneous_brick_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_IGNEOUS_BRICKS.get().defaultBlockState(), copy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_BRICK_SLAB = REGISTER.register("polished_igneous_brick_slab", () -> new SlabBlock(copy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_BRICK_WALL = REGISTER.register("polished_igneous_brick_wall", () -> new WallBlock(copy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_BRICKS = REGISTER.register("polished_igneous_bricks", () -> new Block(ofFullCopy(POLISHED_IGNEOUS_STONE.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_BRICK_STAIRS = REGISTER.register("polished_igneous_brick_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_IGNEOUS_BRICKS.get().defaultBlockState(), ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_BRICK_SLAB = REGISTER.register("polished_igneous_brick_slab", () -> new SlabBlock(ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_BRICK_WALL = REGISTER.register("polished_igneous_brick_wall", () -> new WallBlock(ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock POLISHED_IGNEOUS_PILLAR = REGISTER.register("polished_igneous_pillar", () -> new MSDirectionalBlock(copy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock CHISELED_IGNEOUS_STONE = REGISTER.register("chiseled_igneous_stone", () -> new Block(copy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock CRACKED_POLISHED_IGNEOUS_BRICKS = REGISTER.register("cracked_polished_igneous_bricks", () -> new Block(copy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock POLISHED_IGNEOUS_PILLAR = REGISTER.register("polished_igneous_pillar", () -> new MSDirectionalBlock(ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock CHISELED_IGNEOUS_STONE = REGISTER.register("chiseled_igneous_stone", () -> new Block(ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock CRACKED_POLISHED_IGNEOUS_BRICKS = REGISTER.register("cracked_polished_igneous_bricks", () -> new Block(ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock MAGMATIC_POLISHED_IGNEOUS_BRICKS = REGISTER.register("magmatic_polished_igneous_bricks", () -> new Block(copy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock MAGMATIC_POLISHED_IGNEOUS_BRICK_STAIRS = REGISTER.register("magmatic_polished_igneous_brick_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_IGNEOUS_BRICKS.get().defaultBlockState(), copy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock MAGMATIC_POLISHED_IGNEOUS_BRICK_SLAB = REGISTER.register("magmatic_polished_igneous_brick_slab", () -> new SlabBlock(copy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock MAGMATIC_POLISHED_IGNEOUS_BRICK_WALL = REGISTER.register("magmatic_polished_igneous_brick_wall", () -> new WallBlock(copy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock MAGMATIC_POLISHED_IGNEOUS_BRICKS = REGISTER.register("magmatic_polished_igneous_bricks", () -> new Block(ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock MAGMATIC_POLISHED_IGNEOUS_BRICK_STAIRS = REGISTER.register("magmatic_polished_igneous_brick_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_IGNEOUS_BRICKS.get().defaultBlockState(), ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock MAGMATIC_POLISHED_IGNEOUS_BRICK_SLAB = REGISTER.register("magmatic_polished_igneous_brick_slab", () -> new SlabBlock(ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); + public static final DeferredBlock MAGMATIC_POLISHED_IGNEOUS_BRICK_WALL = REGISTER.register("magmatic_polished_igneous_brick_wall", () -> new WallBlock(ofFullCopy(POLISHED_IGNEOUS_BRICKS.get()))); - public static final DeferredBlock MAGMATIC_IGNEOUS_STONE = REGISTER.register("magmatic_igneous_stone", () -> new Block(copy(IGNEOUS_STONE.get()))); + public static final DeferredBlock MAGMATIC_IGNEOUS_STONE = REGISTER.register("magmatic_igneous_stone", () -> new Block(ofFullCopy(IGNEOUS_STONE.get()))); //Pumice public static final DeferredBlock PUMICE_STONE = REGISTER.register("pumice_stone", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.GUITAR).requiresCorrectToolForDrops().strength(0.5F))); - public static final DeferredBlock PUMICE_STONE_STAIRS = REGISTER.register("pumice_stone_stairs", () -> new StairBlock(() -> MSBlocks.PUMICE_STONE.get().defaultBlockState(), copy(PUMICE_STONE.get()))); - public static final DeferredBlock PUMICE_STONE_SLAB = REGISTER.register("pumice_stone_slab", () -> new SlabBlock(copy(PUMICE_STONE.get()))); - public static final DeferredBlock PUMICE_STONE_WALL = REGISTER.register("pumice_stone_wall", () -> new WallBlock(copy(PUMICE_STONE.get()))); - public static final DeferredBlock PUMICE_STONE_BUTTON = REGISTER.register("pumice_stone_button", () -> new ButtonBlock(copy(PUMICE_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock PUMICE_STONE_PRESSURE_PLATE = REGISTER.register("pumice_stone_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(PUMICE_STONE.get()), BlockSetType.STONE)); - - public static final DeferredBlock PUMICE_BRICKS = REGISTER.register("pumice_bricks", () -> new Block(copy(PUMICE_STONE.get()))); - public static final DeferredBlock PUMICE_BRICK_STAIRS = REGISTER.register("pumice_brick_stairs", () -> new StairBlock(() -> MSBlocks.PUMICE_BRICKS.get().defaultBlockState(), copy(PUMICE_BRICKS.get()))); - public static final DeferredBlock PUMICE_BRICK_SLAB = REGISTER.register("pumice_brick_slab", () -> new SlabBlock(copy(PUMICE_BRICKS.get()))); - public static final DeferredBlock PUMICE_BRICK_WALL = REGISTER.register("pumice_brick_wall", () -> new WallBlock(copy(PUMICE_BRICKS.get()))); - - public static final DeferredBlock PUMICE_TILES = REGISTER.register("pumice_tiles", () -> new Block(copy(PUMICE_STONE.get()))); - public static final DeferredBlock PUMICE_TILE_STAIRS = REGISTER.register("pumice_tile_stairs", () -> new StairBlock(() -> MSBlocks.PUMICE_TILES.get().defaultBlockState(), copy(PUMICE_TILES.get()))); - public static final DeferredBlock PUMICE_TILE_SLAB = REGISTER.register("pumice_tile_slab", () -> new SlabBlock(copy(PUMICE_TILES.get()))); - public static final DeferredBlock PUMICE_TILE_WALL = REGISTER.register("pumice_tile_wall", () -> new WallBlock(copy(PUMICE_TILES.get()))); + public static final DeferredBlock PUMICE_STONE_STAIRS = REGISTER.register("pumice_stone_stairs", () -> new StairBlock(() -> MSBlocks.PUMICE_STONE.get().defaultBlockState(), ofFullCopy(PUMICE_STONE.get()))); + public static final DeferredBlock PUMICE_STONE_SLAB = REGISTER.register("pumice_stone_slab", () -> new SlabBlock(ofFullCopy(PUMICE_STONE.get()))); + public static final DeferredBlock PUMICE_STONE_WALL = REGISTER.register("pumice_stone_wall", () -> new WallBlock(ofFullCopy(PUMICE_STONE.get()))); + public static final DeferredBlock PUMICE_STONE_BUTTON = REGISTER.register("pumice_stone_button", () -> new ButtonBlock(MSBlockSetType.PUMICE_STONE, 10, ofFullCopy(PUMICE_STONE.get()))); + public static final DeferredBlock PUMICE_STONE_PRESSURE_PLATE = REGISTER.register("pumice_stone_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.PUMICE_STONE, ofFullCopy(PUMICE_STONE.get()))); + + public static final DeferredBlock PUMICE_BRICKS = REGISTER.register("pumice_bricks", () -> new Block(ofFullCopy(PUMICE_STONE.get()))); + public static final DeferredBlock PUMICE_BRICK_STAIRS = REGISTER.register("pumice_brick_stairs", () -> new StairBlock(() -> MSBlocks.PUMICE_BRICKS.get().defaultBlockState(), ofFullCopy(PUMICE_BRICKS.get()))); + public static final DeferredBlock PUMICE_BRICK_SLAB = REGISTER.register("pumice_brick_slab", () -> new SlabBlock(ofFullCopy(PUMICE_BRICKS.get()))); + public static final DeferredBlock PUMICE_BRICK_WALL = REGISTER.register("pumice_brick_wall", () -> new WallBlock(ofFullCopy(PUMICE_BRICKS.get()))); + + public static final DeferredBlock PUMICE_TILES = REGISTER.register("pumice_tiles", () -> new Block(ofFullCopy(PUMICE_STONE.get()))); + public static final DeferredBlock PUMICE_TILE_STAIRS = REGISTER.register("pumice_tile_stairs", () -> new StairBlock(() -> MSBlocks.PUMICE_TILES.get().defaultBlockState(), ofFullCopy(PUMICE_TILES.get()))); + public static final DeferredBlock PUMICE_TILE_SLAB = REGISTER.register("pumice_tile_slab", () -> new SlabBlock(ofFullCopy(PUMICE_TILES.get()))); + public static final DeferredBlock PUMICE_TILE_WALL = REGISTER.register("pumice_tile_wall", () -> new WallBlock(ofFullCopy(PUMICE_TILES.get()))); public static final DeferredBlock HEAT_LAMP = REGISTER.register("heat_lamp", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_YELLOW).instrument(NoteBlockInstrument.GUITAR).strength(1.5F).lightLevel(state -> 15).sound(SoundType.SHROOMLIGHT))); //Flowery public static final DeferredBlock FLOWERY_MOSSY_COBBLESTONE = REGISTER.register("flowery_mossy_cobblestone", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock FLOWERY_MOSSY_COBBLESTONE_STAIRS = REGISTER.register("flowery_mossy_cobblestone_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_MOSSY_COBBLESTONE.get().defaultBlockState(), copy(FLOWERY_MOSSY_COBBLESTONE.get()))); - public static final DeferredBlock FLOWERY_MOSSY_COBBLESTONE_SLAB = REGISTER.register("flowery_mossy_cobblestone_slab", () -> new SlabBlock(copy(FLOWERY_MOSSY_COBBLESTONE.get()))); - public static final DeferredBlock FLOWERY_MOSSY_COBBLESTONE_WALL = REGISTER.register("flowery_mossy_cobblestone_wall", () -> new WallBlock(copy(FLOWERY_MOSSY_COBBLESTONE.get()))); + public static final DeferredBlock FLOWERY_MOSSY_COBBLESTONE_STAIRS = REGISTER.register("flowery_mossy_cobblestone_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_MOSSY_COBBLESTONE.get().defaultBlockState(), ofFullCopy(FLOWERY_MOSSY_COBBLESTONE.get()))); + public static final DeferredBlock FLOWERY_MOSSY_COBBLESTONE_SLAB = REGISTER.register("flowery_mossy_cobblestone_slab", () -> new SlabBlock(ofFullCopy(FLOWERY_MOSSY_COBBLESTONE.get()))); + public static final DeferredBlock FLOWERY_MOSSY_COBBLESTONE_WALL = REGISTER.register("flowery_mossy_cobblestone_wall", () -> new WallBlock(ofFullCopy(FLOWERY_MOSSY_COBBLESTONE.get()))); public static final DeferredBlock FLOWERY_MOSSY_STONE_BRICKS = REGISTER.register("flowery_mossy_stone_bricks", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock FLOWERY_MOSSY_STONE_BRICK_STAIRS = REGISTER.register("flowery_mossy_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_MOSSY_STONE_BRICKS.get().defaultBlockState(), copy(FLOWERY_MOSSY_STONE_BRICKS.get()))); - public static final DeferredBlock FLOWERY_MOSSY_STONE_BRICK_SLAB = REGISTER.register("flowery_mossy_stone_brick_slab", () -> new SlabBlock(copy(FLOWERY_MOSSY_STONE_BRICKS.get()))); - public static final DeferredBlock FLOWERY_MOSSY_STONE_BRICK_WALL = REGISTER.register("flowery_mossy_stone_brick_wall", () -> new WallBlock(copy(FLOWERY_MOSSY_STONE_BRICKS.get()))); + public static final DeferredBlock FLOWERY_MOSSY_STONE_BRICK_STAIRS = REGISTER.register("flowery_mossy_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_MOSSY_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(FLOWERY_MOSSY_STONE_BRICKS.get()))); + public static final DeferredBlock FLOWERY_MOSSY_STONE_BRICK_SLAB = REGISTER.register("flowery_mossy_stone_brick_slab", () -> new SlabBlock(ofFullCopy(FLOWERY_MOSSY_STONE_BRICKS.get()))); + public static final DeferredBlock FLOWERY_MOSSY_STONE_BRICK_WALL = REGISTER.register("flowery_mossy_stone_brick_wall", () -> new WallBlock(ofFullCopy(FLOWERY_MOSSY_STONE_BRICKS.get()))); //Decrepit public static final DeferredBlock DECREPIT_STONE_BRICKS = REGISTER.register("decrepit_stone_bricks", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock DECREPIT_STONE_BRICK_STAIRS = REGISTER.register("decrepit_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.DECREPIT_STONE_BRICKS.get().defaultBlockState(), copy(DECREPIT_STONE_BRICKS.get()))); - public static final DeferredBlock DECREPIT_STONE_BRICK_SLAB = REGISTER.register("decrepit_stone_brick_slab", () -> new SlabBlock(copy(DECREPIT_STONE_BRICKS.get()))); - public static final DeferredBlock DECREPIT_STONE_BRICK_WALL = REGISTER.register("decrepit_stone_brick_wall", () -> new WallBlock(copy(DECREPIT_STONE_BRICKS.get()))); + public static final DeferredBlock DECREPIT_STONE_BRICK_STAIRS = REGISTER.register("decrepit_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.DECREPIT_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(DECREPIT_STONE_BRICKS.get()))); + public static final DeferredBlock DECREPIT_STONE_BRICK_SLAB = REGISTER.register("decrepit_stone_brick_slab", () -> new SlabBlock(ofFullCopy(DECREPIT_STONE_BRICKS.get()))); + public static final DeferredBlock DECREPIT_STONE_BRICK_WALL = REGISTER.register("decrepit_stone_brick_wall", () -> new WallBlock(ofFullCopy(DECREPIT_STONE_BRICKS.get()))); - public static final DeferredBlock MOSSY_DECREPIT_STONE_BRICKS = REGISTER.register("mossy_decrepit_stone_bricks", () -> new Block(copy(DECREPIT_STONE_BRICKS.get()))); - public static final DeferredBlock MOSSY_DECREPIT_STONE_BRICK_STAIRS = REGISTER.register("mossy_decrepit_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_DECREPIT_STONE_BRICKS.get().defaultBlockState(), copy(MOSSY_DECREPIT_STONE_BRICKS.get()))); - public static final DeferredBlock MOSSY_DECREPIT_STONE_BRICK_SLAB = REGISTER.register("mossy_decrepit_stone_brick_slab", () -> new SlabBlock(copy(MOSSY_DECREPIT_STONE_BRICKS.get()))); - public static final DeferredBlock MOSSY_DECREPIT_STONE_BRICK_WALL = REGISTER.register("mossy_decrepit_stone_brick_wall", () -> new WallBlock(copy(MOSSY_DECREPIT_STONE_BRICKS.get()))); + public static final DeferredBlock MOSSY_DECREPIT_STONE_BRICKS = REGISTER.register("mossy_decrepit_stone_bricks", () -> new Block(ofFullCopy(DECREPIT_STONE_BRICKS.get()))); + public static final DeferredBlock MOSSY_DECREPIT_STONE_BRICK_STAIRS = REGISTER.register("mossy_decrepit_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_DECREPIT_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(MOSSY_DECREPIT_STONE_BRICKS.get()))); + public static final DeferredBlock MOSSY_DECREPIT_STONE_BRICK_SLAB = REGISTER.register("mossy_decrepit_stone_brick_slab", () -> new SlabBlock(ofFullCopy(MOSSY_DECREPIT_STONE_BRICKS.get()))); + public static final DeferredBlock MOSSY_DECREPIT_STONE_BRICK_WALL = REGISTER.register("mossy_decrepit_stone_brick_wall", () -> new WallBlock(ofFullCopy(MOSSY_DECREPIT_STONE_BRICKS.get()))); //End public static final DeferredBlock COARSE_END_STONE = REGISTER.register("coarse_end_stone", () -> new TillableBlock(Block.Properties.of().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(3.0F, 9.0F), Blocks.END_STONE::defaultBlockState)); //Chalk public static final DeferredBlock CHALK = REGISTER.register("chalk", () -> new Block(Block.Properties.of().mapColor(MapColor.SNOW).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock CHALK_STAIRS = REGISTER.register("chalk_stairs", () -> new StairBlock(() -> MSBlocks.CHALK.get().defaultBlockState(), copy(CHALK.get()))); - public static final DeferredBlock CHALK_SLAB = REGISTER.register("chalk_slab", () -> new SlabBlock(copy(CHALK.get()))); - public static final DeferredBlock CHALK_WALL = REGISTER.register("chalk_wall", () -> new WallBlock(copy(CHALK.get()))); - public static final DeferredBlock CHALK_BUTTON = REGISTER.register("chalk_button", () -> new ButtonBlock(copy(CHALK.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock CHALK_PRESSURE_PLATE = REGISTER.register("chalk_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(CHALK.get()), BlockSetType.STONE)); - - public static final DeferredBlock POLISHED_CHALK = REGISTER.register("polished_chalk", () -> new Block(copy(CHALK.get()))); - public static final DeferredBlock POLISHED_CHALK_STAIRS = REGISTER.register("polished_chalk_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_CHALK.get().defaultBlockState(), copy(POLISHED_CHALK.get()))); - public static final DeferredBlock POLISHED_CHALK_SLAB = REGISTER.register("polished_chalk_slab", () -> new SlabBlock(copy(POLISHED_CHALK.get()))); - public static final DeferredBlock POLISHED_CHALK_WALL = REGISTER.register("polished_chalk_wall", () -> new WallBlock(copy(POLISHED_CHALK.get()))); - - public static final DeferredBlock CHALK_BRICKS = REGISTER.register("chalk_bricks", () -> new Block(copy(CHALK.get()))); - public static final DeferredBlock CHALK_BRICK_STAIRS = REGISTER.register("chalk_brick_stairs", () -> new StairBlock(() -> MSBlocks.CHALK_BRICKS.get().defaultBlockState(), copy(CHALK_BRICKS.get()))); - public static final DeferredBlock CHALK_BRICK_SLAB = REGISTER.register("chalk_brick_slab", () -> new SlabBlock(copy(CHALK_BRICKS.get()))); - public static final DeferredBlock CHALK_BRICK_WALL = REGISTER.register("chalk_brick_wall", () -> new WallBlock(copy(CHALK_BRICKS.get()))); - - public static final DeferredBlock CHALK_COLUMN = REGISTER.register("chalk_column", () -> new MSDirectionalBlock(copy(CHALK.get()))); - public static final DeferredBlock CHISELED_CHALK_BRICKS = REGISTER.register("chiseled_chalk_bricks", () -> new Block(copy(CHALK_BRICKS.get()))); - - public static final DeferredBlock MOSSY_CHALK_BRICKS = REGISTER.register("mossy_chalk_bricks", () -> new Block(copy(CHALK_BRICKS.get()))); - public static final DeferredBlock MOSSY_CHALK_BRICK_STAIRS = REGISTER.register("mossy_chalk_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_CHALK_BRICKS.get().defaultBlockState(), copy(MOSSY_CHALK_BRICKS.get()))); - public static final DeferredBlock MOSSY_CHALK_BRICK_SLAB = REGISTER.register("mossy_chalk_brick_slab", () -> new SlabBlock(copy(MOSSY_CHALK_BRICKS.get()))); - public static final DeferredBlock MOSSY_CHALK_BRICK_WALL = REGISTER.register("mossy_chalk_brick_wall", () -> new WallBlock(copy(MOSSY_CHALK_BRICKS.get()))); - - public static final DeferredBlock FLOWERY_CHALK_BRICKS = REGISTER.register("flowery_chalk_bricks", () -> new Block(copy(CHALK_BRICKS.get()))); - public static final DeferredBlock FLOWERY_CHALK_BRICK_STAIRS = REGISTER.register("flowery_chalk_brick_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_CHALK_BRICKS.get().defaultBlockState(), copy(FLOWERY_CHALK_BRICKS.get()))); - public static final DeferredBlock FLOWERY_CHALK_BRICK_SLAB = REGISTER.register("flowery_chalk_brick_slab", () -> new SlabBlock(copy(FLOWERY_CHALK_BRICKS.get()))); - public static final DeferredBlock FLOWERY_CHALK_BRICK_WALL = REGISTER.register("flowery_chalk_brick_wall", () -> new WallBlock(copy(FLOWERY_CHALK_BRICKS.get()))); + public static final DeferredBlock CHALK_STAIRS = REGISTER.register("chalk_stairs", () -> new StairBlock(() -> MSBlocks.CHALK.get().defaultBlockState(), ofFullCopy(CHALK.get()))); + public static final DeferredBlock CHALK_SLAB = REGISTER.register("chalk_slab", () -> new SlabBlock(ofFullCopy(CHALK.get()))); + public static final DeferredBlock CHALK_WALL = REGISTER.register("chalk_wall", () -> new WallBlock(ofFullCopy(CHALK.get()))); + public static final DeferredBlock CHALK_BUTTON = REGISTER.register("chalk_button", () -> new ButtonBlock(MSBlockSetType.CHALK, 10, ofFullCopy(CHALK.get()))); + public static final DeferredBlock CHALK_PRESSURE_PLATE = REGISTER.register("chalk_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.CHALK, ofFullCopy(CHALK.get()))); + + public static final DeferredBlock POLISHED_CHALK = REGISTER.register("polished_chalk", () -> new Block(ofFullCopy(CHALK.get()))); + public static final DeferredBlock POLISHED_CHALK_STAIRS = REGISTER.register("polished_chalk_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_CHALK.get().defaultBlockState(), ofFullCopy(POLISHED_CHALK.get()))); + public static final DeferredBlock POLISHED_CHALK_SLAB = REGISTER.register("polished_chalk_slab", () -> new SlabBlock(ofFullCopy(POLISHED_CHALK.get()))); + public static final DeferredBlock POLISHED_CHALK_WALL = REGISTER.register("polished_chalk_wall", () -> new WallBlock(ofFullCopy(POLISHED_CHALK.get()))); + + public static final DeferredBlock CHALK_BRICKS = REGISTER.register("chalk_bricks", () -> new Block(ofFullCopy(CHALK.get()))); + public static final DeferredBlock CHALK_BRICK_STAIRS = REGISTER.register("chalk_brick_stairs", () -> new StairBlock(() -> MSBlocks.CHALK_BRICKS.get().defaultBlockState(), ofFullCopy(CHALK_BRICKS.get()))); + public static final DeferredBlock CHALK_BRICK_SLAB = REGISTER.register("chalk_brick_slab", () -> new SlabBlock(ofFullCopy(CHALK_BRICKS.get()))); + public static final DeferredBlock CHALK_BRICK_WALL = REGISTER.register("chalk_brick_wall", () -> new WallBlock(ofFullCopy(CHALK_BRICKS.get()))); + + public static final DeferredBlock CHALK_COLUMN = REGISTER.register("chalk_column", () -> new MSDirectionalBlock(ofFullCopy(CHALK.get()))); + public static final DeferredBlock CHISELED_CHALK_BRICKS = REGISTER.register("chiseled_chalk_bricks", () -> new Block(ofFullCopy(CHALK_BRICKS.get()))); + + public static final DeferredBlock MOSSY_CHALK_BRICKS = REGISTER.register("mossy_chalk_bricks", () -> new Block(ofFullCopy(CHALK_BRICKS.get()))); + public static final DeferredBlock MOSSY_CHALK_BRICK_STAIRS = REGISTER.register("mossy_chalk_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_CHALK_BRICKS.get().defaultBlockState(), ofFullCopy(MOSSY_CHALK_BRICKS.get()))); + public static final DeferredBlock MOSSY_CHALK_BRICK_SLAB = REGISTER.register("mossy_chalk_brick_slab", () -> new SlabBlock(ofFullCopy(MOSSY_CHALK_BRICKS.get()))); + public static final DeferredBlock MOSSY_CHALK_BRICK_WALL = REGISTER.register("mossy_chalk_brick_wall", () -> new WallBlock(ofFullCopy(MOSSY_CHALK_BRICKS.get()))); + + public static final DeferredBlock FLOWERY_CHALK_BRICKS = REGISTER.register("flowery_chalk_bricks", () -> new Block(ofFullCopy(CHALK_BRICKS.get()))); + public static final DeferredBlock FLOWERY_CHALK_BRICK_STAIRS = REGISTER.register("flowery_chalk_brick_stairs", () -> new StairBlock(() -> MSBlocks.FLOWERY_CHALK_BRICKS.get().defaultBlockState(), ofFullCopy(FLOWERY_CHALK_BRICKS.get()))); + public static final DeferredBlock FLOWERY_CHALK_BRICK_SLAB = REGISTER.register("flowery_chalk_brick_slab", () -> new SlabBlock(ofFullCopy(FLOWERY_CHALK_BRICKS.get()))); + public static final DeferredBlock FLOWERY_CHALK_BRICK_WALL = REGISTER.register("flowery_chalk_brick_wall", () -> new WallBlock(ofFullCopy(FLOWERY_CHALK_BRICKS.get()))); //Pink public static final DeferredBlock PINK_STONE = REGISTER.register("pink_stone", () -> new Block(Block.Properties.of().mapColor(MapColor.SNOW).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final DeferredBlock PINK_STONE_STAIRS = REGISTER.register("pink_stone_stairs", () -> new StairBlock(() -> MSBlocks.PINK_STONE.get().defaultBlockState(), copy(PINK_STONE.get()))); - public static final DeferredBlock PINK_STONE_SLAB = REGISTER.register("pink_stone_slab", () -> new SlabBlock(copy(PINK_STONE.get()))); - public static final DeferredBlock PINK_STONE_WALL = REGISTER.register("pink_stone_wall", () -> new WallBlock(copy(PINK_STONE.get()))); - public static final DeferredBlock PINK_STONE_BUTTON = REGISTER.register("pink_stone_button", () -> new ButtonBlock(copy(PINK_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock PINK_STONE_PRESSURE_PLATE = REGISTER.register("pink_stone_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(PINK_STONE.get()), BlockSetType.STONE)); - - public static final DeferredBlock POLISHED_PINK_STONE = REGISTER.register("polished_pink_stone", () -> new Block(copy(PINK_STONE.get()))); - public static final DeferredBlock POLISHED_PINK_STONE_STAIRS = REGISTER.register("polished_pink_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_PINK_STONE.get().defaultBlockState(), copy(POLISHED_PINK_STONE.get()))); - public static final DeferredBlock POLISHED_PINK_STONE_SLAB = REGISTER.register("polished_pink_stone_slab", () -> new SlabBlock(copy(POLISHED_PINK_STONE.get()))); - public static final DeferredBlock POLISHED_PINK_STONE_WALL = REGISTER.register("polished_pink_stone_wall", () -> new WallBlock(copy(POLISHED_PINK_STONE.get()))); - - public static final DeferredBlock PINK_STONE_BRICKS = REGISTER.register("pink_stone_bricks", () -> new Block(copy(PINK_STONE.get()))); - public static final DeferredBlock PINK_STONE_BRICK_STAIRS = REGISTER.register("pink_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.PINK_STONE_BRICKS.get().defaultBlockState(), copy(PINK_STONE_BRICKS.get()))); - public static final DeferredBlock PINK_STONE_BRICK_SLAB = REGISTER.register("pink_stone_brick_slab", () -> new SlabBlock(copy(PINK_STONE_BRICKS.get()))); - public static final DeferredBlock PINK_STONE_BRICK_WALL = REGISTER.register("pink_stone_brick_wall", () -> new WallBlock(copy(PINK_STONE_BRICKS.get()))); - - public static final DeferredBlock PINK_STONE_COLUMN = REGISTER.register("pink_stone_column", () -> new MSDirectionalBlock(copy(PINK_STONE.get()))); - public static final DeferredBlock CHISELED_PINK_STONE_BRICKS = REGISTER.register("chiseled_pink_stone_bricks", () -> new Block(copy(PINK_STONE_BRICKS.get()))); - public static final DeferredBlock CRACKED_PINK_STONE_BRICKS = REGISTER.register("cracked_pink_stone_bricks", () -> new Block(copy(PINK_STONE_BRICKS.get()))); - - public static final DeferredBlock MOSSY_PINK_STONE_BRICKS = REGISTER.register("mossy_pink_stone_bricks", () -> new Block(copy(PINK_STONE_BRICKS.get()))); - public static final DeferredBlock MOSSY_PINK_STONE_BRICK_STAIRS = REGISTER.register("mossy_pink_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_PINK_STONE_BRICKS.get().defaultBlockState(), copy(MOSSY_PINK_STONE_BRICKS.get()))); - public static final DeferredBlock MOSSY_PINK_STONE_BRICK_SLAB = REGISTER.register("mossy_pink_stone_brick_slab", () -> new SlabBlock(copy(MOSSY_PINK_STONE_BRICKS.get()))); - public static final DeferredBlock MOSSY_PINK_STONE_BRICK_WALL = REGISTER.register("mossy_pink_stone_brick_wall", () -> new WallBlock(copy(MOSSY_PINK_STONE_BRICKS.get()))); + public static final DeferredBlock PINK_STONE_STAIRS = REGISTER.register("pink_stone_stairs", () -> new StairBlock(() -> MSBlocks.PINK_STONE.get().defaultBlockState(), ofFullCopy(PINK_STONE.get()))); + public static final DeferredBlock PINK_STONE_SLAB = REGISTER.register("pink_stone_slab", () -> new SlabBlock(ofFullCopy(PINK_STONE.get()))); + public static final DeferredBlock PINK_STONE_WALL = REGISTER.register("pink_stone_wall", () -> new WallBlock(ofFullCopy(PINK_STONE.get()))); + public static final DeferredBlock PINK_STONE_BUTTON = REGISTER.register("pink_stone_button", () -> new ButtonBlock(MSBlockSetType.PINK_STONE, 10, ofFullCopy(PINK_STONE.get()))); + public static final DeferredBlock PINK_STONE_PRESSURE_PLATE = REGISTER.register("pink_stone_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.PINK_STONE, ofFullCopy(PINK_STONE.get()))); + + public static final DeferredBlock POLISHED_PINK_STONE = REGISTER.register("polished_pink_stone", () -> new Block(ofFullCopy(PINK_STONE.get()))); + public static final DeferredBlock POLISHED_PINK_STONE_STAIRS = REGISTER.register("polished_pink_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_PINK_STONE.get().defaultBlockState(), ofFullCopy(POLISHED_PINK_STONE.get()))); + public static final DeferredBlock POLISHED_PINK_STONE_SLAB = REGISTER.register("polished_pink_stone_slab", () -> new SlabBlock(ofFullCopy(POLISHED_PINK_STONE.get()))); + public static final DeferredBlock POLISHED_PINK_STONE_WALL = REGISTER.register("polished_pink_stone_wall", () -> new WallBlock(ofFullCopy(POLISHED_PINK_STONE.get()))); + + public static final DeferredBlock PINK_STONE_BRICKS = REGISTER.register("pink_stone_bricks", () -> new Block(ofFullCopy(PINK_STONE.get()))); + public static final DeferredBlock PINK_STONE_BRICK_STAIRS = REGISTER.register("pink_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.PINK_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(PINK_STONE_BRICKS.get()))); + public static final DeferredBlock PINK_STONE_BRICK_SLAB = REGISTER.register("pink_stone_brick_slab", () -> new SlabBlock(ofFullCopy(PINK_STONE_BRICKS.get()))); + public static final DeferredBlock PINK_STONE_BRICK_WALL = REGISTER.register("pink_stone_brick_wall", () -> new WallBlock(ofFullCopy(PINK_STONE_BRICKS.get()))); + + public static final DeferredBlock PINK_STONE_COLUMN = REGISTER.register("pink_stone_column", () -> new MSDirectionalBlock(ofFullCopy(PINK_STONE.get()))); + public static final DeferredBlock CHISELED_PINK_STONE_BRICKS = REGISTER.register("chiseled_pink_stone_bricks", () -> new Block(ofFullCopy(PINK_STONE_BRICKS.get()))); + public static final DeferredBlock CRACKED_PINK_STONE_BRICKS = REGISTER.register("cracked_pink_stone_bricks", () -> new Block(ofFullCopy(PINK_STONE_BRICKS.get()))); + + public static final DeferredBlock MOSSY_PINK_STONE_BRICKS = REGISTER.register("mossy_pink_stone_bricks", () -> new Block(ofFullCopy(PINK_STONE_BRICKS.get()))); + public static final DeferredBlock MOSSY_PINK_STONE_BRICK_STAIRS = REGISTER.register("mossy_pink_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.MOSSY_PINK_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(MOSSY_PINK_STONE_BRICKS.get()))); + public static final DeferredBlock MOSSY_PINK_STONE_BRICK_SLAB = REGISTER.register("mossy_pink_stone_brick_slab", () -> new SlabBlock(ofFullCopy(MOSSY_PINK_STONE_BRICKS.get()))); + public static final DeferredBlock MOSSY_PINK_STONE_BRICK_WALL = REGISTER.register("mossy_pink_stone_brick_wall", () -> new WallBlock(ofFullCopy(MOSSY_PINK_STONE_BRICKS.get()))); //Brown public static final DeferredBlock BROWN_STONE = REGISTER.register("brown_stone", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(2.5F, 7.0F))); - public static final DeferredBlock BROWN_STONE_STAIRS = REGISTER.register("brown_stone_stairs", () -> new StairBlock(() -> MSBlocks.BROWN_STONE.get().defaultBlockState(), copy(BROWN_STONE.get()))); - public static final DeferredBlock BROWN_STONE_SLAB = REGISTER.register("brown_stone_slab", () -> new SlabBlock(copy(BROWN_STONE.get()))); - public static final DeferredBlock BROWN_STONE_WALL = REGISTER.register("brown_stone_wall", () -> new WallBlock(copy(BROWN_STONE.get()))); - public static final DeferredBlock BROWN_STONE_BUTTON = REGISTER.register("brown_stone_button", () -> new ButtonBlock(copy(BROWN_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock BROWN_STONE_PRESSURE_PLATE = REGISTER.register("brown_stone_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(BROWN_STONE.get()), BlockSetType.STONE)); + public static final DeferredBlock BROWN_STONE_STAIRS = REGISTER.register("brown_stone_stairs", () -> new StairBlock(() -> MSBlocks.BROWN_STONE.get().defaultBlockState(), ofFullCopy(BROWN_STONE.get()))); + public static final DeferredBlock BROWN_STONE_SLAB = REGISTER.register("brown_stone_slab", () -> new SlabBlock(ofFullCopy(BROWN_STONE.get()))); + public static final DeferredBlock BROWN_STONE_WALL = REGISTER.register("brown_stone_wall", () -> new WallBlock(ofFullCopy(BROWN_STONE.get()))); + public static final DeferredBlock BROWN_STONE_BUTTON = REGISTER.register("brown_stone_button", () -> new ButtonBlock(MSBlockSetType.BROWN_STONE, 10, ofFullCopy(BROWN_STONE.get()))); + public static final DeferredBlock BROWN_STONE_PRESSURE_PLATE = REGISTER.register("brown_stone_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.BROWN_STONE, ofFullCopy(BROWN_STONE.get()))); - public static final DeferredBlock POLISHED_BROWN_STONE = REGISTER.register("polished_brown_stone", () -> new Block(copy(BROWN_STONE.get()))); - public static final DeferredBlock POLISHED_BROWN_STONE_STAIRS = REGISTER.register("polished_brown_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_BROWN_STONE.get().defaultBlockState(), copy(POLISHED_BROWN_STONE.get()))); - public static final DeferredBlock POLISHED_BROWN_STONE_SLAB = REGISTER.register("polished_brown_stone_slab", () -> new SlabBlock(copy(POLISHED_BROWN_STONE.get()))); - public static final DeferredBlock POLISHED_BROWN_STONE_WALL = REGISTER.register("polished_brown_stone_wall", () -> new WallBlock(copy(POLISHED_BROWN_STONE.get()))); + public static final DeferredBlock POLISHED_BROWN_STONE = REGISTER.register("polished_brown_stone", () -> new Block(ofFullCopy(BROWN_STONE.get()))); + public static final DeferredBlock POLISHED_BROWN_STONE_STAIRS = REGISTER.register("polished_brown_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_BROWN_STONE.get().defaultBlockState(), ofFullCopy(POLISHED_BROWN_STONE.get()))); + public static final DeferredBlock POLISHED_BROWN_STONE_SLAB = REGISTER.register("polished_brown_stone_slab", () -> new SlabBlock(ofFullCopy(POLISHED_BROWN_STONE.get()))); + public static final DeferredBlock POLISHED_BROWN_STONE_WALL = REGISTER.register("polished_brown_stone_wall", () -> new WallBlock(ofFullCopy(POLISHED_BROWN_STONE.get()))); - public static final DeferredBlock BROWN_STONE_BRICKS = REGISTER.register("brown_stone_bricks", () -> new Block(copy(BROWN_STONE.get()))); - public static final DeferredBlock BROWN_STONE_BRICK_STAIRS = REGISTER.register("brown_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.BROWN_STONE_BRICKS.get().defaultBlockState(), copy(BROWN_STONE_BRICKS.get()))); - public static final DeferredBlock BROWN_STONE_BRICK_SLAB = REGISTER.register("brown_stone_brick_slab", () -> new SlabBlock(copy(BROWN_STONE_BRICKS.get()))); - public static final DeferredBlock BROWN_STONE_BRICK_WALL = REGISTER.register("brown_stone_brick_wall", () -> new WallBlock(copy(BROWN_STONE_BRICKS.get()))); + public static final DeferredBlock BROWN_STONE_BRICKS = REGISTER.register("brown_stone_bricks", () -> new Block(ofFullCopy(BROWN_STONE.get()))); + public static final DeferredBlock BROWN_STONE_BRICK_STAIRS = REGISTER.register("brown_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.BROWN_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(BROWN_STONE_BRICKS.get()))); + public static final DeferredBlock BROWN_STONE_BRICK_SLAB = REGISTER.register("brown_stone_brick_slab", () -> new SlabBlock(ofFullCopy(BROWN_STONE_BRICKS.get()))); + public static final DeferredBlock BROWN_STONE_BRICK_WALL = REGISTER.register("brown_stone_brick_wall", () -> new WallBlock(ofFullCopy(BROWN_STONE_BRICKS.get()))); - public static final DeferredBlock CRACKED_BROWN_STONE_BRICKS = REGISTER.register("cracked_brown_stone_bricks", () -> new Block(copy(BROWN_STONE.get()))); - public static final DeferredBlock BROWN_STONE_COLUMN = REGISTER.register("brown_stone_column", () -> new MSDirectionalBlock(copy(BROWN_STONE.get()))); + public static final DeferredBlock CRACKED_BROWN_STONE_BRICKS = REGISTER.register("cracked_brown_stone_bricks", () -> new Block(ofFullCopy(BROWN_STONE.get()))); + public static final DeferredBlock BROWN_STONE_COLUMN = REGISTER.register("brown_stone_column", () -> new MSDirectionalBlock(ofFullCopy(BROWN_STONE.get()))); //Green public static final DeferredBlock GREEN_STONE = REGISTER.register("green_stone", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_GREEN).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(2.5F, 7.0F))); - public static final DeferredBlock GREEN_STONE_STAIRS = REGISTER.register("green_stone_stairs", () -> new StairBlock(() -> MSBlocks.GREEN_STONE.get().defaultBlockState(), copy(GREEN_STONE.get()))); - public static final DeferredBlock GREEN_STONE_SLAB = REGISTER.register("green_stone_slab", () -> new SlabBlock(copy(GREEN_STONE.get()))); - public static final DeferredBlock GREEN_STONE_WALL = REGISTER.register("green_stone_wall", () -> new WallBlock(copy(GREEN_STONE.get()))); - public static final DeferredBlock GREEN_STONE_BUTTON = REGISTER.register("green_stone_button", () -> new ButtonBlock(copy(GREEN_STONE.get()), BlockSetType.STONE, 10, true)); - public static final DeferredBlock GREEN_STONE_PRESSURE_PLATE = REGISTER.register("green_stone_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(GREEN_STONE.get()), BlockSetType.STONE)); - - public static final DeferredBlock POLISHED_GREEN_STONE = REGISTER.register("polished_green_stone", () -> new Block(copy(GREEN_STONE.get()))); - public static final DeferredBlock POLISHED_GREEN_STONE_STAIRS = REGISTER.register("polished_green_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_GREEN_STONE.get().defaultBlockState(), copy(POLISHED_GREEN_STONE.get()))); - public static final DeferredBlock POLISHED_GREEN_STONE_SLAB = REGISTER.register("polished_green_stone_slab", () -> new SlabBlock(copy(POLISHED_GREEN_STONE.get()))); - public static final DeferredBlock POLISHED_GREEN_STONE_WALL = REGISTER.register("polished_green_stone_wall", () -> new WallBlock(copy(POLISHED_GREEN_STONE.get()))); - - public static final DeferredBlock GREEN_STONE_BRICKS = REGISTER.register("green_stone_bricks", () -> new Block(copy(GREEN_STONE.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_STAIRS = REGISTER.register("green_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.GREEN_STONE_BRICKS.get().defaultBlockState(), copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_SLAB = REGISTER.register("green_stone_brick_slab", () -> new SlabBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_WALL = REGISTER.register("green_stone_brick_wall", () -> new WallBlock(copy(GREEN_STONE_BRICKS.get()))); - - public static final DeferredBlock GREEN_STONE_COLUMN = REGISTER.register("green_stone_column", () -> new MSDirectionalBlock(copy(GREEN_STONE.get()))); - public static final DeferredBlock CHISELED_GREEN_STONE_BRICKS = REGISTER.register("chiseled_green_stone_bricks", () -> new Block(copy(GREEN_STONE_BRICKS.get()))); - - public static final DeferredBlock HORIZONTAL_GREEN_STONE_BRICKS = REGISTER.register("horizontal_green_stone_bricks", () -> new Block(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock HORIZONTAL_GREEN_STONE_BRICK_STAIRS = REGISTER.register("horizontal_green_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.HORIZONTAL_GREEN_STONE_BRICKS.get().defaultBlockState(), copy(HORIZONTAL_GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock HORIZONTAL_GREEN_STONE_BRICK_SLAB = REGISTER.register("horizontal_green_stone_brick_slab", () -> new SlabBlock(copy(HORIZONTAL_GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock HORIZONTAL_GREEN_STONE_BRICK_WALL = REGISTER.register("horizontal_green_stone_brick_wall", () -> new WallBlock(copy(HORIZONTAL_GREEN_STONE_BRICKS.get()))); - - public static final DeferredBlock VERTICAL_GREEN_STONE_BRICKS = REGISTER.register("vertical_green_stone_bricks", () -> new Block(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock VERTICAL_GREEN_STONE_BRICK_STAIRS = REGISTER.register("vertical_green_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.VERTICAL_GREEN_STONE_BRICKS.get().defaultBlockState(), copy(VERTICAL_GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock VERTICAL_GREEN_STONE_BRICK_SLAB = REGISTER.register("vertical_green_stone_brick_slab", () -> new SlabBlock(copy(VERTICAL_GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock VERTICAL_GREEN_STONE_BRICK_WALL = REGISTER.register("vertical_green_stone_brick_wall", () -> new WallBlock(copy(VERTICAL_GREEN_STONE_BRICKS.get()))); - - public static final DeferredBlock GREEN_STONE_BRICK_EMBEDDED_LADDER = REGISTER.register("green_stone_brick_embedded_ladder", () -> new CustomShapeBlock(copy(GREEN_STONE_BRICKS.get()), MSBlockShapes.EMBEDDED_STAIRS)); //uses the tag CLIMBABLE - public static final DeferredBlock GREEN_STONE_BRICK_TRIM = REGISTER.register("green_stone_brick_trim", () -> new MSDirectionalBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_FROG = REGISTER.register("green_stone_brick_frog", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_IGUANA_LEFT = REGISTER.register("green_stone_brick_iguana_left", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_IGUANA_RIGHT = REGISTER.register("green_stone_brick_iguana_right", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_LOTUS = REGISTER.register("green_stone_brick_lotus", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_NAK_LEFT = REGISTER.register("green_stone_brick_nak_left", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_NAK_RIGHT = REGISTER.register("green_stone_brick_nak_right", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_SALAMANDER_LEFT = REGISTER.register("green_stone_brick_salamander_left", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_SALAMANDER_RIGHT = REGISTER.register("green_stone_brick_salamander_right", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_SKAIA = REGISTER.register("green_stone_brick_skaia", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); - public static final DeferredBlock GREEN_STONE_BRICK_TURTLE = REGISTER.register("green_stone_brick_turtle", () -> new HieroglyphBlock(copy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_STAIRS = REGISTER.register("green_stone_stairs", () -> new StairBlock(() -> MSBlocks.GREEN_STONE.get().defaultBlockState(), ofFullCopy(GREEN_STONE.get()))); + public static final DeferredBlock GREEN_STONE_SLAB = REGISTER.register("green_stone_slab", () -> new SlabBlock(ofFullCopy(GREEN_STONE.get()))); + public static final DeferredBlock GREEN_STONE_WALL = REGISTER.register("green_stone_wall", () -> new WallBlock(ofFullCopy(GREEN_STONE.get()))); + public static final DeferredBlock GREEN_STONE_BUTTON = REGISTER.register("green_stone_button", () -> new ButtonBlock(MSBlockSetType.GREEN_STONE, 10, ofFullCopy(GREEN_STONE.get()))); + public static final DeferredBlock GREEN_STONE_PRESSURE_PLATE = REGISTER.register("green_stone_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.GREEN_STONE, ofFullCopy(GREEN_STONE.get()))); + + public static final DeferredBlock POLISHED_GREEN_STONE = REGISTER.register("polished_green_stone", () -> new Block(ofFullCopy(GREEN_STONE.get()))); + public static final DeferredBlock POLISHED_GREEN_STONE_STAIRS = REGISTER.register("polished_green_stone_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_GREEN_STONE.get().defaultBlockState(), ofFullCopy(POLISHED_GREEN_STONE.get()))); + public static final DeferredBlock POLISHED_GREEN_STONE_SLAB = REGISTER.register("polished_green_stone_slab", () -> new SlabBlock(ofFullCopy(POLISHED_GREEN_STONE.get()))); + public static final DeferredBlock POLISHED_GREEN_STONE_WALL = REGISTER.register("polished_green_stone_wall", () -> new WallBlock(ofFullCopy(POLISHED_GREEN_STONE.get()))); + + public static final DeferredBlock GREEN_STONE_BRICKS = REGISTER.register("green_stone_bricks", () -> new Block(ofFullCopy(GREEN_STONE.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_STAIRS = REGISTER.register("green_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.GREEN_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_SLAB = REGISTER.register("green_stone_brick_slab", () -> new SlabBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_WALL = REGISTER.register("green_stone_brick_wall", () -> new WallBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + + public static final DeferredBlock GREEN_STONE_COLUMN = REGISTER.register("green_stone_column", () -> new MSDirectionalBlock(ofFullCopy(GREEN_STONE.get()))); + public static final DeferredBlock CHISELED_GREEN_STONE_BRICKS = REGISTER.register("chiseled_green_stone_bricks", () -> new Block(ofFullCopy(GREEN_STONE_BRICKS.get()))); + + public static final DeferredBlock HORIZONTAL_GREEN_STONE_BRICKS = REGISTER.register("horizontal_green_stone_bricks", () -> new Block(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock HORIZONTAL_GREEN_STONE_BRICK_STAIRS = REGISTER.register("horizontal_green_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.HORIZONTAL_GREEN_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(HORIZONTAL_GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock HORIZONTAL_GREEN_STONE_BRICK_SLAB = REGISTER.register("horizontal_green_stone_brick_slab", () -> new SlabBlock(ofFullCopy(HORIZONTAL_GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock HORIZONTAL_GREEN_STONE_BRICK_WALL = REGISTER.register("horizontal_green_stone_brick_wall", () -> new WallBlock(ofFullCopy(HORIZONTAL_GREEN_STONE_BRICKS.get()))); + + public static final DeferredBlock VERTICAL_GREEN_STONE_BRICKS = REGISTER.register("vertical_green_stone_bricks", () -> new Block(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock VERTICAL_GREEN_STONE_BRICK_STAIRS = REGISTER.register("vertical_green_stone_brick_stairs", () -> new StairBlock(() -> MSBlocks.VERTICAL_GREEN_STONE_BRICKS.get().defaultBlockState(), ofFullCopy(VERTICAL_GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock VERTICAL_GREEN_STONE_BRICK_SLAB = REGISTER.register("vertical_green_stone_brick_slab", () -> new SlabBlock(ofFullCopy(VERTICAL_GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock VERTICAL_GREEN_STONE_BRICK_WALL = REGISTER.register("vertical_green_stone_brick_wall", () -> new WallBlock(ofFullCopy(VERTICAL_GREEN_STONE_BRICKS.get()))); + + public static final DeferredBlock GREEN_STONE_BRICK_EMBEDDED_LADDER = REGISTER.register("green_stone_brick_embedded_ladder", () -> new CustomShapeBlock(ofFullCopy(GREEN_STONE_BRICKS.get()), MSBlockShapes.EMBEDDED_STAIRS)); //uses the tag CLIMBABLE + public static final DeferredBlock GREEN_STONE_BRICK_TRIM = REGISTER.register("green_stone_brick_trim", () -> new MSDirectionalBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_FROG = REGISTER.register("green_stone_brick_frog", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_IGUANA_LEFT = REGISTER.register("green_stone_brick_iguana_left", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_IGUANA_RIGHT = REGISTER.register("green_stone_brick_iguana_right", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_LOTUS = REGISTER.register("green_stone_brick_lotus", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_NAK_LEFT = REGISTER.register("green_stone_brick_nak_left", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_NAK_RIGHT = REGISTER.register("green_stone_brick_nak_right", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_SALAMANDER_LEFT = REGISTER.register("green_stone_brick_salamander_left", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_SALAMANDER_RIGHT = REGISTER.register("green_stone_brick_salamander_right", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_SKAIA = REGISTER.register("green_stone_brick_skaia", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); + public static final DeferredBlock GREEN_STONE_BRICK_TURTLE = REGISTER.register("green_stone_brick_turtle", () -> new HieroglyphBlock(ofFullCopy(GREEN_STONE_BRICKS.get()))); //TODO when walking down steep stairs, players take fall damage that cannot be circumvented by the fallOn function. This includes when there is only an air block underneath them - public static final DeferredBlock STEEP_GREEN_STONE_BRICK_STAIRS_BASE = REGISTER.register("steep_green_stone_brick_stairs_base", () -> new CustomShapeBlock(copy(GREEN_STONE.get()), MSBlockShapes.STEEP_STAIRS_BASE)); - public static final DeferredBlock STEEP_GREEN_STONE_BRICK_STAIRS_TOP = REGISTER.register("steep_green_stone_brick_stairs_top", () -> new CustomShapeBlock(copy(GREEN_STONE.get()), MSBlockShapes.STEEP_STAIRS_TOP)); + public static final DeferredBlock STEEP_GREEN_STONE_BRICK_STAIRS_BASE = REGISTER.register("steep_green_stone_brick_stairs_base", () -> new CustomShapeBlock(ofFullCopy(GREEN_STONE.get()), MSBlockShapes.STEEP_STAIRS_BASE)); + public static final DeferredBlock STEEP_GREEN_STONE_BRICK_STAIRS_TOP = REGISTER.register("steep_green_stone_brick_stairs_top", () -> new CustomShapeBlock(ofFullCopy(GREEN_STONE.get()), MSBlockShapes.STEEP_STAIRS_TOP)); //Sandstone public static final DeferredBlock SANDSTONE_COLUMN = REGISTER.register("sandstone_column", () -> new MSDirectionalBlock(Block.Properties.of().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(0.8F))); @@ -551,134 +555,134 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock CARVED_WOODEN_LEAF = REGISTER.register("carved_wooden_leaf", () -> new CustomShapeBlock(Block.Properties.of().noOcclusion().mapColor(MapColor.WOOD).strength(0.4F).sound(SoundType.WOOD), MSBlockShapes.CARVED_WOODEN_LEAF)); public static final DeferredBlock UNCARVED_WOOD = REGISTER.register("uncarved_wood", () -> new Block(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock UNCARVED_WOOD_STAIRS = REGISTER.register("uncarved_wood_stairs", () -> new StairBlock(() -> MSBlocks.UNCARVED_WOOD.get().defaultBlockState(), copy(UNCARVED_WOOD.get()))); - public static final DeferredBlock UNCARVED_WOOD_SLAB = REGISTER.register("uncarved_wood_slab", () -> new SlabBlock(copy(UNCARVED_WOOD.get()))); - public static final DeferredBlock UNCARVED_WOOD_BUTTON = REGISTER.register("uncarved_wood_button", () -> new ButtonBlock(copy(UNCARVED_WOOD.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock UNCARVED_WOOD_PRESSURE_PLATE = REGISTER.register("uncarved_wood_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(UNCARVED_WOOD.get()), BlockSetType.OAK)); - public static final DeferredBlock UNCARVED_WOOD_FENCE = REGISTER.register("uncarved_wood_fence", () -> new FenceBlock(copy(UNCARVED_WOOD.get()))); - public static final DeferredBlock UNCARVED_WOOD_FENCE_GATE = REGISTER.register("uncarved_wood_fence_gate", () -> new FenceGateBlock(copy(UNCARVED_WOOD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock UNCARVED_WOOD_STAIRS = REGISTER.register("uncarved_wood_stairs", () -> new StairBlock(() -> MSBlocks.UNCARVED_WOOD.get().defaultBlockState(), ofFullCopy(UNCARVED_WOOD.get()))); + public static final DeferredBlock UNCARVED_WOOD_SLAB = REGISTER.register("uncarved_wood_slab", () -> new SlabBlock(ofFullCopy(UNCARVED_WOOD.get()))); + public static final DeferredBlock UNCARVED_WOOD_BUTTON = REGISTER.register("uncarved_wood_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(UNCARVED_WOOD.get()))); + public static final DeferredBlock UNCARVED_WOOD_PRESSURE_PLATE = REGISTER.register("uncarved_wood_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(UNCARVED_WOOD.get()))); + public static final DeferredBlock UNCARVED_WOOD_FENCE = REGISTER.register("uncarved_wood_fence", () -> new FenceBlock(ofFullCopy(UNCARVED_WOOD.get()))); + public static final DeferredBlock UNCARVED_WOOD_FENCE_GATE = REGISTER.register("uncarved_wood_fence_gate", () -> new FenceGateBlock(ofFullCopy(UNCARVED_WOOD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredBlock CHIPBOARD = REGISTER.register("chipboard", () -> new Block(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(1.0F).requiresCorrectToolForDrops().sound(SoundType.SCAFFOLDING))); - public static final DeferredBlock CHIPBOARD_STAIRS = REGISTER.register("chipboard_stairs", () -> new StairBlock(() -> MSBlocks.CHIPBOARD.get().defaultBlockState(), copy(CHIPBOARD.get()))); - public static final DeferredBlock CHIPBOARD_SLAB = REGISTER.register("chipboard_slab", () -> new SlabBlock(copy(CHIPBOARD.get()))); - public static final DeferredBlock CHIPBOARD_BUTTON = REGISTER.register("chipboard_button", () -> new ButtonBlock(copy(CHIPBOARD.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock CHIPBOARD_PRESSURE_PLATE = REGISTER.register("chipboard_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(CHIPBOARD.get()), BlockSetType.OAK)); - public static final DeferredBlock CHIPBOARD_FENCE = REGISTER.register("chipboard_fence", () -> new FenceBlock(copy(CHIPBOARD.get()))); - public static final DeferredBlock CHIPBOARD_FENCE_GATE = REGISTER.register("chipboard_fence_gate", () -> new FenceGateBlock(copy(CHIPBOARD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock CHIPBOARD_STAIRS = REGISTER.register("chipboard_stairs", () -> new StairBlock(() -> MSBlocks.CHIPBOARD.get().defaultBlockState(), ofFullCopy(CHIPBOARD.get()))); + public static final DeferredBlock CHIPBOARD_SLAB = REGISTER.register("chipboard_slab", () -> new SlabBlock(ofFullCopy(CHIPBOARD.get()))); + public static final DeferredBlock CHIPBOARD_BUTTON = REGISTER.register("chipboard_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(CHIPBOARD.get()))); + public static final DeferredBlock CHIPBOARD_PRESSURE_PLATE = REGISTER.register("chipboard_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(CHIPBOARD.get()))); + public static final DeferredBlock CHIPBOARD_FENCE = REGISTER.register("chipboard_fence", () -> new FenceBlock(ofFullCopy(CHIPBOARD.get()))); + public static final DeferredBlock CHIPBOARD_FENCE_GATE = REGISTER.register("chipboard_fence_gate", () -> new FenceGateBlock(ofFullCopy(CHIPBOARD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredBlock WOOD_SHAVINGS = REGISTER.register("wood_shavings", () -> new Block(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(0.4F).sound(SoundType.SAND))); public static final DeferredBlock CARVED_HEAVY_PLANKS = REGISTER.register("carved_heavy_planks", () -> new Block(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock CARVED_HEAVY_PLANK_STAIRS = REGISTER.register("carved_heavy_plank_stairs", () -> new StairBlock(() -> MSBlocks.CARVED_HEAVY_PLANKS.get().defaultBlockState(), copy(CARVED_HEAVY_PLANKS.get()))); - public static final DeferredBlock CARVED_HEAVY_PLANK_SLAB = REGISTER.register("carved_heavy_plank_slab", () -> new SlabBlock(copy(CARVED_HEAVY_PLANKS.get()))); + public static final DeferredBlock CARVED_HEAVY_PLANK_STAIRS = REGISTER.register("carved_heavy_plank_stairs", () -> new StairBlock(() -> MSBlocks.CARVED_HEAVY_PLANKS.get().defaultBlockState(), ofFullCopy(CARVED_HEAVY_PLANKS.get()))); + public static final DeferredBlock CARVED_HEAVY_PLANK_SLAB = REGISTER.register("carved_heavy_plank_slab", () -> new SlabBlock(ofFullCopy(CARVED_HEAVY_PLANKS.get()))); public static final DeferredBlock CARVED_PLANKS = REGISTER.register("carved_planks", () -> new Block(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); - public static final DeferredBlock CARVED_STAIRS = REGISTER.register("carved_stairs", () -> new StairBlock(() -> MSBlocks.CARVED_PLANKS.get().defaultBlockState(), copy(CARVED_PLANKS.get()))); - public static final DeferredBlock CARVED_SLAB = REGISTER.register("carved_slab", () -> new SlabBlock(copy(CARVED_PLANKS.get()))); - public static final DeferredBlock CARVED_BUTTON = REGISTER.register("carved_button", () -> new ButtonBlock(copy(CARVED_PLANKS.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock CARVED_PRESSURE_PLATE = REGISTER.register("carved_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(CARVED_PLANKS.get()), BlockSetType.OAK)); - public static final DeferredBlock CARVED_FENCE = REGISTER.register("carved_fence", () -> new FenceBlock(copy(CARVED_PLANKS.get()))); - public static final DeferredBlock CARVED_FENCE_GATE = REGISTER.register("carved_fence_gate", () -> new FenceGateBlock(copy(CARVED_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock CARVED_DOOR = REGISTER.register("carved_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); - public static final DeferredBlock CARVED_TRAPDOOR = REGISTER.register("carved_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); - - public static final DeferredBlock CARVED_SIGN = REGISTER.register("carved_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.CARVED)); - public static final DeferredBlock CARVED_WALL_SIGN = REGISTER.register("carved_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.CARVED)); - public static final DeferredBlock CARVED_HANGING_SIGN = REGISTER.register("carved_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.CARVED)); - public static final DeferredBlock CARVED_WALL_HANGING_SIGN = REGISTER.register("carved_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.CARVED)); + public static final DeferredBlock CARVED_STAIRS = REGISTER.register("carved_stairs", () -> new StairBlock(() -> MSBlocks.CARVED_PLANKS.get().defaultBlockState(), ofFullCopy(CARVED_PLANKS.get()))); + public static final DeferredBlock CARVED_SLAB = REGISTER.register("carved_slab", () -> new SlabBlock(ofFullCopy(CARVED_PLANKS.get()))); + public static final DeferredBlock CARVED_BUTTON = REGISTER.register("carved_button", () -> new ButtonBlock(MSBlockSetType.CARVED, 10, ofFullCopy(CARVED_PLANKS.get()))); + public static final DeferredBlock CARVED_PRESSURE_PLATE = REGISTER.register("carved_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.CARVED, ofFullCopy(CARVED_PLANKS.get()))); + public static final DeferredBlock CARVED_FENCE = REGISTER.register("carved_fence", () -> new FenceBlock(ofFullCopy(CARVED_PLANKS.get()))); + public static final DeferredBlock CARVED_FENCE_GATE = REGISTER.register("carved_fence_gate", () -> new FenceGateBlock(ofFullCopy(CARVED_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock CARVED_DOOR = REGISTER.register("carved_door", () -> new DoorBlock(MSBlockSetType.CARVED, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock CARVED_TRAPDOOR = REGISTER.register("carved_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.CARVED, ofFullCopy(Blocks.OAK_TRAPDOOR))); + + public static final DeferredBlock CARVED_SIGN = REGISTER.register("carved_sign", () -> new MSStandingSignBlock(MSWoodTypes.CARVED, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock CARVED_WALL_SIGN = REGISTER.register("carved_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.CARVED, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock CARVED_HANGING_SIGN = REGISTER.register("carved_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.CARVED, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock CARVED_WALL_HANGING_SIGN = REGISTER.register("carved_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.CARVED, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredBlock POLISHED_UNCARVED_WOOD = REGISTER.register("polished_carved_wood", () -> new Block(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock POLISHED_UNCARVED_STAIRS = REGISTER.register("polished_uncarved_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_UNCARVED_WOOD.get().defaultBlockState(), copy(POLISHED_UNCARVED_WOOD.get()))); - public static final DeferredBlock POLISHED_UNCARVED_SLAB = REGISTER.register("polished_uncarved_slab", () -> new SlabBlock(copy(POLISHED_UNCARVED_WOOD.get()))); + public static final DeferredBlock POLISHED_UNCARVED_STAIRS = REGISTER.register("polished_uncarved_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_UNCARVED_WOOD.get().defaultBlockState(), ofFullCopy(POLISHED_UNCARVED_WOOD.get()))); + public static final DeferredBlock POLISHED_UNCARVED_SLAB = REGISTER.register("polished_uncarved_slab", () -> new SlabBlock(ofFullCopy(POLISHED_UNCARVED_WOOD.get()))); public static final DeferredBlock CARVED_BUSH = REGISTER.register("carved_bush", () -> new WoodenFloraBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASEDRUM).strength(0.6F).sound(SoundType.WOOD).pushReaction(PushReaction.DESTROY).noCollission().offsetType(BlockBehaviour.OffsetType.XZ), WoodenFloraBlock.FLOWER_SHAPE)); public static final DeferredBlock CARVED_KNOTTED_WOOD = REGISTER.register("carved_knotted_wood", () -> new MSHorizontalDirectionalBlock(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); public static final DeferredBlock WOODEN_GRASS = REGISTER.register("wooden_grass", () -> new WoodenFloraBlock(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).noCollission().strength(0.1F, 2.5F).requiresCorrectToolForDrops().sound(SoundType.WOOD).offsetType(BlockBehaviour.OffsetType.XYZ), WoodenFloraBlock.GRASS_SHAPE)); public static final DeferredBlock TREATED_UNCARVED_WOOD = REGISTER.register("treated_uncarved_wood", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock TREATED_UNCARVED_WOOD_STAIRS = REGISTER.register("treated_uncarved_wood_stairs", () -> new StairBlock(() -> MSBlocks.TREATED_UNCARVED_WOOD.get().defaultBlockState(), copy(TREATED_UNCARVED_WOOD.get()))); - public static final DeferredBlock TREATED_UNCARVED_WOOD_SLAB = REGISTER.register("treated_uncarved_wood_slab", () -> new SlabBlock(copy(TREATED_UNCARVED_WOOD.get()))); - public static final DeferredBlock TREATED_UNCARVED_WOOD_BUTTON = REGISTER.register("treated_uncarved_wood_button", () -> new ButtonBlock(copy(TREATED_UNCARVED_WOOD.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock TREATED_UNCARVED_WOOD_PRESSURE_PLATE = REGISTER.register("treated_uncarved_wood_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(TREATED_UNCARVED_WOOD.get()), BlockSetType.OAK)); - public static final DeferredBlock TREATED_UNCARVED_WOOD_FENCE = REGISTER.register("treated_uncarved_wood_fence", () -> new FenceBlock(copy(TREATED_UNCARVED_WOOD.get()))); - public static final DeferredBlock TREATED_UNCARVED_WOOD_FENCE_GATE = REGISTER.register("treated_uncarved_wood_fence_gate", () -> new FenceGateBlock(copy(TREATED_UNCARVED_WOOD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock TREATED_UNCARVED_WOOD_STAIRS = REGISTER.register("treated_uncarved_wood_stairs", () -> new StairBlock(() -> MSBlocks.TREATED_UNCARVED_WOOD.get().defaultBlockState(), ofFullCopy(TREATED_UNCARVED_WOOD.get()))); + public static final DeferredBlock TREATED_UNCARVED_WOOD_SLAB = REGISTER.register("treated_uncarved_wood_slab", () -> new SlabBlock(ofFullCopy(TREATED_UNCARVED_WOOD.get()))); + public static final DeferredBlock TREATED_UNCARVED_WOOD_BUTTON = REGISTER.register("treated_uncarved_wood_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(TREATED_UNCARVED_WOOD.get()))); + public static final DeferredBlock TREATED_UNCARVED_WOOD_PRESSURE_PLATE = REGISTER.register("treated_uncarved_wood_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(TREATED_UNCARVED_WOOD.get()))); + public static final DeferredBlock TREATED_UNCARVED_WOOD_FENCE = REGISTER.register("treated_uncarved_wood_fence", () -> new FenceBlock(ofFullCopy(TREATED_UNCARVED_WOOD.get()))); + public static final DeferredBlock TREATED_UNCARVED_WOOD_FENCE_GATE = REGISTER.register("treated_uncarved_wood_fence_gate", () -> new FenceGateBlock(ofFullCopy(TREATED_UNCARVED_WOOD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredBlock TREATED_CHIPBOARD = REGISTER.register("treated_chipboard", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(1.0F).requiresCorrectToolForDrops().sound(SoundType.SCAFFOLDING))); - public static final DeferredBlock TREATED_CHIPBOARD_STAIRS = REGISTER.register("treated_chipboard_stairs", () -> new StairBlock(() -> MSBlocks.TREATED_CHIPBOARD.get().defaultBlockState(), copy(TREATED_CHIPBOARD.get()))); - public static final DeferredBlock TREATED_CHIPBOARD_SLAB = REGISTER.register("treated_chipboard_slab", () -> new SlabBlock(copy(TREATED_CHIPBOARD.get()))); - public static final DeferredBlock TREATED_CHIPBOARD_BUTTON = REGISTER.register("treated_chipboard_button", () -> new ButtonBlock(copy(TREATED_CHIPBOARD.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock TREATED_CHIPBOARD_PRESSURE_PLATE = REGISTER.register("treated_chipboard_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(TREATED_CHIPBOARD.get()), BlockSetType.OAK)); - public static final DeferredBlock TREATED_CHIPBOARD_FENCE = REGISTER.register("treated_chipboard_fence", () -> new FenceBlock(copy(TREATED_CHIPBOARD.get()))); - public static final DeferredBlock TREATED_CHIPBOARD_FENCE_GATE = REGISTER.register("treated_chipboard_fence_gate", () -> new FenceGateBlock(copy(TREATED_CHIPBOARD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock TREATED_CHIPBOARD_STAIRS = REGISTER.register("treated_chipboard_stairs", () -> new StairBlock(() -> MSBlocks.TREATED_CHIPBOARD.get().defaultBlockState(), ofFullCopy(TREATED_CHIPBOARD.get()))); + public static final DeferredBlock TREATED_CHIPBOARD_SLAB = REGISTER.register("treated_chipboard_slab", () -> new SlabBlock(ofFullCopy(TREATED_CHIPBOARD.get()))); + public static final DeferredBlock TREATED_CHIPBOARD_BUTTON = REGISTER.register("treated_chipboard_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(TREATED_CHIPBOARD.get()))); + public static final DeferredBlock TREATED_CHIPBOARD_PRESSURE_PLATE = REGISTER.register("treated_chipboard_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(TREATED_CHIPBOARD.get()))); + public static final DeferredBlock TREATED_CHIPBOARD_FENCE = REGISTER.register("treated_chipboard_fence", () -> new FenceBlock(ofFullCopy(TREATED_CHIPBOARD.get()))); + public static final DeferredBlock TREATED_CHIPBOARD_FENCE_GATE = REGISTER.register("treated_chipboard_fence_gate", () -> new FenceGateBlock(ofFullCopy(TREATED_CHIPBOARD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredBlock TREATED_WOOD_SHAVINGS = REGISTER.register("treated_wood_shavings", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(0.4F).sound(SoundType.SAND))); public static final DeferredBlock TREATED_HEAVY_PLANKS = REGISTER.register("treated_heavy_planks", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock TREATED_HEAVY_PLANK_STAIRS = REGISTER.register("treated_heavy_plank_stairs", () -> new StairBlock(() -> MSBlocks.TREATED_HEAVY_PLANKS.get().defaultBlockState(), copy(TREATED_HEAVY_PLANKS.get()))); - public static final DeferredBlock TREATED_HEAVY_PLANK_SLAB = REGISTER.register("treated_heavy_plank_slab", () -> new SlabBlock(copy(TREATED_HEAVY_PLANKS.get()))); + public static final DeferredBlock TREATED_HEAVY_PLANK_STAIRS = REGISTER.register("treated_heavy_plank_stairs", () -> new StairBlock(() -> MSBlocks.TREATED_HEAVY_PLANKS.get().defaultBlockState(), ofFullCopy(TREATED_HEAVY_PLANKS.get()))); + public static final DeferredBlock TREATED_HEAVY_PLANK_SLAB = REGISTER.register("treated_heavy_plank_slab", () -> new SlabBlock(ofFullCopy(TREATED_HEAVY_PLANKS.get()))); public static final DeferredBlock TREATED_PLANKS = REGISTER.register("treated_planks", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - public static final DeferredBlock TREATED_PLANKS_STAIRS = REGISTER.register("treated_planks_stairs", () -> new StairBlock(() -> MSBlocks.TREATED_PLANKS.get().defaultBlockState(), copy(TREATED_PLANKS.get()))); - public static final DeferredBlock TREATED_PLANKS_SLAB = REGISTER.register("treated_planks_slab", () -> new SlabBlock(copy(TREATED_PLANKS.get()))); + public static final DeferredBlock TREATED_PLANKS_STAIRS = REGISTER.register("treated_planks_stairs", () -> new StairBlock(() -> MSBlocks.TREATED_PLANKS.get().defaultBlockState(), ofFullCopy(TREATED_PLANKS.get()))); + public static final DeferredBlock TREATED_PLANKS_SLAB = REGISTER.register("treated_planks_slab", () -> new SlabBlock(ofFullCopy(TREATED_PLANKS.get()))); public static final DeferredBlock TREATED_BOOKSHELF = REGISTER.register("treated_bookshelf", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); public static final DeferredBlock TREATED_LADDER = REGISTER.register("treated_ladder", () -> new LadderBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD).noOcclusion())); - public static final DeferredBlock TREATED_BUTTON = REGISTER.register("treated_button", () -> new ButtonBlock(copy(TREATED_PLANKS.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock TREATED_PRESSURE_PLATE = REGISTER.register("treated_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(TREATED_PLANKS.get()), BlockSetType.OAK)); - public static final DeferredBlock TREATED_FENCE = REGISTER.register("treated_fence", () -> new FenceBlock(copy(TREATED_PLANKS.get()))); - public static final DeferredBlock TREATED_FENCE_GATE = REGISTER.register("treated_fence_gate", () -> new FenceGateBlock(copy(TREATED_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock TREATED_DOOR = REGISTER.register("treated_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); - public static final DeferredBlock TREATED_TRAPDOOR = REGISTER.register("treated_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); + public static final DeferredBlock TREATED_BUTTON = REGISTER.register("treated_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(TREATED_PLANKS.get()))); + public static final DeferredBlock TREATED_PRESSURE_PLATE = REGISTER.register("treated_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(TREATED_PLANKS.get()))); + public static final DeferredBlock TREATED_FENCE = REGISTER.register("treated_fence", () -> new FenceBlock(ofFullCopy(TREATED_PLANKS.get()))); + public static final DeferredBlock TREATED_FENCE_GATE = REGISTER.register("treated_fence_gate", () -> new FenceGateBlock(ofFullCopy(TREATED_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock TREATED_DOOR = REGISTER.register("treated_door", () -> new DoorBlock(BlockSetType.OAK, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock TREATED_TRAPDOOR = REGISTER.register("treated_trapdoor", () -> new TrapDoorBlock(BlockSetType.OAK, ofFullCopy(Blocks.OAK_TRAPDOOR))); - public static final DeferredBlock TREATED_SIGN = REGISTER.register("treated_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.TREATED)); - public static final DeferredBlock TREATED_WALL_SIGN = REGISTER.register("treated_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.TREATED)); - public static final DeferredBlock TREATED_HANGING_SIGN = REGISTER.register("treated_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.TREATED)); - public static final DeferredBlock TREATED_WALL_HANGING_SIGN = REGISTER.register("treated_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.TREATED)); + public static final DeferredBlock TREATED_SIGN = REGISTER.register("treated_sign", () -> new MSStandingSignBlock(MSWoodTypes.TREATED, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock TREATED_WALL_SIGN = REGISTER.register("treated_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.TREATED, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock TREATED_HANGING_SIGN = REGISTER.register("treated_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.TREATED, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock TREATED_WALL_HANGING_SIGN = REGISTER.register("treated_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.TREATED, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredBlock POLISHED_TREATED_UNCARVED_WOOD = REGISTER.register("polished_treated_carved_wood", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock POLISHED_TREATED_UNCARVED_STAIRS = REGISTER.register("polished_treated_uncarved_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_TREATED_UNCARVED_WOOD.get().defaultBlockState(), copy(POLISHED_TREATED_UNCARVED_WOOD.get()))); - public static final DeferredBlock POLISHED_TREATED_UNCARVED_SLAB = REGISTER.register("polished_treated_uncarved_slab", () -> new SlabBlock(copy(POLISHED_TREATED_UNCARVED_WOOD.get()))); + public static final DeferredBlock POLISHED_TREATED_UNCARVED_STAIRS = REGISTER.register("polished_treated_uncarved_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_TREATED_UNCARVED_WOOD.get().defaultBlockState(), ofFullCopy(POLISHED_TREATED_UNCARVED_WOOD.get()))); + public static final DeferredBlock POLISHED_TREATED_UNCARVED_SLAB = REGISTER.register("polished_treated_uncarved_slab", () -> new SlabBlock(ofFullCopy(POLISHED_TREATED_UNCARVED_WOOD.get()))); public static final DeferredBlock TREATED_CARVED_KNOTTED_WOOD = REGISTER.register("treated_carved_knotted_wood", () -> new MSHorizontalDirectionalBlock(Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); public static final DeferredBlock TREATED_WOODEN_GRASS = REGISTER.register("treated_wooden_grass", () -> new WoodenFloraBlock(Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).noCollission().strength(0.1F, 2.5F).requiresCorrectToolForDrops().sound(SoundType.WOOD).offsetType(BlockBehaviour.OffsetType.XYZ), WoodenFloraBlock.GRASS_SHAPE)); public static final DeferredBlock LACQUERED_UNCARVED_WOOD = REGISTER.register("lacquered_uncarved_wood", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock LACQUERED_UNCARVED_WOOD_STAIRS = REGISTER.register("lacquered_uncarved_wood_stairs", () -> new StairBlock(() -> MSBlocks.LACQUERED_UNCARVED_WOOD.get().defaultBlockState(), copy(LACQUERED_UNCARVED_WOOD.get()))); - public static final DeferredBlock LACQUERED_UNCARVED_WOOD_SLAB = REGISTER.register("lacquered_uncarved_wood_slab", () -> new SlabBlock(copy(LACQUERED_UNCARVED_WOOD.get()))); - public static final DeferredBlock LACQUERED_UNCARVED_WOOD_BUTTON = REGISTER.register("lacquered_uncarved_wood_button", () -> new ButtonBlock(copy(LACQUERED_UNCARVED_WOOD.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock LACQUERED_UNCARVED_WOOD_PRESSURE_PLATE = REGISTER.register("lacquered_uncarved_wood_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(LACQUERED_UNCARVED_WOOD.get()), BlockSetType.OAK)); - public static final DeferredBlock LACQUERED_UNCARVED_WOOD_FENCE = REGISTER.register("lacquered_uncarved_wood_fence", () -> new FenceBlock(copy(LACQUERED_UNCARVED_WOOD.get()))); - public static final DeferredBlock LACQUERED_UNCARVED_WOOD_FENCE_GATE = REGISTER.register("lacquered_uncarved_wood_fence_gate", () -> new FenceGateBlock(copy(LACQUERED_UNCARVED_WOOD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock LACQUERED_UNCARVED_WOOD_STAIRS = REGISTER.register("lacquered_uncarved_wood_stairs", () -> new StairBlock(() -> MSBlocks.LACQUERED_UNCARVED_WOOD.get().defaultBlockState(), ofFullCopy(LACQUERED_UNCARVED_WOOD.get()))); + public static final DeferredBlock LACQUERED_UNCARVED_WOOD_SLAB = REGISTER.register("lacquered_uncarved_wood_slab", () -> new SlabBlock(ofFullCopy(LACQUERED_UNCARVED_WOOD.get()))); + public static final DeferredBlock LACQUERED_UNCARVED_WOOD_BUTTON = REGISTER.register("lacquered_uncarved_wood_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(LACQUERED_UNCARVED_WOOD.get()))); + public static final DeferredBlock LACQUERED_UNCARVED_WOOD_PRESSURE_PLATE = REGISTER.register("lacquered_uncarved_wood_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(LACQUERED_UNCARVED_WOOD.get()))); + public static final DeferredBlock LACQUERED_UNCARVED_WOOD_FENCE = REGISTER.register("lacquered_uncarved_wood_fence", () -> new FenceBlock(ofFullCopy(LACQUERED_UNCARVED_WOOD.get()))); + public static final DeferredBlock LACQUERED_UNCARVED_WOOD_FENCE_GATE = REGISTER.register("lacquered_uncarved_wood_fence_gate", () -> new FenceGateBlock(ofFullCopy(LACQUERED_UNCARVED_WOOD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredBlock LACQUERED_CHIPBOARD = REGISTER.register("lacquered_chipboard", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(1.0F).requiresCorrectToolForDrops().sound(SoundType.SCAFFOLDING))); - public static final DeferredBlock LACQUERED_CHIPBOARD_STAIRS = REGISTER.register("lacquered_chipboard_stairs", () -> new StairBlock(() -> MSBlocks.LACQUERED_CHIPBOARD.get().defaultBlockState(), copy(LACQUERED_CHIPBOARD.get()))); - public static final DeferredBlock LACQUERED_CHIPBOARD_SLAB = REGISTER.register("lacquered_chipboard_slab", () -> new SlabBlock(copy(LACQUERED_CHIPBOARD.get()))); - public static final DeferredBlock LACQUERED_CHIPBOARD_BUTTON = REGISTER.register("lacquered_chipboard_button", () -> new ButtonBlock(copy(LACQUERED_CHIPBOARD.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock LACQUERED_CHIPBOARD_PRESSURE_PLATE = REGISTER.register("lacquered_chipboard_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(LACQUERED_CHIPBOARD.get()), BlockSetType.OAK)); - public static final DeferredBlock LACQUERED_CHIPBOARD_FENCE = REGISTER.register("lacquered_chipboard_fence", () -> new FenceBlock(copy(LACQUERED_CHIPBOARD.get()))); - public static final DeferredBlock LACQUERED_CHIPBOARD_FENCE_GATE = REGISTER.register("lacquered_chipboard_fence_gate", () -> new FenceGateBlock(copy(LACQUERED_CHIPBOARD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock LACQUERED_CHIPBOARD_STAIRS = REGISTER.register("lacquered_chipboard_stairs", () -> new StairBlock(() -> MSBlocks.LACQUERED_CHIPBOARD.get().defaultBlockState(), ofFullCopy(LACQUERED_CHIPBOARD.get()))); + public static final DeferredBlock LACQUERED_CHIPBOARD_SLAB = REGISTER.register("lacquered_chipboard_slab", () -> new SlabBlock(ofFullCopy(LACQUERED_CHIPBOARD.get()))); + public static final DeferredBlock LACQUERED_CHIPBOARD_BUTTON = REGISTER.register("lacquered_chipboard_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(LACQUERED_CHIPBOARD.get()))); + public static final DeferredBlock LACQUERED_CHIPBOARD_PRESSURE_PLATE = REGISTER.register("lacquered_chipboard_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(LACQUERED_CHIPBOARD.get()))); + public static final DeferredBlock LACQUERED_CHIPBOARD_FENCE = REGISTER.register("lacquered_chipboard_fence", () -> new FenceBlock(ofFullCopy(LACQUERED_CHIPBOARD.get()))); + public static final DeferredBlock LACQUERED_CHIPBOARD_FENCE_GATE = REGISTER.register("lacquered_chipboard_fence_gate", () -> new FenceGateBlock(ofFullCopy(LACQUERED_CHIPBOARD.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); public static final DeferredBlock LACQUERED_WOOD_SHAVINGS = REGISTER.register("lacquered_wood_shavings", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(0.4F).sound(SoundType.SAND))); public static final DeferredBlock LACQUERED_HEAVY_PLANKS = REGISTER.register("lacquered_heavy_planks", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock LACQUERED_HEAVY_PLANK_STAIRS = REGISTER.register("lacquered_heavy_plank_stairs", () -> new StairBlock(() -> MSBlocks.LACQUERED_HEAVY_PLANKS.get().defaultBlockState(), copy(LACQUERED_HEAVY_PLANKS.get()))); - public static final DeferredBlock LACQUERED_HEAVY_PLANK_SLAB = REGISTER.register("lacquered_heavy_plank_slab", () -> new SlabBlock(copy(LACQUERED_HEAVY_PLANKS.get()))); + public static final DeferredBlock LACQUERED_HEAVY_PLANK_STAIRS = REGISTER.register("lacquered_heavy_plank_stairs", () -> new StairBlock(() -> MSBlocks.LACQUERED_HEAVY_PLANKS.get().defaultBlockState(), ofFullCopy(LACQUERED_HEAVY_PLANKS.get()))); + public static final DeferredBlock LACQUERED_HEAVY_PLANK_SLAB = REGISTER.register("lacquered_heavy_plank_slab", () -> new SlabBlock(ofFullCopy(LACQUERED_HEAVY_PLANKS.get()))); public static final DeferredBlock LACQUERED_PLANKS = REGISTER.register("lacquered_planks", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - public static final DeferredBlock LACQUERED_STAIRS = REGISTER.register("lacquered_stairs", () -> new StairBlock(() -> MSBlocks.LACQUERED_PLANKS.get().defaultBlockState(), copy(LACQUERED_PLANKS.get()))); - public static final DeferredBlock LACQUERED_SLAB = REGISTER.register("lacquered_slab", () -> new SlabBlock(copy(LACQUERED_PLANKS.get()))); - public static final DeferredBlock LACQUERED_BUTTON = REGISTER.register("lacquered_button", () -> new ButtonBlock(copy(LACQUERED_PLANKS.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock LACQUERED_PRESSURE_PLATE = REGISTER.register("lacquered_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(LACQUERED_PLANKS.get()), BlockSetType.OAK)); - public static final DeferredBlock LACQUERED_FENCE = REGISTER.register("lacquered_fence", () -> new FenceBlock(copy(LACQUERED_PLANKS.get()))); - public static final DeferredBlock LACQUERED_FENCE_GATE = REGISTER.register("lacquered_fence_gate", () -> new FenceGateBlock(copy(LACQUERED_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock LACQUERED_DOOR = REGISTER.register("lacquered_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); - public static final DeferredBlock LACQUERED_TRAPDOOR = REGISTER.register("lacquered_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); - - public static final DeferredBlock LACQUERED_SIGN = REGISTER.register("lacquered_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.LACQUERED)); - public static final DeferredBlock LACQUERED_WALL_SIGN = REGISTER.register("lacquered_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.LACQUERED)); - public static final DeferredBlock LACQUERED_HANGING_SIGN = REGISTER.register("lacquered_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.LACQUERED)); - public static final DeferredBlock LACQUERED_WALL_HANGING_SIGN = REGISTER.register("lacquered_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.LACQUERED)); + public static final DeferredBlock LACQUERED_STAIRS = REGISTER.register("lacquered_stairs", () -> new StairBlock(() -> MSBlocks.LACQUERED_PLANKS.get().defaultBlockState(), ofFullCopy(LACQUERED_PLANKS.get()))); + public static final DeferredBlock LACQUERED_SLAB = REGISTER.register("lacquered_slab", () -> new SlabBlock(ofFullCopy(LACQUERED_PLANKS.get()))); + public static final DeferredBlock LACQUERED_BUTTON = REGISTER.register("lacquered_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(LACQUERED_PLANKS.get()))); + public static final DeferredBlock LACQUERED_PRESSURE_PLATE = REGISTER.register("lacquered_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(LACQUERED_PLANKS.get()))); + public static final DeferredBlock LACQUERED_FENCE = REGISTER.register("lacquered_fence", () -> new FenceBlock(ofFullCopy(LACQUERED_PLANKS.get()))); + public static final DeferredBlock LACQUERED_FENCE_GATE = REGISTER.register("lacquered_fence_gate", () -> new FenceGateBlock(ofFullCopy(LACQUERED_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock LACQUERED_DOOR = REGISTER.register("lacquered_door", () -> new DoorBlock(BlockSetType.OAK, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock LACQUERED_TRAPDOOR = REGISTER.register("lacquered_trapdoor", () -> new TrapDoorBlock(BlockSetType.OAK, ofFullCopy(Blocks.OAK_TRAPDOOR))); + + public static final DeferredBlock LACQUERED_SIGN = REGISTER.register("lacquered_sign", () -> new MSStandingSignBlock(MSWoodTypes.LACQUERED, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock LACQUERED_WALL_SIGN = REGISTER.register("lacquered_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.LACQUERED, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock LACQUERED_HANGING_SIGN = REGISTER.register("lacquered_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.LACQUERED, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock LACQUERED_WALL_HANGING_SIGN = REGISTER.register("lacquered_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.LACQUERED, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredBlock POLISHED_LACQUERED_UNCARVED_WOOD = REGISTER.register("polished_lacquered_carved_wood", () -> new FlammableBlock(0, 0, Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); - public static final DeferredBlock POLISHED_LACQUERED_UNCARVED_STAIRS = REGISTER.register("polished_lacquered_uncarved_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_LACQUERED_UNCARVED_WOOD.get().defaultBlockState(), copy(POLISHED_LACQUERED_UNCARVED_WOOD.get()))); - public static final DeferredBlock POLISHED_LACQUERED_UNCARVED_SLAB = REGISTER.register("polished_lacquered_uncarved_slab", () -> new SlabBlock(copy(POLISHED_LACQUERED_UNCARVED_WOOD.get()))); + public static final DeferredBlock POLISHED_LACQUERED_UNCARVED_STAIRS = REGISTER.register("polished_lacquered_uncarved_stairs", () -> new StairBlock(() -> MSBlocks.POLISHED_LACQUERED_UNCARVED_WOOD.get().defaultBlockState(), ofFullCopy(POLISHED_LACQUERED_UNCARVED_WOOD.get()))); + public static final DeferredBlock POLISHED_LACQUERED_UNCARVED_SLAB = REGISTER.register("polished_lacquered_uncarved_slab", () -> new SlabBlock(ofFullCopy(POLISHED_LACQUERED_UNCARVED_WOOD.get()))); public static final DeferredBlock LACQUERED_CARVED_KNOTTED_WOOD = REGISTER.register("lacquered_carved_knotted_wood", () -> new MSHorizontalDirectionalBlock(Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).requiresCorrectToolForDrops().sound(SoundType.WOOD))); public static final DeferredBlock LACQUERED_WOODEN_MUSHROOM = REGISTER.register("lacquered_wooden_mushroom", () -> new WoodenFloraBlock(Block.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).noCollission().strength(0.1F, 2.5F).requiresCorrectToolForDrops().sound(SoundType.WOOD).offsetType(BlockBehaviour.OffsetType.XYZ), WoodenFloraBlock.FLOWER_SHAPE)); @@ -699,19 +703,21 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock GLOWING_PLANKS = REGISTER.register("glowing_planks", () -> new FlammableBlock(5, 20, Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).lightLevel(state -> 7).sound(SoundType.WOOD))); public static final DeferredBlock GLOWING_BOOKSHELF = REGISTER.register("glowing_bookshelf", () -> new FlammableBlock(5, 20, Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); public static final DeferredBlock GLOWING_LADDER = REGISTER.register("glowing_ladder", () -> new LadderBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD).noOcclusion())); - public static final DeferredBlock GLOWING_STAIRS = REGISTER.register("glowing_stairs", () -> new StairBlock(() -> MSBlocks.GLOWING_PLANKS.get().defaultBlockState(), copy(GLOWING_PLANKS.get()))); - public static final DeferredBlock GLOWING_SLAB = REGISTER.register("glowing_slab", () -> new SlabBlock(copy(GLOWING_PLANKS.get()))); - public static final DeferredBlock GLOWING_BUTTON = REGISTER.register("glowing_button", () -> new ButtonBlock(copy(GLOWING_PLANKS.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock GLOWING_PRESSURE_PLATE = REGISTER.register("glowing_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(GLOWING_PLANKS.get()), BlockSetType.OAK)); - public static final DeferredBlock GLOWING_FENCE = REGISTER.register("glowing_fence", () -> new FenceBlock(copy(GLOWING_PLANKS.get()))); - public static final DeferredBlock GLOWING_FENCE_GATE = REGISTER.register("glowing_fence_gate", () -> new FenceGateBlock(copy(GLOWING_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock GLOWING_DOOR = REGISTER.register("glowing_door", () -> new DoorBlock(Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).lightLevel(state -> 7).sound(SoundType.WOOD), BlockSetType.OAK)); - public static final DeferredBlock GLOWING_TRAPDOOR = REGISTER.register("glowing_trapdoor", () -> new TrapDoorBlock(Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).lightLevel(state -> 7).sound(SoundType.WOOD), BlockSetType.OAK)); - - public static final DeferredBlock GLOWING_SIGN = REGISTER.register("glowing_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN).lightLevel(state -> 11), MSWoodTypes.GLOWING)); - public static final DeferredBlock GLOWING_WALL_SIGN = REGISTER.register("glowing_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN).lightLevel(state -> 11), MSWoodTypes.GLOWING)); - public static final DeferredBlock GLOWING_HANGING_SIGN = REGISTER.register("glowing_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN).lightLevel(state -> 11), MSWoodTypes.GLOWING)); - public static final DeferredBlock GLOWING_WALL_HANGING_SIGN = REGISTER.register("glowing_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN).lightLevel(state -> 11), MSWoodTypes.GLOWING)); + public static final DeferredBlock GLOWING_STAIRS = REGISTER.register("glowing_stairs", () -> new StairBlock(() -> MSBlocks.GLOWING_PLANKS.get().defaultBlockState(), ofFullCopy(GLOWING_PLANKS.get()))); + public static final DeferredBlock GLOWING_SLAB = REGISTER.register("glowing_slab", () -> new SlabBlock(ofFullCopy(GLOWING_PLANKS.get()))); + public static final DeferredBlock GLOWING_BUTTON = REGISTER.register("glowing_button", () -> new ButtonBlock(BlockSetType.OAK, 10, ofFullCopy(GLOWING_PLANKS.get()))); + public static final DeferredBlock GLOWING_PRESSURE_PLATE = REGISTER.register("glowing_pressure_plate", () -> new PressurePlateBlock(BlockSetType.OAK, ofFullCopy(GLOWING_PLANKS.get()))); + public static final DeferredBlock GLOWING_FENCE = REGISTER.register("glowing_fence", () -> new FenceBlock(ofFullCopy(GLOWING_PLANKS.get()))); + public static final DeferredBlock GLOWING_FENCE_GATE = REGISTER.register("glowing_fence_gate", () -> new FenceGateBlock(ofFullCopy(GLOWING_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock GLOWING_DOOR = REGISTER.register("glowing_door", () -> new DoorBlock(BlockSetType.OAK, + Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).lightLevel(state -> 7).sound(SoundType.WOOD))); + public static final DeferredBlock GLOWING_TRAPDOOR = REGISTER.register("glowing_trapdoor", () -> new TrapDoorBlock(BlockSetType.OAK, + Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).lightLevel(state -> 7).sound(SoundType.WOOD))); + + public static final DeferredBlock GLOWING_SIGN = REGISTER.register("glowing_sign", () -> new MSStandingSignBlock(MSWoodTypes.GLOWING, ofFullCopy(Blocks.OAK_SIGN).lightLevel(state -> 11))); + public static final DeferredBlock GLOWING_WALL_SIGN = REGISTER.register("glowing_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.GLOWING, ofFullCopy(Blocks.OAK_WALL_SIGN).lightLevel(state -> 11))); + public static final DeferredBlock GLOWING_HANGING_SIGN = REGISTER.register("glowing_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.GLOWING, ofFullCopy(Blocks.OAK_HANGING_SIGN).lightLevel(state -> 11))); + public static final DeferredBlock GLOWING_WALL_HANGING_SIGN = REGISTER.register("glowing_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.GLOWING, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN).lightLevel(state -> 11))); //Frost public static final DeferredBlock FROST_LOG = REGISTER.register("frost_log", () -> new FlammableLogBlock(Block.Properties.of().mapColor(MapColor.ICE).strength(2.0F).ignitedByLava().instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD))); @@ -723,20 +729,20 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock FROST_LEAVES_FLOWERING = REGISTER.register("frost_leaves_flowering", () -> new FlammableLeavesBlock(Block.Properties.of().mapColor(MapColor.PLANT).ignitedByLava().pushReaction(PushReaction.DESTROY).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(MSBlocks::leafSpawns).isSuffocating(MSBlocks::never).isViewBlocking(MSBlocks::never).isRedstoneConductor(MSBlocks::never))); public static final DeferredBlock FROST_BOOKSHELF = REGISTER.register("frost_bookshelf", () -> new FlammableBlock(5, 5, Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); public static final DeferredBlock FROST_LADDER = REGISTER.register("frost_ladder", () -> new LadderBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD).noOcclusion())); - public static final DeferredBlock FROST_STAIRS = REGISTER.register("frost_stairs", () -> new StairBlock(() -> MSBlocks.FROST_PLANKS.get().defaultBlockState(), copy(FROST_PLANKS.get()))); - public static final DeferredBlock FROST_SLAB = REGISTER.register("frost_slab", () -> new SlabBlock(copy(FROST_PLANKS.get()))); - public static final DeferredBlock FROST_BUTTON = REGISTER.register("frost_button", () -> new ButtonBlock(copy(FROST_PLANKS.get()), BlockSetType.OAK, 10, true)); - public static final DeferredBlock FROST_PRESSURE_PLATE = REGISTER.register("frost_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(FROST_PLANKS.get()), BlockSetType.OAK)); - public static final DeferredBlock FROST_FENCE = REGISTER.register("frost_fence", () -> new FenceBlock(copy(FROST_PLANKS.get()))); - public static final DeferredBlock FROST_FENCE_GATE = REGISTER.register("frost_fence_gate", () -> new FenceGateBlock(copy(FROST_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock FROST_DOOR = REGISTER.register("frost_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); - public static final DeferredBlock FROST_TRAPDOOR = REGISTER.register("frost_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)); - public static final DeferredBlock FROST_SAPLING = REGISTER.register("frost_sapling", () -> new FrostSaplingBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SAPLING))); - - public static final DeferredBlock FROST_SIGN = REGISTER.register("frost_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.FROST)); - public static final DeferredBlock FROST_WALL_SIGN = REGISTER.register("frost_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.FROST)); - public static final DeferredBlock FROST_HANGING_SIGN = REGISTER.register("frost_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.FROST)); - public static final DeferredBlock FROST_WALL_HANGING_SIGN = REGISTER.register("frost_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.FROST)); + public static final DeferredBlock FROST_STAIRS = REGISTER.register("frost_stairs", () -> new StairBlock(() -> MSBlocks.FROST_PLANKS.get().defaultBlockState(), ofFullCopy(FROST_PLANKS.get()))); + public static final DeferredBlock FROST_SLAB = REGISTER.register("frost_slab", () -> new SlabBlock(ofFullCopy(FROST_PLANKS.get()))); + public static final DeferredBlock FROST_BUTTON = REGISTER.register("frost_button", () -> new ButtonBlock(MSBlockSetType.FROST, 10, ofFullCopy(FROST_PLANKS.get()))); + public static final DeferredBlock FROST_PRESSURE_PLATE = REGISTER.register("frost_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.FROST, ofFullCopy(FROST_PLANKS.get()))); + public static final DeferredBlock FROST_FENCE = REGISTER.register("frost_fence", () -> new FenceBlock(ofFullCopy(FROST_PLANKS.get()))); + public static final DeferredBlock FROST_FENCE_GATE = REGISTER.register("frost_fence_gate", () -> new FenceGateBlock(ofFullCopy(FROST_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock FROST_DOOR = REGISTER.register("frost_door", () -> new DoorBlock(MSBlockSetType.FROST, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock FROST_TRAPDOOR = REGISTER.register("frost_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.FROST, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock FROST_SAPLING = REGISTER.register("frost_sapling", () -> new FrostSaplingBlock(ofFullCopy(Blocks.OAK_SAPLING))); + + public static final DeferredBlock FROST_SIGN = REGISTER.register("frost_sign", () -> new MSStandingSignBlock(MSWoodTypes.FROST, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock FROST_WALL_SIGN = REGISTER.register("frost_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.FROST, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock FROST_HANGING_SIGN = REGISTER.register("frost_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.FROST, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock FROST_WALL_HANGING_SIGN = REGISTER.register("frost_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.FROST, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); //Rainbow public static final DeferredBlock RAINBOW_LOG = REGISTER.register("rainbow_log", () -> new FlammableLogBlock(Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); @@ -744,23 +750,23 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock STRIPPED_RAINBOW_LOG = REGISTER.register("stripped_rainbow_log", () -> new FlammableLogBlock(BlockBehaviour.Properties.of().mapColor(logColors(MapColor.WOOD, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); public static final DeferredBlock STRIPPED_RAINBOW_WOOD = REGISTER.register("stripped_rainbow_wood", () -> new FlammableLogBlock(BlockBehaviour.Properties.of().mapColor(logColors(MapColor.WOOD, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); public static final DeferredBlock RAINBOW_PLANKS = REGISTER.register("rainbow_planks", () -> new FlammableBlock(5, 20, Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - public static final DeferredBlock RAINBOW_STAIRS = REGISTER.register("rainbow_planks_stairs", () -> new StairBlock(() -> MSBlocks.RAINBOW_PLANKS.get().defaultBlockState(), copy(RAINBOW_PLANKS.get()))); - public static final DeferredBlock RAINBOW_SLAB = REGISTER.register("rainbow_planks_slab", () -> new SlabBlock(copy(RAINBOW_PLANKS.get()))); + public static final DeferredBlock RAINBOW_STAIRS = REGISTER.register("rainbow_planks_stairs", () -> new StairBlock(() -> MSBlocks.RAINBOW_PLANKS.get().defaultBlockState(), ofFullCopy(RAINBOW_PLANKS.get()))); + public static final DeferredBlock RAINBOW_SLAB = REGISTER.register("rainbow_planks_slab", () -> new SlabBlock(ofFullCopy(RAINBOW_PLANKS.get()))); public static final DeferredBlock RAINBOW_LEAVES = REGISTER.register("rainbow_leaves", () -> new FlammableLeavesBlock(Block.Properties.of().mapColor(MapColor.PLANT).ignitedByLava().pushReaction(PushReaction.DESTROY).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(MSBlocks::leafSpawns).isSuffocating(MSBlocks::never).isViewBlocking(MSBlocks::never).isRedstoneConductor(MSBlocks::never))); public static final DeferredBlock RAINBOW_SAPLING = REGISTER.register("rainbow_sapling", () -> new RainbowSaplingBlock(Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredBlock RAINBOW_BOOKSHELF = REGISTER.register("rainbow_bookshelf", () -> new FlammableBlock(5, 20, Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); public static final DeferredBlock RAINBOW_LADDER = REGISTER.register("rainbow_ladder", () -> new LadderBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD).noOcclusion())); - public static final DeferredBlock RAINBOW_BUTTON = REGISTER.register("rainbow_button", () -> new ButtonBlock(copy(RAINBOW_PLANKS.get()), MSBlockSetType.RAINBOW, 10, true)); - public static final DeferredBlock RAINBOW_PRESSURE_PLATE = REGISTER.register("rainbow_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(RAINBOW_PLANKS.get()), MSBlockSetType.RAINBOW)); - public static final DeferredBlock RAINBOW_FENCE = REGISTER.register("rainbow_fence", () -> new FenceBlock(copy(RAINBOW_PLANKS.get()))); - public static final DeferredBlock RAINBOW_FENCE_GATE = REGISTER.register("rainbow_fence_gate", () -> new FenceGateBlock(copy(RAINBOW_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock RAINBOW_DOOR = REGISTER.register("rainbow_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.RAINBOW)); - public static final DeferredBlock RAINBOW_TRAPDOOR = REGISTER.register("rainbow_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.RAINBOW)); + public static final DeferredBlock RAINBOW_BUTTON = REGISTER.register("rainbow_button", () -> new ButtonBlock(MSBlockSetType.RAINBOW, 10, ofFullCopy(RAINBOW_PLANKS.get()))); + public static final DeferredBlock RAINBOW_PRESSURE_PLATE = REGISTER.register("rainbow_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.RAINBOW, ofFullCopy(RAINBOW_PLANKS.get()))); + public static final DeferredBlock RAINBOW_FENCE = REGISTER.register("rainbow_fence", () -> new FenceBlock(ofFullCopy(RAINBOW_PLANKS.get()))); + public static final DeferredBlock RAINBOW_FENCE_GATE = REGISTER.register("rainbow_fence_gate", () -> new FenceGateBlock(ofFullCopy(RAINBOW_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock RAINBOW_DOOR = REGISTER.register("rainbow_door", () -> new DoorBlock(MSBlockSetType.RAINBOW, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock RAINBOW_TRAPDOOR = REGISTER.register("rainbow_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.RAINBOW, ofFullCopy(Blocks.OAK_TRAPDOOR))); - public static final DeferredBlock RAINBOW_SIGN = REGISTER.register("rainbow_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.RAINBOW)); - public static final DeferredBlock RAINBOW_WALL_SIGN = REGISTER.register("rainbow_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.RAINBOW)); - public static final DeferredBlock RAINBOW_HANGING_SIGN = REGISTER.register("rainbow_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.RAINBOW)); - public static final DeferredBlock RAINBOW_WALL_HANGING_SIGN = REGISTER.register("rainbow_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.RAINBOW)); + public static final DeferredBlock RAINBOW_SIGN = REGISTER.register("rainbow_sign", () -> new MSStandingSignBlock(MSWoodTypes.RAINBOW, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock RAINBOW_WALL_SIGN = REGISTER.register("rainbow_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.RAINBOW, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock RAINBOW_HANGING_SIGN = REGISTER.register("rainbow_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.RAINBOW, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock RAINBOW_WALL_HANGING_SIGN = REGISTER.register("rainbow_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.RAINBOW, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); //End @@ -769,23 +775,23 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock STRIPPED_END_LOG = REGISTER.register("stripped_end_log", () -> new DoubleLogBlock(BlockBehaviour.Properties.of().mapColor(logColors(MapColor.COLOR_MAGENTA, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); public static final DeferredBlock STRIPPED_END_WOOD = REGISTER.register("stripped_end_wood", () -> new FlammableLogBlock(BlockBehaviour.Properties.of().mapColor(logColors(MapColor.COLOR_MAGENTA, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); public static final DeferredBlock END_PLANKS = REGISTER.register("end_planks", () -> new FlammableBlock(1, 250, Block.Properties.of().mapColor(MapColor.SAND).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - public static final DeferredBlock END_STAIRS = REGISTER.register("end_planks_stairs", () -> new StairBlock(() -> MSBlocks.END_PLANKS.get().defaultBlockState(), copy(END_PLANKS.get()))); - public static final DeferredBlock END_SLAB = REGISTER.register("end_planks_slab", () -> new SlabBlock(copy(END_PLANKS.get()))); + public static final DeferredBlock END_STAIRS = REGISTER.register("end_planks_stairs", () -> new StairBlock(() -> MSBlocks.END_PLANKS.get().defaultBlockState(), ofFullCopy(END_PLANKS.get()))); + public static final DeferredBlock END_SLAB = REGISTER.register("end_planks_slab", () -> new SlabBlock(ofFullCopy(END_PLANKS.get()))); public static final DeferredBlock END_LEAVES = REGISTER.register("end_leaves", () -> new EndLeavesBlock(Block.Properties.of().mapColor(MapColor.PLANT).ignitedByLava().pushReaction(PushReaction.DESTROY).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(MSBlocks::leafSpawns).isSuffocating(MSBlocks::never).isViewBlocking(MSBlocks::never).isRedstoneConductor(MSBlocks::never))); public static final DeferredBlock END_SAPLING = REGISTER.register("end_sapling", () -> new EndSaplingBlock(Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS))); public static final DeferredBlock END_LADDER = REGISTER.register("end_ladder", () -> new LadderBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD).noOcclusion())); public static final DeferredBlock END_BOOKSHELF = REGISTER.register("end_bookshelf", () -> new FlammableBlock(1, 250, Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - public static final DeferredBlock END_BUTTON = REGISTER.register("end_button", () -> new ButtonBlock(copy(END_PLANKS.get()), MSBlockSetType.END, 10, true)); - public static final DeferredBlock END_PRESSURE_PLATE = REGISTER.register("end_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(END_PLANKS.get()), MSBlockSetType.END)); - public static final DeferredBlock END_FENCE = REGISTER.register("end_fence", () -> new FenceBlock(copy(END_PLANKS.get()))); - public static final DeferredBlock END_FENCE_GATE = REGISTER.register("end_fence_gate", () -> new FenceGateBlock(copy(END_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock END_DOOR = REGISTER.register("end_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.END)); - public static final DeferredBlock END_TRAPDOOR = REGISTER.register("end_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.END)); - - public static final DeferredBlock END_SIGN = REGISTER.register("end_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.END)); - public static final DeferredBlock END_WALL_SIGN = REGISTER.register("end_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.END)); - public static final DeferredBlock END_HANGING_SIGN = REGISTER.register("end_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.END)); - public static final DeferredBlock END_WALL_HANGING_SIGN = REGISTER.register("end_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.END)); + public static final DeferredBlock END_BUTTON = REGISTER.register("end_button", () -> new ButtonBlock(MSBlockSetType.END, 10, ofFullCopy(END_PLANKS.get()))); + public static final DeferredBlock END_PRESSURE_PLATE = REGISTER.register("end_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.END, ofFullCopy(END_PLANKS.get()))); + public static final DeferredBlock END_FENCE = REGISTER.register("end_fence", () -> new FenceBlock(ofFullCopy(END_PLANKS.get()))); + public static final DeferredBlock END_FENCE_GATE = REGISTER.register("end_fence_gate", () -> new FenceGateBlock(ofFullCopy(END_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock END_DOOR = REGISTER.register("end_door", () -> new DoorBlock(MSBlockSetType.END, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock END_TRAPDOOR = REGISTER.register("end_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.END, ofFullCopy(Blocks.OAK_TRAPDOOR))); + + public static final DeferredBlock END_SIGN = REGISTER.register("end_sign", () -> new MSStandingSignBlock(MSWoodTypes.END, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock END_WALL_SIGN = REGISTER.register("end_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.END, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock END_HANGING_SIGN = REGISTER.register("end_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.END, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock END_WALL_HANGING_SIGN = REGISTER.register("end_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.END, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); //Vine public static final DeferredBlock VINE_LOG = REGISTER.register("vine_log", () -> new FlammableLogBlock(Block.Properties.of().mapColor(logColors(MapColor.WOOD, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); @@ -800,21 +806,21 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock STRIPPED_DEAD_LOG = REGISTER.register("stripped_dead_log", () -> new FlammableLogBlock(BlockBehaviour.Properties.of().mapColor(logColors(MapColor.WOOD, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); public static final DeferredBlock STRIPPED_DEAD_WOOD = REGISTER.register("stripped_dead_wood", () -> new FlammableLogBlock(BlockBehaviour.Properties.of().mapColor(logColors(MapColor.WOOD, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); public static final DeferredBlock DEAD_PLANKS = REGISTER.register("dead_planks", () -> new FlammableBlock(5, 5, Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - public static final DeferredBlock DEAD_STAIRS = REGISTER.register("dead_planks_stairs", () -> new StairBlock(() -> MSBlocks.DEAD_PLANKS.get().defaultBlockState(), copy(DEAD_PLANKS.get()))); - public static final DeferredBlock DEAD_SLAB = REGISTER.register("dead_planks_slab", () -> new SlabBlock(copy(DEAD_PLANKS.get()))); + public static final DeferredBlock DEAD_STAIRS = REGISTER.register("dead_planks_stairs", () -> new StairBlock(() -> MSBlocks.DEAD_PLANKS.get().defaultBlockState(), ofFullCopy(DEAD_PLANKS.get()))); + public static final DeferredBlock DEAD_SLAB = REGISTER.register("dead_planks_slab", () -> new SlabBlock(ofFullCopy(DEAD_PLANKS.get()))); public static final DeferredBlock DEAD_BOOKSHELF = REGISTER.register("dead_bookshelf", () -> new FlammableBlock(5, 5, Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); public static final DeferredBlock DEAD_LADDER = REGISTER.register("dead_ladder", () -> new LadderBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD).noOcclusion())); - public static final DeferredBlock DEAD_BUTTON = REGISTER.register("dead_button", () -> new ButtonBlock(copy(DEAD_PLANKS.get()), MSBlockSetType.DEAD, 10, true)); - public static final DeferredBlock DEAD_PRESSURE_PLATE = REGISTER.register("dead_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(DEAD_PLANKS.get()), MSBlockSetType.DEAD)); - public static final DeferredBlock DEAD_FENCE = REGISTER.register("dead_fence", () -> new FenceBlock(copy(DEAD_PLANKS.get()))); - public static final DeferredBlock DEAD_FENCE_GATE = REGISTER.register("dead_fence_gate", () -> new FenceGateBlock(copy(DEAD_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock DEAD_DOOR = REGISTER.register("dead_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.DEAD)); - public static final DeferredBlock DEAD_TRAPDOOR = REGISTER.register("dead_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.DEAD)); - - public static final DeferredBlock DEAD_SIGN = REGISTER.register("dead_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.DEAD)); - public static final DeferredBlock DEAD_WALL_SIGN = REGISTER.register("dead_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.DEAD)); - public static final DeferredBlock DEAD_HANGING_SIGN = REGISTER.register("dead_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.DEAD)); - public static final DeferredBlock DEAD_WALL_HANGING_SIGN = REGISTER.register("dead_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.DEAD)); + public static final DeferredBlock DEAD_BUTTON = REGISTER.register("dead_button", () -> new ButtonBlock(MSBlockSetType.DEAD, 10, ofFullCopy(DEAD_PLANKS.get()))); + public static final DeferredBlock DEAD_PRESSURE_PLATE = REGISTER.register("dead_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.DEAD, ofFullCopy(DEAD_PLANKS.get()))); + public static final DeferredBlock DEAD_FENCE = REGISTER.register("dead_fence", () -> new FenceBlock(ofFullCopy(DEAD_PLANKS.get()))); + public static final DeferredBlock DEAD_FENCE_GATE = REGISTER.register("dead_fence_gate", () -> new FenceGateBlock(ofFullCopy(DEAD_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock DEAD_DOOR = REGISTER.register("dead_door", () -> new DoorBlock(MSBlockSetType.DEAD, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock DEAD_TRAPDOOR = REGISTER.register("dead_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.DEAD, ofFullCopy(Blocks.OAK_TRAPDOOR))); + + public static final DeferredBlock DEAD_SIGN = REGISTER.register("dead_sign", () -> new MSStandingSignBlock(MSWoodTypes.DEAD, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock DEAD_WALL_SIGN = REGISTER.register("dead_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.DEAD, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock DEAD_HANGING_SIGN = REGISTER.register("dead_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.DEAD, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock DEAD_WALL_HANGING_SIGN = REGISTER.register("dead_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.DEAD, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); //Petrified public static final DeferredBlock PETRIFIED_LOG = REGISTER.register("petrified_log", () -> new RotatedPillarBlock(Block.Properties.of().mapColor(logColors(MapColor.WOOD, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.STONE))); @@ -826,58 +832,62 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock STRIPPED_CINDERED_LOG = REGISTER.register("stripped_cindered_log", () -> new FlammableLogBlock(BlockBehaviour.Properties.of().mapColor(logColors(MapColor.WOOD, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); public static final DeferredBlock STRIPPED_CINDERED_WOOD = REGISTER.register("stripped_cindered_wood", () -> new FlammableLogBlock(BlockBehaviour.Properties.of().mapColor(logColors(MapColor.WOOD, MapColor.PODZOL)).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD))); public static final DeferredBlock CINDERED_PLANKS = REGISTER.register("cindered_planks", () -> new FlammableBlock(5, 20, Block.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.GUITAR).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - public static final DeferredBlock CINDERED_STAIRS = REGISTER.register("cindered_stairs", () -> new StairBlock(() -> MSBlocks.CINDERED_PLANKS.get().defaultBlockState(), copy(CINDERED_PLANKS.get()))); - public static final DeferredBlock CINDERED_SLAB = REGISTER.register("cindered_slab", () -> new SlabBlock(copy(CINDERED_PLANKS.get()))); - public static final DeferredBlock CINDERED_BUTTON = REGISTER.register("cindered_button", () -> new ButtonBlock(copy(CINDERED_PLANKS.get()), MSBlockSetType.CINDERED, 10, true)); - public static final DeferredBlock CINDERED_PRESSURE_PLATE = REGISTER.register("cindered_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(CINDERED_PLANKS.get()), MSBlockSetType.CINDERED)); - public static final DeferredBlock CINDERED_FENCE = REGISTER.register("cindered_fence", () -> new FenceBlock(copy(CINDERED_PLANKS.get()))); - public static final DeferredBlock CINDERED_FENCE_GATE = REGISTER.register("cindered_fence_gate", () -> new FenceGateBlock(copy(CINDERED_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock CINDERED_DOOR = REGISTER.register("cindered_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.CINDERED)); - public static final DeferredBlock CINDERED_TRAPDOOR = REGISTER.register("cindered_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.CINDERED)); - - public static final DeferredBlock CINDERED_SIGN = REGISTER.register("cindered_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.CINDERED)); - public static final DeferredBlock CINDERED_WALL_SIGN = REGISTER.register("cindered_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.CINDERED)); - public static final DeferredBlock CINDERED_HANGING_SIGN = REGISTER.register("cindered_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.CINDERED)); - public static final DeferredBlock CINDERED_WALL_HANGING_SIGN = REGISTER.register("cindered_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.CINDERED)); + public static final DeferredBlock CINDERED_STAIRS = REGISTER.register("cindered_stairs", () -> new StairBlock(() -> MSBlocks.CINDERED_PLANKS.get().defaultBlockState(), ofFullCopy(CINDERED_PLANKS.get()))); + public static final DeferredBlock CINDERED_SLAB = REGISTER.register("cindered_slab", () -> new SlabBlock(ofFullCopy(CINDERED_PLANKS.get()))); + public static final DeferredBlock CINDERED_BUTTON = REGISTER.register("cindered_button", () -> new ButtonBlock(MSBlockSetType.CINDERED, 10, ofFullCopy(CINDERED_PLANKS.get()))); + public static final DeferredBlock CINDERED_PRESSURE_PLATE = REGISTER.register("cindered_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.CINDERED, ofFullCopy(CINDERED_PLANKS.get()))); + public static final DeferredBlock CINDERED_FENCE = REGISTER.register("cindered_fence", () -> new FenceBlock(ofFullCopy(CINDERED_PLANKS.get()))); + public static final DeferredBlock CINDERED_FENCE_GATE = REGISTER.register("cindered_fence_gate", () -> new FenceGateBlock(ofFullCopy(CINDERED_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock CINDERED_DOOR = REGISTER.register("cindered_door", () -> new DoorBlock(MSBlockSetType.CINDERED, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock CINDERED_TRAPDOOR = REGISTER.register("cindered_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.CINDERED, ofFullCopy(Blocks.OAK_TRAPDOOR))); + + public static final DeferredBlock CINDERED_SIGN = REGISTER.register("cindered_sign", () -> new MSStandingSignBlock(MSWoodTypes.CINDERED, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock CINDERED_WALL_SIGN = REGISTER.register("cindered_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.CINDERED, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock CINDERED_HANGING_SIGN = REGISTER.register("cindered_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.CINDERED, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock CINDERED_WALL_HANGING_SIGN = REGISTER.register("cindered_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.CINDERED, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); //Shadewood public static final DeferredBlock SHADEWOOD_LOG = REGISTER.register("shadewood_log", () -> new StrippableFlammableLogBlock(Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD), () -> MSBlocks.STRIPPED_SHADEWOOD_LOG.get().defaultBlockState())); - public static final DeferredBlock SHADEWOOD = REGISTER.register("shadewood", () -> new StrippableFlammableLogBlock(copy(SHADEWOOD_LOG.get()), () -> MSBlocks.STRIPPED_SHADEWOOD.get().defaultBlockState())); + public static final DeferredBlock SHADEWOOD = REGISTER.register("shadewood", () -> new StrippableFlammableLogBlock(ofFullCopy(SHADEWOOD_LOG.get()), () -> MSBlocks.STRIPPED_SHADEWOOD.get().defaultBlockState())); public static final DeferredBlock SHADEWOOD_PLANKS = REGISTER.register("shadewood_planks", () -> new FlammableBlock(5, 20, Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - public static final DeferredBlock SHADEWOOD_STAIRS = REGISTER.register("shadewood_stairs", () -> new StairBlock(() -> MSBlocks.SHADEWOOD_PLANKS.get().defaultBlockState(), copy(SHADEWOOD_PLANKS.get()))); - public static final DeferredBlock SHADEWOOD_SLAB = REGISTER.register("shadewood_slab", () -> new SlabBlock(copy(SHADEWOOD_PLANKS.get()))); - public static final DeferredBlock SHADEWOOD_BUTTON = REGISTER.register("shadewood_button", () -> new ButtonBlock(copy(SHADEWOOD_PLANKS.get()), MSBlockSetType.SHADEWOOD, 10, true)); - public static final DeferredBlock SHADEWOOD_PRESSURE_PLATE = REGISTER.register("shadewood_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(SHADEWOOD_PLANKS.get()), MSBlockSetType.SHADEWOOD)); - public static final DeferredBlock SHADEWOOD_FENCE = REGISTER.register("shadewood_fence", () -> new FenceBlock(copy(SHADEWOOD_PLANKS.get()))); - public static final DeferredBlock SHADEWOOD_FENCE_GATE = REGISTER.register("shadewood_fence_gate", () -> new FenceGateBlock(copy(SHADEWOOD_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); - public static final DeferredBlock SHADEWOOD_DOOR = REGISTER.register("shadewood_door", () -> new DoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.SHADEWOOD)); - public static final DeferredBlock SHADEWOOD_TRAPDOOR = REGISTER.register("shadewood_trapdoor", () -> new TrapDoorBlock(copy(Blocks.OAK_TRAPDOOR), MSBlockSetType.SHADEWOOD)); + public static final DeferredBlock SHADEWOOD_STAIRS = REGISTER.register("shadewood_stairs", () -> new StairBlock(() -> MSBlocks.SHADEWOOD_PLANKS.get().defaultBlockState(), ofFullCopy(SHADEWOOD_PLANKS.get()))); + public static final DeferredBlock SHADEWOOD_SLAB = REGISTER.register("shadewood_slab", () -> new SlabBlock(ofFullCopy(SHADEWOOD_PLANKS.get()))); + public static final DeferredBlock SHADEWOOD_BUTTON = REGISTER.register("shadewood_button", () -> new ButtonBlock(MSBlockSetType.SHADEWOOD, 10, ofFullCopy(SHADEWOOD_PLANKS.get()))); + public static final DeferredBlock SHADEWOOD_PRESSURE_PLATE = REGISTER.register("shadewood_pressure_plate", () -> new PressurePlateBlock(MSBlockSetType.SHADEWOOD, ofFullCopy(SHADEWOOD_PLANKS.get()))); + public static final DeferredBlock SHADEWOOD_FENCE = REGISTER.register("shadewood_fence", () -> new FenceBlock(ofFullCopy(SHADEWOOD_PLANKS.get()))); + public static final DeferredBlock SHADEWOOD_FENCE_GATE = REGISTER.register("shadewood_fence_gate", () -> new FenceGateBlock(ofFullCopy(SHADEWOOD_PLANKS.get()), SoundEvents.FENCE_GATE_OPEN, SoundEvents.FENCE_GATE_CLOSE)); + public static final DeferredBlock SHADEWOOD_DOOR = REGISTER.register("shadewood_door", () -> new DoorBlock(MSBlockSetType.SHADEWOOD, ofFullCopy(Blocks.OAK_TRAPDOOR))); + public static final DeferredBlock SHADEWOOD_TRAPDOOR = REGISTER.register("shadewood_trapdoor", () -> new TrapDoorBlock(MSBlockSetType.SHADEWOOD, ofFullCopy(Blocks.OAK_TRAPDOOR))); - public static final DeferredBlock SHADEWOOD_SIGN = REGISTER.register("shadewood_sign", () -> new MSStandingSignBlock(Block.Properties.copy(Blocks.OAK_SIGN), MSWoodTypes.SHADEWOOD)); - public static final DeferredBlock SHADEWOOD_WALL_SIGN = REGISTER.register("shadewood_wall_sign", () -> new MSWallSignBlock(Block.Properties.copy(Blocks.OAK_WALL_SIGN), MSWoodTypes.SHADEWOOD)); - public static final DeferredBlock SHADEWOOD_HANGING_SIGN = REGISTER.register("shadewood_hanging_sign", () -> new MSHangingSignBlock(Block.Properties.copy(Blocks.OAK_HANGING_SIGN), MSWoodTypes.SHADEWOOD)); - public static final DeferredBlock SHADEWOOD_WALL_HANGING_SIGN = REGISTER.register("shadewood_wall_hanging_sign", () -> new MSWallHangingSignBlock(Block.Properties.copy(Blocks.OAK_WALL_HANGING_SIGN), MSWoodTypes.SHADEWOOD)); + public static final DeferredBlock SHADEWOOD_SIGN = REGISTER.register("shadewood_sign", () -> new MSStandingSignBlock(MSWoodTypes.SHADEWOOD, ofFullCopy(Blocks.OAK_SIGN))); + public static final DeferredBlock SHADEWOOD_WALL_SIGN = REGISTER.register("shadewood_wall_sign", () -> new MSWallSignBlock(MSWoodTypes.SHADEWOOD, ofFullCopy(Blocks.OAK_WALL_SIGN))); + public static final DeferredBlock SHADEWOOD_HANGING_SIGN = REGISTER.register("shadewood_hanging_sign", () -> new MSHangingSignBlock(MSWoodTypes.SHADEWOOD, ofFullCopy(Blocks.OAK_HANGING_SIGN))); + public static final DeferredBlock SHADEWOOD_WALL_HANGING_SIGN = REGISTER.register("shadewood_wall_hanging_sign", () -> new MSWallHangingSignBlock(MSWoodTypes.SHADEWOOD, ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN))); public static final DeferredBlock SHADEWOOD_LEAVES = REGISTER.register("shadewood_leaves", () -> new FlammableLeavesBlock(Block.Properties.of().mapColor(MapColor.PLANT).ignitedByLava().pushReaction(PushReaction.DESTROY).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(MSBlocks::leafSpawns).isSuffocating(MSBlocks::never).isViewBlocking(MSBlocks::never).isRedstoneConductor(MSBlocks::never))); public static final DeferredBlock SHROOMY_SHADEWOOD_LEAVES = REGISTER.register("shroomy_shadewood_leaves", () -> new FlammableLeavesBlock(Block.Properties.of().mapColor(MapColor.PLANT).ignitedByLava().pushReaction(PushReaction.DESTROY).strength(0.2F).randomTicks().lightLevel(state -> 11).sound(SoundType.GRASS).noOcclusion().isValidSpawn(MSBlocks::leafSpawns).isSuffocating(MSBlocks::never).isViewBlocking(MSBlocks::never).isRedstoneConductor(MSBlocks::never))); - public static final DeferredBlock SHADEWOOD_SAPLING = REGISTER.register("shadewood_sapling", () -> new SaplingBlock(new ShadewoodTree(), Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().lightLevel(state -> 8).strength(0).sound(SoundType.GRASS))); + public static final DeferredBlock SHADEWOOD_SAPLING = REGISTER.register("shadewood_sapling", () -> new SaplingBlock( + //One should be careful where to create tree growers because they're getting added to an internal data structure. + // Doing it during item registration like here should be fine. + new TreeGrower(Minestuck.id("shadewood").toString(), 0.05F, Optional.empty(), Optional.empty(), Optional.of(MSCFeatures.SHADEWOOD_TREE), Optional.of(MSCFeatures.SCARRED_SHADEWOOD_TREE), Optional.empty(), Optional.empty()), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().lightLevel(state -> 8).strength(0).sound(SoundType.GRASS))); public static final DeferredBlock SCARRED_SHADEWOOD_LOG = REGISTER.register("scarred_shadewood_log", () -> new StrippableFlammableLogBlock(Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).lightLevel(state -> 6).sound(SoundType.WOOD), () -> MSBlocks.STRIPPED_SCARRED_SHADEWOOD_LOG.get().defaultBlockState())); - public static final DeferredBlock SCARRED_SHADEWOOD = REGISTER.register("scarred_shadewood", () -> new StrippableFlammableLogBlock(copy(SCARRED_SHADEWOOD_LOG.get()), () -> MSBlocks.STRIPPED_SCARRED_SHADEWOOD.get().defaultBlockState())); + public static final DeferredBlock SCARRED_SHADEWOOD = REGISTER.register("scarred_shadewood", () -> new StrippableFlammableLogBlock(ofFullCopy(SCARRED_SHADEWOOD_LOG.get()), () -> MSBlocks.STRIPPED_SCARRED_SHADEWOOD.get().defaultBlockState())); public static final DeferredBlock ROTTED_SHADEWOOD_LOG = REGISTER.register("rotted_shadewood_log", () -> new StrippableFlammableLogBlock(Block.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.0F).lightLevel(state -> 5).sound(SoundType.WOOD), () -> MSBlocks.STRIPPED_ROTTED_SHADEWOOD_LOG.get().defaultBlockState())); - public static final DeferredBlock ROTTED_SHADEWOOD = REGISTER.register("rotted_shadewood", () -> new StrippableFlammableLogBlock(copy(ROTTED_SHADEWOOD_LOG.get()), () -> MSBlocks.STRIPPED_ROTTED_SHADEWOOD.get().defaultBlockState())); + public static final DeferredBlock ROTTED_SHADEWOOD = REGISTER.register("rotted_shadewood", () -> new StrippableFlammableLogBlock(ofFullCopy(ROTTED_SHADEWOOD_LOG.get()), () -> MSBlocks.STRIPPED_ROTTED_SHADEWOOD.get().defaultBlockState())); - public static final DeferredBlock STRIPPED_SHADEWOOD_LOG = REGISTER.register("stripped_shadewood_log", () -> new FlammableLogBlock(copy(SHADEWOOD_LOG.get()))); - public static final DeferredBlock STRIPPED_SHADEWOOD = REGISTER.register("stripped_shadewood", () -> new FlammableLogBlock(copy(SHADEWOOD_LOG.get()))); + public static final DeferredBlock STRIPPED_SHADEWOOD_LOG = REGISTER.register("stripped_shadewood_log", () -> new FlammableLogBlock(ofFullCopy(SHADEWOOD_LOG.get()))); + public static final DeferredBlock STRIPPED_SHADEWOOD = REGISTER.register("stripped_shadewood", () -> new FlammableLogBlock(ofFullCopy(SHADEWOOD_LOG.get()))); - public static final DeferredBlock STRIPPED_SCARRED_SHADEWOOD_LOG = REGISTER.register("stripped_scarred_shadewood_log", () -> new FlammableLogBlock(copy(SCARRED_SHADEWOOD_LOG.get()))); - public static final DeferredBlock STRIPPED_SCARRED_SHADEWOOD = REGISTER.register("stripped_scarred_shadewood", () -> new FlammableLogBlock(copy(SCARRED_SHADEWOOD_LOG.get()))); + public static final DeferredBlock STRIPPED_SCARRED_SHADEWOOD_LOG = REGISTER.register("stripped_scarred_shadewood_log", () -> new FlammableLogBlock(ofFullCopy(SCARRED_SHADEWOOD_LOG.get()))); + public static final DeferredBlock STRIPPED_SCARRED_SHADEWOOD = REGISTER.register("stripped_scarred_shadewood", () -> new FlammableLogBlock(ofFullCopy(SCARRED_SHADEWOOD_LOG.get()))); - public static final DeferredBlock STRIPPED_ROTTED_SHADEWOOD_LOG = REGISTER.register("stripped_rotted_shadewood_log", () -> new FlammableLogBlock(copy(ROTTED_SHADEWOOD_LOG.get()))); - public static final DeferredBlock STRIPPED_ROTTED_SHADEWOOD = REGISTER.register("stripped_rotted_shadewood", () -> new FlammableLogBlock(copy(ROTTED_SHADEWOOD_LOG.get()))); + public static final DeferredBlock STRIPPED_ROTTED_SHADEWOOD_LOG = REGISTER.register("stripped_rotted_shadewood_log", () -> new FlammableLogBlock(ofFullCopy(ROTTED_SHADEWOOD_LOG.get()))); + public static final DeferredBlock STRIPPED_ROTTED_SHADEWOOD = REGISTER.register("stripped_rotted_shadewood", () -> new FlammableLogBlock(ofFullCopy(ROTTED_SHADEWOOD_LOG.get()))); //Land Plant Blocks @@ -895,13 +905,17 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock IGNEOUS_SPIKE = REGISTER.register("igneous_spike", () -> new BurnedFoliageBlock(Block.Properties.of().mapColor(DyeColor.BROWN).instrument(NoteBlockInstrument.GUITAR).requiresCorrectToolForDrops().strength(1.5F).sound(SoundType.STONE))); public static final DeferredBlock SINGED_GRASS = REGISTER.register("singed_grass", () -> new BurnedFoliageBlock(Block.Properties.of().mapColor(DyeColor.GRAY).instrument(NoteBlockInstrument.GUITAR).pushReaction(PushReaction.DESTROY).noCollission().strength(0).sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ))); - public static final DeferredBlock SINGED_FOLIAGE = REGISTER.register("singed_foliage", () -> new BurnedFoliageBlock(copy(SINGED_GRASS.get()))); + public static final DeferredBlock SINGED_FOLIAGE = REGISTER.register("singed_foliage", () -> new BurnedFoliageBlock(ofFullCopy(SINGED_GRASS.get()))); public static final DeferredBlock SULFUR_BUBBLE = REGISTER.register("sulfur_bubble", () -> new SulfurBubbleBlock(Block.Properties.of().mapColor(DyeColor.LIME).instrument(NoteBlockInstrument.BELL).pushReaction(PushReaction.DESTROY).strength(0.5F).sound(SoundType.GLASS))); public static final DeferredBlock GLOWING_MUSHROOM_VINES = REGISTER.register("glowing_mushroom_vines", () -> new GlowingMushroomVinesBlock(Block.Properties.of().mapColor(MapColor.DIAMOND).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.GRASS).lightLevel(state -> 11).offsetType(BlockBehaviour.OffsetType.XZ))); - public static final DeferredBlock STRAWBERRY = REGISTER.register("strawberry", () -> new StrawberryBlock(Block.Properties.of().mapColor(MapColor.COLOR_RED).pushReaction(PushReaction.DESTROY).strength(1.0F).sound(SoundType.WOOD))); - public static final DeferredBlock ATTACHED_STRAWBERRY_STEM = REGISTER.register("attached_strawberry_stem", () -> new AttachedStemBlock(STRAWBERRY.get(), MSItems.STRAWBERRY_CHUNK, Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.WOOD))); - public static final DeferredBlock STRAWBERRY_STEM = REGISTER.register("strawberry_stem", () -> new StemBlock(STRAWBERRY.get(), MSItems.STRAWBERRY_CHUNK, Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.WOOD))); + public static final DeferredBlock STRAWBERRY = REGISTER.register("strawberry", () -> new StrawberryBlock(Block.Properties.of().mapColor(MapColor.COLOR_RED).pushReaction(PushReaction.DESTROY).strength(1.0F).sound(SoundType.WOOD))); + public static final DeferredBlock ATTACHED_STRAWBERRY_STEM = REGISTER.register("attached_strawberry_stem", + () -> new AttachedStemBlock(MSBlocks.STRAWBERRY_STEM.getKey(), MSBlocks.STRAWBERRY.getKey(), MSItems.STRAWBERRY_CHUNK.getKey(), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.WOOD))); + public static final DeferredBlock STRAWBERRY_STEM = REGISTER.register("strawberry_stem", + () -> new StemBlock(MSBlocks.STRAWBERRY.getKey(), MSBlocks.ATTACHED_STRAWBERRY_STEM.getKey(), MSItems.STRAWBERRY_CHUNK.getKey(), + Block.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0).sound(SoundType.WOOD))); public static final DeferredBlock END_GRASS = REGISTER.register("end_grass", () -> new EndGrassBlock(Block.Properties.of().mapColor(MapColor.COLOR_PURPLE).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(3.0F, 9.0F))); public static final DeferredBlock TALL_END_GRASS = REGISTER.register("tall_end_grass", () -> new TallEndGrassBlock(Block.Properties.of().mapColor(DyeColor.GREEN).replaceable().ignitedByLava().pushReaction(PushReaction.DESTROY).noCollission().randomTicks().strength(0.1F).sound(SoundType.NETHER_WART).offsetType(BlockBehaviour.OffsetType.XYZ))); public static final DeferredBlock GLOWFLOWER = REGISTER.register("glowflower", () -> new FlowerBlock(() -> MobEffects.GLOWING, 20, Block.Properties.of().mapColor(DyeColor.YELLOW).pushReaction(PushReaction.DESTROY).noCollission().strength(0).lightLevel(state -> 12).sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ))); @@ -947,11 +961,11 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock PUSHABLE_BLOCK = REGISTER.register("pushable_block", () -> new PushableBlock(Block.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1).sound(SoundType.GILDED_BLACKSTONE), PushableBlock.Maneuverability.PUSH_AND_PULL)); public static final DeferredBlock AND_GATE_BLOCK = REGISTER.register("and_gate_block", () -> new LogicGateBlock(Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(1).sound(SoundType.METAL), LogicGateBlock.State.AND)); - public static final DeferredBlock OR_GATE_BLOCK = REGISTER.register("or_gate_block", () -> new LogicGateBlock(copy(AND_GATE_BLOCK.get()), LogicGateBlock.State.OR)); - public static final DeferredBlock XOR_GATE_BLOCK = REGISTER.register("xor_gate_block", () -> new LogicGateBlock(copy(AND_GATE_BLOCK.get()), LogicGateBlock.State.XOR)); - public static final DeferredBlock NAND_GATE_BLOCK = REGISTER.register("nand_gate_block", () -> new LogicGateBlock(copy(AND_GATE_BLOCK.get()), LogicGateBlock.State.NAND)); - public static final DeferredBlock NOR_GATE_BLOCK = REGISTER.register("nor_gate_block", () -> new LogicGateBlock(copy(AND_GATE_BLOCK.get()), LogicGateBlock.State.NOR)); - public static final DeferredBlock XNOR_GATE_BLOCK = REGISTER.register("xnor_gate_block", () -> new LogicGateBlock(copy(AND_GATE_BLOCK.get()), LogicGateBlock.State.XNOR)); + public static final DeferredBlock OR_GATE_BLOCK = REGISTER.register("or_gate_block", () -> new LogicGateBlock(ofFullCopy(AND_GATE_BLOCK.get()), LogicGateBlock.State.OR)); + public static final DeferredBlock XOR_GATE_BLOCK = REGISTER.register("xor_gate_block", () -> new LogicGateBlock(ofFullCopy(AND_GATE_BLOCK.get()), LogicGateBlock.State.XOR)); + public static final DeferredBlock NAND_GATE_BLOCK = REGISTER.register("nand_gate_block", () -> new LogicGateBlock(ofFullCopy(AND_GATE_BLOCK.get()), LogicGateBlock.State.NAND)); + public static final DeferredBlock NOR_GATE_BLOCK = REGISTER.register("nor_gate_block", () -> new LogicGateBlock(ofFullCopy(AND_GATE_BLOCK.get()), LogicGateBlock.State.NOR)); + public static final DeferredBlock XNOR_GATE_BLOCK = REGISTER.register("xnor_gate_block", () -> new LogicGateBlock(ofFullCopy(AND_GATE_BLOCK.get()), LogicGateBlock.State.XNOR)); //Core Functional Land Blocks @@ -987,7 +1001,7 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock LUNCHTOP = REGISTER.register("lunchtop", () -> new ComputerBlock(ComputerBlock.LUNCHTOP_OPEN_SHAPE, ComputerBlock.LUNCHTOP_CLOSED_SHAPE, Block.Properties.of().mapColor(MapColor.COLOR_RED).requiresCorrectToolForDrops().strength(4.0F))); public static final DeferredBlock OLD_COMPUTER = REGISTER.register("old_computer", () -> new ComputerBlock(ComputerBlock.OLD_COMPUTER_SHAPE, ComputerBlock.OLD_COMPUTER_SHAPE, MSComputerThemes.SBURB_95, Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(4.0F))); public static final DeferredBlock TRANSPORTALIZER = REGISTER.register("transportalizer", () -> new TransportalizerBlock(Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(3).sound(SoundType.METAL))); - public static final DeferredBlock TRANS_PORTALIZER = REGISTER.register("trans_portalizer", () -> new TransportalizerBlock(copy(TRANSPORTALIZER.get()))); + public static final DeferredBlock TRANS_PORTALIZER = REGISTER.register("trans_portalizer", () -> new TransportalizerBlock(ofFullCopy(TRANSPORTALIZER.get()))); public static final DeferredBlock SENDIFICATOR = REGISTER.register("sendificator", () -> new SendificatorBlock(Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(3).sound(SoundType.METAL))); public static final DeferredBlock GRIST_WIDGET = REGISTER.register("grist_widget", () -> new GristWidgetBlock(Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(3).sound(SoundType.METAL))); public static final DeferredBlock URANIUM_COOKER = REGISTER.register("uranium_cooker", () -> new SmallMachineBlock<>(new CustomVoxelShape(new double[]{4, 0, 4, 12, 6, 12}).createRotatedShapes(), MSBlockEntityTypes.URANIUM_COOKER, Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(3.0F))); @@ -1009,35 +1023,37 @@ private static Block coalOre(BlockBehaviour.Properties properties) //Cakes - public static final DeferredBlock APPLE_CAKE = REGISTER.register("apple_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.5F, null)); - public static final DeferredBlock BLUE_CAKE = REGISTER.register("blue_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.3F, player -> player.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 150, 0)))); - public static final DeferredBlock COLD_CAKE = REGISTER.register("cold_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.3F, player -> { + public static final DeferredBlock APPLE_CAKE = REGISTER.register("apple_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.5F, null)); + public static final DeferredBlock BLUE_CAKE = REGISTER.register("blue_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.3F, player -> player.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 150, 0)))); + public static final DeferredBlock COLD_CAKE = REGISTER.register("cold_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.3F, player -> { player.addEffect(new MobEffectInstance(MobEffects.WEAKNESS, 200, 1)); player.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 200, 1)); })); - public static final DeferredBlock RED_CAKE = REGISTER.register("red_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.1F, player -> player.heal(1))); - public static final DeferredBlock HOT_CAKE = REGISTER.register("hot_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.1F, player -> player.setSecondsOnFire(4))); - public static final DeferredBlock REVERSE_CAKE = REGISTER.register("reverse_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.1F, null)); - public static final DeferredBlock FUCHSIA_CAKE = REGISTER.register("fuchsia_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 3, 0.5F, player -> { + public static final DeferredBlock RED_CAKE = REGISTER.register("red_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.1F, player -> player.heal(1))); + public static final DeferredBlock HOT_CAKE = REGISTER.register("hot_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.1F, player -> player.setSecondsOnFire(4))); + public static final DeferredBlock REVERSE_CAKE = REGISTER.register("reverse_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.1F, null)); + public static final DeferredBlock FUCHSIA_CAKE = REGISTER.register("fuchsia_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 3, 0.5F, player -> { player.addEffect(new MobEffectInstance(MobEffects.ABSORPTION, 350, 1)); player.addEffect(new MobEffectInstance(MobEffects.REGENERATION, 200, 0)); })); - public static final DeferredBlock NEGATIVE_CAKE = REGISTER.register("negative_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.3F, player -> { + public static final DeferredBlock NEGATIVE_CAKE = REGISTER.register("negative_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.3F, player -> { player.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 300, 0)); player.addEffect(new MobEffectInstance(MobEffects.INVISIBILITY, 250, 0)); })); - public static final DeferredBlock CARROT_CAKE = REGISTER.register("carrot_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.3F, player -> player.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, 200, 0)))); + public static final DeferredBlock CARROT_CAKE = REGISTER.register("carrot_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.3F, player -> player.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, 200, 0)))); public static final DeferredBlock LARGE_CAKE = REGISTER.register("large_cake", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_BROWN).strength(0.4F).sound(SoundType.WOOL))); public static final DeferredBlock PINK_FROSTED_TOP_LARGE_CAKE = REGISTER.register("pink_frosted_top_large_cake", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_BROWN).strength(0.5F).sound(SoundType.WOOL))); - public static final DeferredBlock CHOCOLATEY_CAKE = REGISTER.register("chocolatey_cake", () -> new SimpleCakeBlock(copy(Blocks.CAKE), 2, 0.5F, null)); + public static final DeferredBlock CHOCOLATEY_CAKE = REGISTER.register("chocolatey_cake", () -> new SimpleCakeBlock(ofFullCopy(Blocks.CAKE), 2, 0.5F, null)); //Explosives public static final DeferredBlock PRIMED_TNT = REGISTER.register("primed_tnt", () -> new SpecialTNTBlock(Block.Properties.of().mapColor(MapColor.FIRE).ignitedByLava().strength(0.0F).sound(SoundType.GRASS).isRedstoneConductor(MSBlocks::never), true, false, false)); public static final DeferredBlock UNSTABLE_TNT = REGISTER.register("unstable_tnt", () -> new SpecialTNTBlock(Block.Properties.of().mapColor(MapColor.FIRE).ignitedByLava().strength(0.0F).sound(SoundType.GRASS).isRedstoneConductor(MSBlocks::never).randomTicks(), false, true, false)); public static final DeferredBlock INSTANT_TNT = REGISTER.register("instant_tnt", () -> new SpecialTNTBlock(Block.Properties.of().mapColor(MapColor.FIRE).ignitedByLava().strength(0.0F).sound(SoundType.GRASS).isRedstoneConductor(MSBlocks::never), false, false, true)); - public static final DeferredBlock WOODEN_EXPLOSIVE_BUTTON = REGISTER.register("wooden_explosive_button", () -> new SpecialButtonBlock(Block.Properties.of().pushReaction(PushReaction.DESTROY).noCollission().strength(0.5F).sound(SoundType.WOOD), true, BlockSetType.OAK, 30, true)); - public static final DeferredBlock STONE_EXPLOSIVE_BUTTON = REGISTER.register("stone_explosive_button", () -> new SpecialButtonBlock(Block.Properties.of().pushReaction(PushReaction.DESTROY).noCollission().strength(0.5F).sound(SoundType.STONE), true, BlockSetType.STONE, 20, false)); + public static final DeferredBlock WOODEN_EXPLOSIVE_BUTTON = REGISTER.register("wooden_explosive_button", + () -> new SpecialButtonBlock(true, BlockSetType.OAK, 30, Block.Properties.of().pushReaction(PushReaction.DESTROY).noCollission().strength(0.5F).sound(SoundType.WOOD))); + public static final DeferredBlock STONE_EXPLOSIVE_BUTTON = REGISTER.register("stone_explosive_button", + () -> new SpecialButtonBlock(true, BlockSetType.STONE, 20, Block.Properties.of().pushReaction(PushReaction.DESTROY).noCollission().strength(0.5F).sound(SoundType.STONE))); //Misc Clutter public static final DeferredBlock BLENDER = REGISTER.register("blender", () -> new CustomShapeBlock(Block.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(0.5F).sound(SoundType.METAL), MSBlockShapes.BLENDER)); @@ -1048,7 +1064,7 @@ private static Block coalOre(BlockBehaviour.Properties properties) public static final DeferredBlock CASSETTE_PLAYER = REGISTER.register("cassette_player", () -> new CassettePlayerBlock(Block.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(0.5F).sound(SoundType.METAL), MSBlockShapes.CASSETTE_PLAYER)); public static final HorseClockMultiblock HORSE_CLOCK = new HorseClockMultiblock(REGISTER); public static final DeferredBlock GLOWYSTONE_DUST = REGISTER.register("glowystone_dust", () -> new GlowystoneWireBlock(Block.Properties.of().pushReaction(PushReaction.DESTROY).strength(0.0F).lightLevel(state -> 16).noCollission())); - public static final DeferredBlock MIRROR = REGISTER.register("mirror", () -> new CustomShapeBlock(Block.Properties.copy(Blocks.OAK_PLANKS), MSBlockShapes.MIRROR)); + public static final DeferredBlock MIRROR = REGISTER.register("mirror", () -> new CustomShapeBlock(ofFullCopy(Blocks.OAK_PLANKS), MSBlockShapes.MIRROR)); public static final DeferredBlock OIL = REGISTER.register("oil", () -> new MSLiquidBlock(MSFluids.OIL, new Vec3(0.0, 0.0, 0.0), 0.80f, false, Block.Properties.of().mapColor(MapColor.COLOR_BLACK).replaceable().pushReaction(PushReaction.DESTROY).liquid().noCollission().strength(100.0F).noLootTable().sound(SoundType.EMPTY))); public static final DeferredBlock BLOOD = REGISTER.register("blood", () -> new MSLiquidBlock(MSFluids.BLOOD, new Vec3(0.8, 0.0, 0.0), 0.35f, true, Block.Properties.of().mapColor(MapColor.COLOR_RED).replaceable().pushReaction(PushReaction.DESTROY).liquid().noCollission().strength(100.0F).noLootTable().sound(SoundType.EMPTY))); diff --git a/src/main/java/com/mraof/minestuck/block/MSDirectionalBlock.java b/src/main/java/com/mraof/minestuck/block/MSDirectionalBlock.java index f088630b60..3b1682d782 100644 --- a/src/main/java/com/mraof/minestuck/block/MSDirectionalBlock.java +++ b/src/main/java/com/mraof/minestuck/block/MSDirectionalBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block; +import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; @@ -25,6 +26,12 @@ protected MSDirectionalBlock(Properties properties) registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override public BlockState rotate(BlockState state, LevelAccessor level, BlockPos pos, Rotation direction) { diff --git a/src/main/java/com/mraof/minestuck/block/MSHangingSignBlock.java b/src/main/java/com/mraof/minestuck/block/MSHangingSignBlock.java index 92fc2ded31..f927f446d3 100644 --- a/src/main/java/com/mraof/minestuck/block/MSHangingSignBlock.java +++ b/src/main/java/com/mraof/minestuck/block/MSHangingSignBlock.java @@ -13,9 +13,9 @@ */ public class MSHangingSignBlock extends CeilingHangingSignBlock { - public MSHangingSignBlock(Properties pProperties, WoodType pType) + public MSHangingSignBlock(WoodType type, Properties properties) { - super(pProperties, pType); + super(type, properties); } @Override diff --git a/src/main/java/com/mraof/minestuck/block/MSHorizontalDirectionalBlock.java b/src/main/java/com/mraof/minestuck/block/MSHorizontalDirectionalBlock.java index 2b57e1522d..a724ed8253 100644 --- a/src/main/java/com/mraof/minestuck/block/MSHorizontalDirectionalBlock.java +++ b/src/main/java/com/mraof/minestuck/block/MSHorizontalDirectionalBlock.java @@ -1,10 +1,10 @@ package com.mraof.minestuck.block; -import net.minecraft.core.BlockPos; +import com.mojang.serialization.MapCodec; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -22,15 +22,9 @@ protected MSHorizontalDirectionalBlock(Properties properties) } @Override - public BlockState rotate(BlockState state, Rotation direction) + protected MapCodec codec() { - return state.setValue(FACING, direction.rotate(state.getValue(FACING))); - } - - @Override - public BlockState mirror(BlockState state, Mirror mirrorIn) - { - return state.rotate(mirrorIn.getRotation(state.getValue(FACING))); + return null; //todo } @Nullable diff --git a/src/main/java/com/mraof/minestuck/block/MSStandingSignBlock.java b/src/main/java/com/mraof/minestuck/block/MSStandingSignBlock.java index 0b8f16f9ca..92a73e430e 100644 --- a/src/main/java/com/mraof/minestuck/block/MSStandingSignBlock.java +++ b/src/main/java/com/mraof/minestuck/block/MSStandingSignBlock.java @@ -14,9 +14,9 @@ */ public class MSStandingSignBlock extends StandingSignBlock { - public MSStandingSignBlock(Properties properties, WoodType type) + public MSStandingSignBlock(WoodType type, Properties properties) { - super(properties, type); + super(type, properties); } @Override diff --git a/src/main/java/com/mraof/minestuck/block/MSWallHangingSignBlock.java b/src/main/java/com/mraof/minestuck/block/MSWallHangingSignBlock.java index e236b3f501..f70c1af521 100644 --- a/src/main/java/com/mraof/minestuck/block/MSWallHangingSignBlock.java +++ b/src/main/java/com/mraof/minestuck/block/MSWallHangingSignBlock.java @@ -14,9 +14,9 @@ public class MSWallHangingSignBlock extends WallHangingSignBlock { - public MSWallHangingSignBlock(Properties pProperties, WoodType pType) + public MSWallHangingSignBlock(WoodType type, Properties properties) { - super(pProperties, pType); + super(type, properties); } @Override diff --git a/src/main/java/com/mraof/minestuck/block/MSWallSignBlock.java b/src/main/java/com/mraof/minestuck/block/MSWallSignBlock.java index 4f417c2737..55d65a5688 100644 --- a/src/main/java/com/mraof/minestuck/block/MSWallSignBlock.java +++ b/src/main/java/com/mraof/minestuck/block/MSWallSignBlock.java @@ -14,9 +14,9 @@ */ public class MSWallSignBlock extends WallSignBlock { - public MSWallSignBlock(Properties properties, WoodType type) + public MSWallSignBlock(WoodType type, Properties properties) { - super(properties, type); + super(type, properties); } @Override diff --git a/src/main/java/com/mraof/minestuck/block/PushableBlock.java b/src/main/java/com/mraof/minestuck/block/PushableBlock.java index 86ae227ae2..b4a7f54cb9 100644 --- a/src/main/java/com/mraof/minestuck/block/PushableBlock.java +++ b/src/main/java/com/mraof/minestuck/block/PushableBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.util.MSTags; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -36,6 +37,12 @@ protected PushableBlock(Properties properties, Maneuverability maneuverability) this.maneuverability = maneuverability; } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) diff --git a/src/main/java/com/mraof/minestuck/block/SkaiaBlocks.java b/src/main/java/com/mraof/minestuck/block/SkaiaBlocks.java index 48f39e7154..188494367f 100644 --- a/src/main/java/com/mraof/minestuck/block/SkaiaBlocks.java +++ b/src/main/java/com/mraof/minestuck/block/SkaiaBlocks.java @@ -5,12 +5,11 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Rarity; import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.properties.BlockSetType; import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.material.PushReaction; -import static net.minecraft.world.level.block.state.BlockBehaviour.Properties.copy; +import static net.minecraft.world.level.block.state.BlockBehaviour.Properties.ofFullCopy; public final class SkaiaBlocks { @@ -25,67 +24,75 @@ public final class SkaiaBlocks public static final ItemBlockPair BLACK_CHESS_BRICKS = ItemBlockPair.register("black_chess_bricks", () -> new Block(Block.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final ItemBlockPair BLACK_CHESS_BRICK_STAIRS = ItemBlockPair.register("black_chess_brick_stairs", () -> new StairBlock(() -> BLACK_CHESS_BRICKS.asBlock().defaultBlockState(), copy(BLACK_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair BLACK_CHESS_BRICK_SLAB = ItemBlockPair.register("black_chess_brick_slab", () -> new SlabBlock(copy(BLACK_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair BLACK_CHESS_BRICK_WALL = ItemBlockPair.register("black_chess_brick_wall", () -> new WallBlock(copy(BLACK_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair BLACK_CHESS_BRICK_TRIM = ItemBlockPair.register("black_chess_brick_trim", () -> new MSDirectionalBlock(copy(BLACK_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_STAIRS = ItemBlockPair.register("black_chess_brick_stairs", () -> new StairBlock(() -> BLACK_CHESS_BRICKS.asBlock().defaultBlockState(), ofFullCopy(BLACK_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_SLAB = ItemBlockPair.register("black_chess_brick_slab", () -> new SlabBlock(ofFullCopy(BLACK_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_WALL = ItemBlockPair.register("black_chess_brick_wall", () -> new WallBlock(ofFullCopy(BLACK_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_TRIM = ItemBlockPair.register("black_chess_brick_trim", () -> new MSDirectionalBlock(ofFullCopy(BLACK_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH = ItemBlockPair.register("black_chess_brick_smooth", () -> new Block(copy(BLACK_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_STAIRS = ItemBlockPair.register("black_chess_brick_smooth_stairs", () -> new StairBlock(() -> BLACK_CHESS_BRICK_SMOOTH.asBlock().defaultBlockState(), copy(BLACK_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_SLAB = ItemBlockPair.register("black_chess_brick_smooth_slab", () -> new SlabBlock(copy(BLACK_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_WALL = ItemBlockPair.register("black_chess_brick_smooth_wall", () -> new WallBlock(copy(BLACK_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_PRESSURE_PLATE = ItemBlockPair.register("black_chess_brick_smooth_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(BLACK_CHESS_BRICK_SMOOTH.asBlock()), BlockSetType.STONE)); - public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_BUTTON = ItemBlockPair.register("black_chess_brick_smooth_button", () -> new ButtonBlock(copy(BLACK_CHESS_BRICK_SMOOTH.asBlock()), BlockSetType.STONE, 10, true)); + public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH = ItemBlockPair.register("black_chess_brick_smooth", () -> new Block(ofFullCopy(BLACK_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_STAIRS = ItemBlockPair.register("black_chess_brick_smooth_stairs", () -> new StairBlock(() -> BLACK_CHESS_BRICK_SMOOTH.asBlock().defaultBlockState(), ofFullCopy(BLACK_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_SLAB = ItemBlockPair.register("black_chess_brick_smooth_slab", () -> new SlabBlock(ofFullCopy(BLACK_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_WALL = ItemBlockPair.register("black_chess_brick_smooth_wall", () -> new WallBlock(ofFullCopy(BLACK_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_PRESSURE_PLATE = ItemBlockPair.register("black_chess_brick_smooth_pressure_plate", + () -> new PressurePlateBlock(MSBlockSetType.BLACK_CHESS, ofFullCopy(BLACK_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair BLACK_CHESS_BRICK_SMOOTH_BUTTON = ItemBlockPair.register("black_chess_brick_smooth_button", + () -> new ButtonBlock(MSBlockSetType.BLACK_CHESS, 10, ofFullCopy(BLACK_CHESS_BRICK_SMOOTH.asBlock()))); public static final ItemBlockPair WHITE_CHESS_BRICKS = ItemBlockPair.register("white_chess_bricks", () -> new Block(Block.Properties.of().mapColor(MapColor.TERRACOTTA_WHITE).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final ItemBlockPair WHITE_CHESS_BRICK_STAIRS = ItemBlockPair.register("white_chess_brick_stairs", () -> new StairBlock(() -> WHITE_CHESS_BRICKS.asBlock().defaultBlockState(), copy(WHITE_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair WHITE_CHESS_BRICK_SLAB = ItemBlockPair.register("white_chess_brick_slab", () -> new SlabBlock(copy(WHITE_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair WHITE_CHESS_BRICK_WALL = ItemBlockPair.register("white_chess_brick_wall", () -> new WallBlock(copy(WHITE_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair WHITE_CHESS_BRICK_TRIM = ItemBlockPair.register("white_chess_brick_trim", () -> new MSDirectionalBlock(copy(WHITE_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_STAIRS = ItemBlockPair.register("white_chess_brick_stairs", () -> new StairBlock(() -> WHITE_CHESS_BRICKS.asBlock().defaultBlockState(), ofFullCopy(WHITE_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_SLAB = ItemBlockPair.register("white_chess_brick_slab", () -> new SlabBlock(ofFullCopy(WHITE_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_WALL = ItemBlockPair.register("white_chess_brick_wall", () -> new WallBlock(ofFullCopy(WHITE_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_TRIM = ItemBlockPair.register("white_chess_brick_trim", () -> new MSDirectionalBlock(ofFullCopy(WHITE_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH = ItemBlockPair.register("white_chess_brick_smooth", () -> new Block(copy(WHITE_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_STAIRS = ItemBlockPair.register("white_chess_brick_smooth_stairs", () -> new StairBlock(() -> WHITE_CHESS_BRICK_SMOOTH.asBlock().defaultBlockState(), copy(WHITE_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_SLAB = ItemBlockPair.register("white_chess_brick_smooth_slab", () -> new SlabBlock(copy(WHITE_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_WALL = ItemBlockPair.register("white_chess_brick_smooth_wall", () -> new WallBlock(copy(WHITE_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_PRESSURE_PLATE = ItemBlockPair.register("white_chess_brick_smooth_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(WHITE_CHESS_BRICK_SMOOTH.asBlock()), BlockSetType.STONE)); - public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_BUTTON = ItemBlockPair.register("white_chess_brick_smooth_button", () -> new ButtonBlock(copy(WHITE_CHESS_BRICK_SMOOTH.asBlock()), BlockSetType.STONE, 10, true)); + public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH = ItemBlockPair.register("white_chess_brick_smooth", () -> new Block(ofFullCopy(WHITE_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_STAIRS = ItemBlockPair.register("white_chess_brick_smooth_stairs", () -> new StairBlock(() -> WHITE_CHESS_BRICK_SMOOTH.asBlock().defaultBlockState(), ofFullCopy(WHITE_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_SLAB = ItemBlockPair.register("white_chess_brick_smooth_slab", () -> new SlabBlock(ofFullCopy(WHITE_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_WALL = ItemBlockPair.register("white_chess_brick_smooth_wall", () -> new WallBlock(ofFullCopy(WHITE_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_PRESSURE_PLATE = ItemBlockPair.register("white_chess_brick_smooth_pressure_plate", + () -> new PressurePlateBlock(MSBlockSetType.WHITE_CHESS, ofFullCopy(WHITE_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair WHITE_CHESS_BRICK_SMOOTH_BUTTON = ItemBlockPair.register("white_chess_brick_smooth_button", + () -> new ButtonBlock(MSBlockSetType.WHITE_CHESS, 10, ofFullCopy(WHITE_CHESS_BRICK_SMOOTH.asBlock()))); public static final ItemBlockPair DARK_GRAY_CHESS_BRICKS = ItemBlockPair.register("dark_gray_chess_bricks", () -> new Block(Block.Properties.of().mapColor(MapColor.TERRACOTTA_GRAY).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_STAIRS = ItemBlockPair.register("dark_gray_chess_brick_stairs", () -> new StairBlock(() -> DARK_GRAY_CHESS_BRICKS.asBlock().defaultBlockState(), copy(DARK_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SLAB = ItemBlockPair.register("dark_gray_chess_brick_slab", () -> new SlabBlock(copy(DARK_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_WALL = ItemBlockPair.register("dark_gray_chess_brick_wall", () -> new WallBlock(copy(DARK_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_TRIM = ItemBlockPair.register("dark_gray_chess_brick_trim", () -> new MSDirectionalBlock(copy(DARK_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_STAIRS = ItemBlockPair.register("dark_gray_chess_brick_stairs", () -> new StairBlock(() -> DARK_GRAY_CHESS_BRICKS.asBlock().defaultBlockState(), ofFullCopy(DARK_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SLAB = ItemBlockPair.register("dark_gray_chess_brick_slab", () -> new SlabBlock(ofFullCopy(DARK_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_WALL = ItemBlockPair.register("dark_gray_chess_brick_wall", () -> new WallBlock(ofFullCopy(DARK_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_TRIM = ItemBlockPair.register("dark_gray_chess_brick_trim", () -> new MSDirectionalBlock(ofFullCopy(DARK_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH = ItemBlockPair.register("dark_gray_chess_brick_smooth", () -> new Block(copy(DARK_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_STAIRS = ItemBlockPair.register("dark_gray_chess_brick_smooth_stairs", () -> new StairBlock(() -> DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock().defaultBlockState(), copy(DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_SLAB = ItemBlockPair.register("dark_gray_chess_brick_smooth_slab", () -> new SlabBlock(copy(DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_WALL = ItemBlockPair.register("dark_gray_chess_brick_smooth_wall", () -> new WallBlock(copy(DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_PRESSURE_PLATE = ItemBlockPair.register("dark_gray_chess_brick_smooth_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(DARK_GRAY_CHESS_BRICKS.asBlock()), BlockSetType.STONE)); - public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_BUTTON = ItemBlockPair.register("dark_gray_chess_brick_smooth_button", () -> new ButtonBlock(copy(DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock()), BlockSetType.STONE, 10, true)); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH = ItemBlockPair.register("dark_gray_chess_brick_smooth", () -> new Block(ofFullCopy(DARK_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_STAIRS = ItemBlockPair.register("dark_gray_chess_brick_smooth_stairs", () -> new StairBlock(() -> DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock().defaultBlockState(), ofFullCopy(DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_SLAB = ItemBlockPair.register("dark_gray_chess_brick_smooth_slab", () -> new SlabBlock(ofFullCopy(DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_WALL = ItemBlockPair.register("dark_gray_chess_brick_smooth_wall", () -> new WallBlock(ofFullCopy(DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_PRESSURE_PLATE = ItemBlockPair.register("dark_gray_chess_brick_smooth_pressure_plate", + () -> new PressurePlateBlock(MSBlockSetType.DARK_GRAY_CHESS, ofFullCopy(DARK_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair DARK_GRAY_CHESS_BRICK_SMOOTH_BUTTON = ItemBlockPair.register("dark_gray_chess_brick_smooth_button", + () -> new ButtonBlock(MSBlockSetType.DARK_GRAY_CHESS, 10, ofFullCopy(DARK_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICKS = ItemBlockPair.register("light_gray_chess_bricks", () -> new Block(Block.Properties.of().mapColor(MapColor.TERRACOTTA_LIGHT_GRAY).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 6.0F))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_STAIRS = ItemBlockPair.register("light_gray_chess_brick_stairs", () -> new StairBlock(() -> LIGHT_GRAY_CHESS_BRICKS.asBlock().defaultBlockState(), copy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SLAB = ItemBlockPair.register("light_gray_chess_brick_slab", () -> new SlabBlock(copy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_WALL = ItemBlockPair.register("light_gray_chess_brick_wall", () -> new WallBlock(copy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_TRIM = ItemBlockPair.register("light_gray_chess_brick_trim", () -> new MSDirectionalBlock(copy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_STAIRS = ItemBlockPair.register("light_gray_chess_brick_stairs", () -> new StairBlock(() -> LIGHT_GRAY_CHESS_BRICKS.asBlock().defaultBlockState(), ofFullCopy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SLAB = ItemBlockPair.register("light_gray_chess_brick_slab", () -> new SlabBlock(ofFullCopy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_WALL = ItemBlockPair.register("light_gray_chess_brick_wall", () -> new WallBlock(ofFullCopy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_TRIM = ItemBlockPair.register("light_gray_chess_brick_trim", () -> new MSDirectionalBlock(ofFullCopy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH = ItemBlockPair.register("light_gray_chess_brick_smooth", () -> new Block(copy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_STAIRS = ItemBlockPair.register("light_gray_chess_brick_smooth_stairs", () -> new StairBlock(() -> LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock().defaultBlockState(), copy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_SLAB = ItemBlockPair.register("light_gray_chess_brick_smooth_slab", () -> new SlabBlock(copy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_WALL = ItemBlockPair.register("light_gray_chess_brick_smooth_wall", () -> new WallBlock(copy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_PRESSURE_PLATE = ItemBlockPair.register("light_gray_chess_brick_smooth_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, copy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()), BlockSetType.STONE)); - public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_BUTTON = ItemBlockPair.register("light_gray_chess_brick_smooth_button", () -> new ButtonBlock(copy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()), BlockSetType.STONE, 10, true)); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH = ItemBlockPair.register("light_gray_chess_brick_smooth", () -> new Block(ofFullCopy(LIGHT_GRAY_CHESS_BRICKS.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_STAIRS = ItemBlockPair.register("light_gray_chess_brick_smooth_stairs", () -> new StairBlock(() -> LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock().defaultBlockState(), ofFullCopy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_SLAB = ItemBlockPair.register("light_gray_chess_brick_smooth_slab", () -> new SlabBlock(ofFullCopy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_WALL = ItemBlockPair.register("light_gray_chess_brick_smooth_wall", () -> new WallBlock(ofFullCopy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_PRESSURE_PLATE = ItemBlockPair.register("light_gray_chess_brick_smooth_pressure_plate", + () -> new PressurePlateBlock(MSBlockSetType.LIGHT_GRAY_CHESS, ofFullCopy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); + public static final ItemBlockPair LIGHT_GRAY_CHESS_BRICK_SMOOTH_BUTTON = ItemBlockPair.register("light_gray_chess_brick_smooth_button", + () -> new ButtonBlock(MSBlockSetType.LIGHT_GRAY_CHESS, 10, ofFullCopy(LIGHT_GRAY_CHESS_BRICK_SMOOTH.asBlock()))); public static final ItemBlockPair CHECKERED_STAINED_GLASS = ItemBlockPair.register("checkered_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, Block.Properties.of().mapColor(DyeColor.BLUE).instrument(NoteBlockInstrument.HAT).strength(0.3F).sound(SoundType.GLASS).noOcclusion().isValidSpawn(MSBlocks::never).isRedstoneConductor(MSBlocks::never).isSuffocating(MSBlocks::never).isViewBlocking(MSBlocks::never))); - public static final ItemBlockPair BLACK_PAWN_STAINED_GLASS = ItemBlockPair.register("black_pawn_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, copy(CHECKERED_STAINED_GLASS.asBlock()))); - public static final ItemBlockPair BLACK_CROWN_STAINED_GLASS = ItemBlockPair.register("black_crown_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, copy(CHECKERED_STAINED_GLASS.asBlock()))); - public static final ItemBlockPair WHITE_PAWN_STAINED_GLASS = ItemBlockPair.register("white_pawn_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, copy(CHECKERED_STAINED_GLASS.asBlock()))); - public static final ItemBlockPair WHITE_CROWN_STAINED_GLASS = ItemBlockPair.register("white_crown_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, copy(CHECKERED_STAINED_GLASS.asBlock()))); + public static final ItemBlockPair BLACK_PAWN_STAINED_GLASS = ItemBlockPair.register("black_pawn_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, ofFullCopy(CHECKERED_STAINED_GLASS.asBlock()))); + public static final ItemBlockPair BLACK_CROWN_STAINED_GLASS = ItemBlockPair.register("black_crown_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, ofFullCopy(CHECKERED_STAINED_GLASS.asBlock()))); + public static final ItemBlockPair WHITE_PAWN_STAINED_GLASS = ItemBlockPair.register("white_pawn_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, ofFullCopy(CHECKERED_STAINED_GLASS.asBlock()))); + public static final ItemBlockPair WHITE_CROWN_STAINED_GLASS = ItemBlockPair.register("white_crown_stained_glass", () -> new StainedGlassBlock(DyeColor.BLUE, ofFullCopy(CHECKERED_STAINED_GLASS.asBlock()))); public static void init() { diff --git a/src/main/java/com/mraof/minestuck/block/SkaiaPortalBlock.java b/src/main/java/com/mraof/minestuck/block/SkaiaPortalBlock.java index f1de9efa3f..1d27aa8dd3 100644 --- a/src/main/java/com/mraof/minestuck/block/SkaiaPortalBlock.java +++ b/src/main/java/com/mraof/minestuck/block/SkaiaPortalBlock.java @@ -1,20 +1,28 @@ package com.mraof.minestuck.block; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.blockentity.SkaiaPortalBlockEntity; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.BaseEntityBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault public class SkaiaPortalBlock extends BaseEntityBlock { protected static final VoxelShape SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D); @@ -24,6 +32,12 @@ public SkaiaPortalBlock(Properties properties) super(properties); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Nullable @Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) @@ -50,8 +64,7 @@ public void entityInside(BlockState state, Level level, BlockPos pos, Entity ent } @Override - @SuppressWarnings("deprecation") - public ItemStack getCloneItemStack(BlockGetter level, BlockPos pos, BlockState state) + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { return ItemStack.EMPTY; } diff --git a/src/main/java/com/mraof/minestuck/block/SpecialButtonBlock.java b/src/main/java/com/mraof/minestuck/block/SpecialButtonBlock.java index e5ced96d14..d204a83a07 100644 --- a/src/main/java/com/mraof/minestuck/block/SpecialButtonBlock.java +++ b/src/main/java/com/mraof/minestuck/block/SpecialButtonBlock.java @@ -19,12 +19,20 @@ public class SpecialButtonBlock extends ButtonBlock public final boolean explosive; - public SpecialButtonBlock(Properties properties, boolean explosive, BlockSetType type, int ticksToStayPressed, boolean arrowsCanPress) + public SpecialButtonBlock(boolean explosive, BlockSetType type, int ticksToStayPressed, Properties properties) { - super(properties, type, ticksToStayPressed, arrowsCanPress); + super(type, ticksToStayPressed, properties); this.explosive = explosive; } + /* todo + @Override + public MapCodec codec() + { + return null; + } + */ + @Override public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) { diff --git a/src/main/java/com/mraof/minestuck/block/StoneTabletBlock.java b/src/main/java/com/mraof/minestuck/block/StoneTabletBlock.java index 228031edba..f7a9457117 100644 --- a/src/main/java/com/mraof/minestuck/block/StoneTabletBlock.java +++ b/src/main/java/com/mraof/minestuck/block/StoneTabletBlock.java @@ -3,6 +3,7 @@ import com.mraof.minestuck.blockentity.ItemStackBlockEntity; import com.mraof.minestuck.client.gui.MSScreenFactories; import com.mraof.minestuck.item.block.StoneTabletItem; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -10,8 +11,8 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.entity.BlockEntity; @@ -22,10 +23,14 @@ import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault public class StoneTabletBlock extends CustomShapeBlock implements EntityBlock //stone slab is the same as stone tablet, both are used in different circumstances { public static final BooleanProperty CARVED = MSProperties.CARVED; @@ -84,8 +89,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) } @Override - @SuppressWarnings("deprecation") - public ItemStack getCloneItemStack(BlockGetter level, BlockPos pos, BlockState state) + public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { if(level.getBlockEntity(pos) instanceof ItemStackBlockEntity blockEntity) { @@ -93,7 +97,7 @@ public ItemStack getCloneItemStack(BlockGetter level, BlockPos pos, BlockState s if(!tabletItemStack.isEmpty()) return tabletItemStack.copy(); } - return super.getCloneItemStack(level, pos, state); + return super.getCloneItemStack(state, target, level, pos, player); } public static void dropTablet(Level level, BlockPos pos) @@ -107,7 +111,6 @@ public static void dropTablet(Level level, BlockPos pos) } @Override - @SuppressWarnings("deprecation") public PushReaction getPistonPushReaction(BlockState state) { return PushReaction.DESTROY; diff --git a/src/main/java/com/mraof/minestuck/block/SulfurBubbleBlock.java b/src/main/java/com/mraof/minestuck/block/SulfurBubbleBlock.java index d944ab604f..8632bf52ac 100644 --- a/src/main/java/com/mraof/minestuck/block/SulfurBubbleBlock.java +++ b/src/main/java/com/mraof/minestuck/block/SulfurBubbleBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.util.MSTags; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; @@ -20,6 +21,12 @@ public SulfurBubbleBlock(BlockBehaviour.Properties properties) super(properties); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) { diff --git a/src/main/java/com/mraof/minestuck/block/machine/AnthvilBlock.java b/src/main/java/com/mraof/minestuck/block/machine/AnthvilBlock.java index b5ef878e3b..2b0d1bb08e 100644 --- a/src/main/java/com/mraof/minestuck/block/machine/AnthvilBlock.java +++ b/src/main/java/com/mraof/minestuck/block/machine/AnthvilBlock.java @@ -8,7 +8,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; @@ -20,7 +19,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.neoforged.neoforge.network.NetworkHooks; import javax.annotation.Nullable; import java.util.Map; @@ -48,12 +46,8 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player if(player instanceof ServerPlayer serverPlayer) { BlockEntity blockEntity = level.getBlockEntity(pos); - if(blockEntity instanceof AnthvilBlockEntity) - { - MenuProvider menuProvider = (MenuProvider) blockEntity; - - NetworkHooks.openScreen(serverPlayer, menuProvider); - } + if(blockEntity instanceof AnthvilBlockEntity anthvil) + serverPlayer.openMenu(anthvil); } return InteractionResult.sidedSuccess(level.isClientSide); } diff --git a/src/main/java/com/mraof/minestuck/block/machine/GristCollectorBlock.java b/src/main/java/com/mraof/minestuck/block/machine/GristCollectorBlock.java index e2b9006383..35f9b0ad89 100644 --- a/src/main/java/com/mraof/minestuck/block/machine/GristCollectorBlock.java +++ b/src/main/java/com/mraof/minestuck/block/machine/GristCollectorBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.machine; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.alchemy.GristHelper; import com.mraof.minestuck.api.alchemy.GristSet; import com.mraof.minestuck.block.BlockUtil; @@ -44,6 +45,12 @@ public GristCollectorBlock(Properties properties) registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(POWERED, false)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) diff --git a/src/main/java/com/mraof/minestuck/block/machine/HolopadBlock.java b/src/main/java/com/mraof/minestuck/block/machine/HolopadBlock.java index d353790796..41ab26b56d 100644 --- a/src/main/java/com/mraof/minestuck/block/machine/HolopadBlock.java +++ b/src/main/java/com/mraof/minestuck/block/machine/HolopadBlock.java @@ -4,6 +4,7 @@ import com.mraof.minestuck.block.MSProperties; import com.mraof.minestuck.blockentity.HolopadBlockEntity; import com.mraof.minestuck.blockentity.MSBlockEntityTypes; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -26,12 +27,16 @@ import net.minecraft.world.phys.shapes.VoxelShape; import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.Map; +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault public class HolopadBlock extends MachineBlock implements EntityBlock { public static final Map SHAPE = createRotatedShapes(2, 0, 1, 14, 6, 13); public static final Map COLLISION_SHAPE; + //todo these are unused? protected static final AABB HOLOPAD_TOP_AABB = new AABB(3/16F, 6/16F, 2.6/16F, 13/16F, 7/16F, 12.6/16F); protected static final AABB HOLOPAD_CARDSLOT_AABB = new AABB(4/16F, 0F, 13.8/16F, 12/16F, 10.1/16F, 15.94/16F); @@ -78,7 +83,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player } @Override - public void playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) + public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) { HolopadBlockEntity be = (HolopadBlockEntity) level.getBlockEntity(pos); @@ -87,7 +92,7 @@ public void playerWillDestroy(Level level, BlockPos pos, BlockState state, Playe be.dropItem(true, level, pos, be.getCard()); } - super.playerWillDestroy(level, pos, state, player); + return super.playerWillDestroy(level, pos, state, player); } @Override diff --git a/src/main/java/com/mraof/minestuck/block/machine/IntellibeamLaserstationBlock.java b/src/main/java/com/mraof/minestuck/block/machine/IntellibeamLaserstationBlock.java index e90ea370ad..5ef526ba0d 100644 --- a/src/main/java/com/mraof/minestuck/block/machine/IntellibeamLaserstationBlock.java +++ b/src/main/java/com/mraof/minestuck/block/machine/IntellibeamLaserstationBlock.java @@ -3,8 +3,8 @@ import com.mraof.minestuck.block.BlockUtil; import com.mraof.minestuck.block.MSBlockShapes; import com.mraof.minestuck.block.MSProperties; -import com.mraof.minestuck.blockentity.machine.IntellibeamLaserstationBlockEntity; import com.mraof.minestuck.blockentity.MSBlockEntityTypes; +import com.mraof.minestuck.blockentity.machine.IntellibeamLaserstationBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -65,14 +65,14 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) } @Override - public void playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) + public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) { if(!level.isClientSide && level.getBlockEntity(pos) instanceof IntellibeamLaserstationBlockEntity intellibeamEntity) { intellibeamEntity.dropCard(true, level, pos, intellibeamEntity.getAnalyzedCard()); } - super.playerWillDestroy(level, pos, state, player); + return super.playerWillDestroy(level, pos, state, player); } @Override diff --git a/src/main/java/com/mraof/minestuck/block/machine/MachineProcessBlock.java b/src/main/java/com/mraof/minestuck/block/machine/MachineProcessBlock.java index 3ca3e730fe..fe6b737920 100644 --- a/src/main/java/com/mraof/minestuck/block/machine/MachineProcessBlock.java +++ b/src/main/java/com/mraof/minestuck/block/machine/MachineProcessBlock.java @@ -9,7 +9,8 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.common.capabilities.Capabilities; +import net.neoforged.neoforge.capabilities.Capabilities; +import net.neoforged.neoforge.items.IItemHandler; import javax.annotation.Nullable; @@ -26,16 +27,15 @@ public void onRemove(BlockState state, Level level, BlockPos pos, BlockState new { if(state.getBlock() != newState.getBlock()) { - BlockEntity blockEntity = level.getBlockEntity(pos); - if(blockEntity instanceof MachineProcessBlockEntity) + @SuppressWarnings("DataFlowIssue") + IItemHandler itemHandler = level.getCapability(Capabilities.ItemHandler.BLOCK, pos, state, null, null); + + if(itemHandler != null) { - blockEntity.getCapability(Capabilities.ITEM_HANDLER).ifPresent(handler -> - { - for(int i = 0; i < handler.getSlots(); i++) - Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), handler.getStackInSlot(i)); - }); - level.updateNeighbourForOutputSignal(pos, this); + for(int i = 0; i < itemHandler.getSlots(); i++) + Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), itemHandler.getStackInSlot(i)); } + level.updateNeighbourForOutputSignal(pos, this); super.onRemove(state, level, pos, newState, isMoving); } diff --git a/src/main/java/com/mraof/minestuck/block/machine/PowerHubBlock.java b/src/main/java/com/mraof/minestuck/block/machine/PowerHubBlock.java index 1cd9fa54f6..dc2dd9116e 100644 --- a/src/main/java/com/mraof/minestuck/block/machine/PowerHubBlock.java +++ b/src/main/java/com/mraof/minestuck/block/machine/PowerHubBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.machine; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.block.BlockUtil; import com.mraof.minestuck.blockentity.MSBlockEntityTypes; import com.mraof.minestuck.blockentity.machine.PowerHubBlockEntity; @@ -33,6 +34,12 @@ public PowerHubBlock(Properties properties) registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) diff --git a/src/main/java/com/mraof/minestuck/block/machine/SmallMachineBlock.java b/src/main/java/com/mraof/minestuck/block/machine/SmallMachineBlock.java index c32b040a31..8d34ab63e6 100644 --- a/src/main/java/com/mraof/minestuck/block/machine/SmallMachineBlock.java +++ b/src/main/java/com/mraof/minestuck/block/machine/SmallMachineBlock.java @@ -20,7 +20,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.neoforged.neoforge.network.NetworkHooks; import javax.annotation.Nullable; import java.util.Map; @@ -49,7 +48,7 @@ public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, Co @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - if(!level.isClientSide) + if(player instanceof ServerPlayer serverPlayer) { BlockEntity blockEntity = level.getBlockEntity(pos); if(blockEntity != null && blockEntity.getType() == this.entityType.get()) @@ -57,7 +56,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player if(blockEntity instanceof IOwnable ownable) ownable.setOwner(IdentifierHandler.encode(player)); if(blockEntity instanceof MenuProvider menuProvider) - NetworkHooks.openScreen((ServerPlayer) player, menuProvider, pos); + serverPlayer.openMenu(menuProvider, pos); } } return InteractionResult.sidedSuccess(level.isClientSide); diff --git a/src/main/java/com/mraof/minestuck/block/plant/AspectSaplingBlock.java b/src/main/java/com/mraof/minestuck/block/plant/AspectSaplingBlock.java index 0cd2953435..78529633bd 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/AspectSaplingBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/AspectSaplingBlock.java @@ -5,12 +5,12 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SaplingBlock; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; +import net.minecraft.world.level.block.grower.TreeGrower; import net.minecraft.world.level.block.state.BlockState; public class AspectSaplingBlock extends SaplingBlock { - public AspectSaplingBlock(AbstractTreeGrower pTreeGrower, Properties pProperties) + public AspectSaplingBlock(TreeGrower pTreeGrower, Properties pProperties) { super(pTreeGrower, pProperties); } diff --git a/src/main/java/com/mraof/minestuck/block/plant/BurnedFoliageBlock.java b/src/main/java/com/mraof/minestuck/block/plant/BurnedFoliageBlock.java index 2a5bdc8ac8..f6065d7524 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/BurnedFoliageBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/BurnedFoliageBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.plant; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.util.MSTags; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; @@ -21,6 +22,12 @@ public BurnedFoliageBlock(BlockBehaviour.Properties properties) super(properties); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) { diff --git a/src/main/java/com/mraof/minestuck/block/plant/DesertFloraBlock.java b/src/main/java/com/mraof/minestuck/block/plant/DesertFloraBlock.java index 0241e6f74e..d2486ff7ec 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/DesertFloraBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/DesertFloraBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.plant; +import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; import net.minecraft.world.level.BlockGetter; @@ -19,6 +20,12 @@ public DesertFloraBlock(Properties properties) super(properties); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) { diff --git a/src/main/java/com/mraof/minestuck/block/plant/EndSaplingBlock.java b/src/main/java/com/mraof/minestuck/block/plant/EndSaplingBlock.java index ae64d380b4..5b22d06860 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/EndSaplingBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/EndSaplingBlock.java @@ -1,8 +1,10 @@ package com.mraof.minestuck.block.plant; +import com.mojang.serialization.MapCodec; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.block.MSProperties; import com.mraof.minestuck.util.MSTags; -import com.mraof.minestuck.world.gen.feature.tree.EndTree; +import com.mraof.minestuck.world.gen.feature.MSCFeatures; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -13,7 +15,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.BonemealableBlock; import net.minecraft.world.level.block.BushBlock; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; +import net.minecraft.world.level.block.grower.TreeGrower; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; @@ -21,6 +23,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.Optional; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @@ -30,7 +33,7 @@ public class EndSaplingBlock extends BushBlock implements BonemealableBlock public static final BooleanProperty OMEGA = MSProperties.OMEGA; protected static final VoxelShape SHAPE = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 12.0D, 14.0D); - private final AbstractTreeGrower tree = new EndTree(); + private final TreeGrower tree = new TreeGrower(Minestuck.id("end").toString(), Optional.empty(), Optional.of(MSCFeatures.END_TREE), Optional.empty()); public EndSaplingBlock(Properties properties) { @@ -38,6 +41,12 @@ public EndSaplingBlock(Properties properties) this.registerDefaultState(this.stateDefinition.any().setValue(ALPHA, false).setValue(OMEGA, false)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) diff --git a/src/main/java/com/mraof/minestuck/block/plant/FrostSaplingBlock.java b/src/main/java/com/mraof/minestuck/block/plant/FrostSaplingBlock.java index c92e12ba2f..3e3a1aa0c9 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/FrostSaplingBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/FrostSaplingBlock.java @@ -1,21 +1,23 @@ package com.mraof.minestuck.block.plant; -import com.mraof.minestuck.world.gen.feature.tree.FrostTree; -import com.mraof.minestuck.world.gen.feature.tree.RainbowTree; +import com.mraof.minestuck.Minestuck; +import com.mraof.minestuck.world.gen.feature.MSCFeatures; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.SaplingBlock; +import net.minecraft.world.level.block.grower.TreeGrower; import net.minecraft.world.level.block.state.BlockState; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.Optional; @ParametersAreNonnullByDefault public class FrostSaplingBlock extends SaplingBlock { public FrostSaplingBlock(Properties pProperties) { - super(new FrostTree(), pProperties); + super(new TreeGrower(Minestuck.id("frost").toString(), Optional.empty(), Optional.of(MSCFeatures.FROST_TREE), Optional.empty()), pProperties); } @Override diff --git a/src/main/java/com/mraof/minestuck/block/plant/GlowingMushroomBlock.java b/src/main/java/com/mraof/minestuck/block/plant/GlowingMushroomBlock.java index a9084c4f70..5b9b74d55b 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/GlowingMushroomBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/GlowingMushroomBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.plant; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.block.MSBlocks; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -23,6 +24,12 @@ public GlowingMushroomBlock(Properties properties) super(properties); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) { diff --git a/src/main/java/com/mraof/minestuck/block/plant/PetrifiedFloraBlock.java b/src/main/java/com/mraof/minestuck/block/plant/PetrifiedFloraBlock.java index e0e785a54d..0577411f03 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/PetrifiedFloraBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/PetrifiedFloraBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.plant; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.util.MSTags; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; @@ -22,6 +23,12 @@ public PetrifiedFloraBlock(Properties properties, VoxelShape shape) this.shape = shape; } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) { diff --git a/src/main/java/com/mraof/minestuck/block/plant/RainbowSaplingBlock.java b/src/main/java/com/mraof/minestuck/block/plant/RainbowSaplingBlock.java index 43ce305b04..9454f999ca 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/RainbowSaplingBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/RainbowSaplingBlock.java @@ -1,20 +1,23 @@ package com.mraof.minestuck.block.plant; -import com.mraof.minestuck.world.gen.feature.tree.RainbowTree; +import com.mraof.minestuck.Minestuck; +import com.mraof.minestuck.world.gen.feature.MSCFeatures; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.SaplingBlock; +import net.minecraft.world.level.block.grower.TreeGrower; import net.minecraft.world.level.block.state.BlockState; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.Optional; @ParametersAreNonnullByDefault public class RainbowSaplingBlock extends SaplingBlock { public RainbowSaplingBlock(Properties pProperties) { - super(new RainbowTree(), pProperties); + super(new TreeGrower(Minestuck.id("rainbow").toString(), Optional.empty(), Optional.of(MSCFeatures.RAINBOW_TREE), Optional.empty()), pProperties); } @Override diff --git a/src/main/java/com/mraof/minestuck/block/plant/StrawberryBlock.java b/src/main/java/com/mraof/minestuck/block/plant/StrawberryBlock.java index 2b243cd588..0cf3307d3d 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/StrawberryBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/StrawberryBlock.java @@ -1,12 +1,8 @@ package com.mraof.minestuck.block.plant; -import com.mraof.minestuck.block.MSBlocks; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.block.AttachedStemBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.StemBlock; -import net.minecraft.world.level.block.StemGrownBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -14,7 +10,7 @@ import javax.annotation.Nullable; -public class StrawberryBlock extends StemGrownBlock +public class StrawberryBlock extends Block { public static final DirectionProperty FACING = BlockStateProperties.FACING; @@ -39,16 +35,4 @@ public BlockState getStateForPlacement(BlockPlaceContext context) Direction direction = context.getNearestLookingDirection(); return this.defaultBlockState().setValue(FACING, direction); } - - @Override - public StemBlock getStem() - { - return MSBlocks.STRAWBERRY_STEM.get(); - } - - @Override - public AttachedStemBlock getAttachedStem() - { - return MSBlocks.ATTACHED_STRAWBERRY_STEM.get(); - } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/block/plant/TallEndGrassBlock.java b/src/main/java/com/mraof/minestuck/block/plant/TallEndGrassBlock.java index 86fcee3b11..9849029c1d 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/TallEndGrassBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/TallEndGrassBlock.java @@ -2,6 +2,7 @@ import com.mraof.minestuck.block.MSBlocks; import com.mraof.minestuck.entity.FrogEntity; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; @@ -17,8 +18,11 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault public class TallEndGrassBlock extends DoublePlantBlock { public TallEndGrassBlock(Properties properties) @@ -50,13 +54,14 @@ public void randomTick(BlockState state, ServerLevel level, BlockPos pos, Random } @Override - public void playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) + public BlockState playerWillDestroy(Level level, BlockPos pos, BlockState state, Player player) { - super.playerWillDestroy(level, pos, state, player); + state = super.playerWillDestroy(level, pos, state, player); if(!level.isClientSide && !player.isCreative()) { randomTeleport(level, player); } + return state; } @Override diff --git a/src/main/java/com/mraof/minestuck/block/plant/WoodenFloraBlock.java b/src/main/java/com/mraof/minestuck/block/plant/WoodenFloraBlock.java index 126e1b4129..3e1c549cbc 100644 --- a/src/main/java/com/mraof/minestuck/block/plant/WoodenFloraBlock.java +++ b/src/main/java/com/mraof/minestuck/block/plant/WoodenFloraBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.plant; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.util.MSTags; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; @@ -23,6 +24,12 @@ public WoodenFloraBlock(Properties properties, VoxelShape shape) this.shape = shape; } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) { diff --git a/src/main/java/com/mraof/minestuck/block/redstone/AreaEffectBlock.java b/src/main/java/com/mraof/minestuck/block/redstone/AreaEffectBlock.java index be108b5ac8..84eaef9ba8 100644 --- a/src/main/java/com/mraof/minestuck/block/redstone/AreaEffectBlock.java +++ b/src/main/java/com/mraof/minestuck/block/redstone/AreaEffectBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.redstone; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.block.BlockUtil; import com.mraof.minestuck.block.MSProperties; import com.mraof.minestuck.blockentity.MSBlockEntityTypes; @@ -54,6 +55,12 @@ public AreaEffectBlock(Properties properties) this.registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(POWERED, false).setValue(ALL_MOBS, false).setValue(SHUT_DOWN, false)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Nullable @Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) diff --git a/src/main/java/com/mraof/minestuck/block/redstone/LogicGateBlock.java b/src/main/java/com/mraof/minestuck/block/redstone/LogicGateBlock.java index 33f6968faa..bb93d8c459 100644 --- a/src/main/java/com/mraof/minestuck/block/redstone/LogicGateBlock.java +++ b/src/main/java/com/mraof/minestuck/block/redstone/LogicGateBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.redstone; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.block.BlockUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -34,6 +35,12 @@ public LogicGateBlock(Properties properties, LogicGateBlock.State gateState) this.registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(POWERED, false)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override protected boolean shouldTurnOn(Level level, BlockPos pos, BlockState state) { diff --git a/src/main/java/com/mraof/minestuck/block/redstone/StructureCoreBlock.java b/src/main/java/com/mraof/minestuck/block/redstone/StructureCoreBlock.java index 8cbc592e33..6a664bc9c4 100644 --- a/src/main/java/com/mraof/minestuck/block/redstone/StructureCoreBlock.java +++ b/src/main/java/com/mraof/minestuck/block/redstone/StructureCoreBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.redstone; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.block.BlockUtil; import com.mraof.minestuck.block.MSProperties; import com.mraof.minestuck.blockentity.MSBlockEntityTypes; @@ -46,6 +47,12 @@ public StructureCoreBlock(Properties properties) registerDefaultState(stateDefinition.any().setValue(POWERED, false).setValue(ACTIVE, false)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Override @SuppressWarnings("deprecation") public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) diff --git a/src/main/java/com/mraof/minestuck/block/redstone/WirelessRedstoneReceiverBlock.java b/src/main/java/com/mraof/minestuck/block/redstone/WirelessRedstoneReceiverBlock.java index 34122150f3..7a17284bd1 100644 --- a/src/main/java/com/mraof/minestuck/block/redstone/WirelessRedstoneReceiverBlock.java +++ b/src/main/java/com/mraof/minestuck/block/redstone/WirelessRedstoneReceiverBlock.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.block.redstone; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.block.BlockUtil; import com.mraof.minestuck.block.MSProperties; import com.mraof.minestuck.blockentity.MSBlockEntityTypes; @@ -51,6 +52,12 @@ public WirelessRedstoneReceiverBlock(Properties properties) registerDefaultState(stateDefinition.any().setValue(POWER, 0).setValue(POWERED, false).setValue(AUTO_RESET, true).setValue(FACING, Direction.NORTH)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Nullable @Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) diff --git a/src/main/java/com/mraof/minestuck/block/redstone/WirelessRedstoneTransmitterBlock.java b/src/main/java/com/mraof/minestuck/block/redstone/WirelessRedstoneTransmitterBlock.java index 2a1d3ddb85..a6c64d00f8 100644 --- a/src/main/java/com/mraof/minestuck/block/redstone/WirelessRedstoneTransmitterBlock.java +++ b/src/main/java/com/mraof/minestuck/block/redstone/WirelessRedstoneTransmitterBlock.java @@ -1,10 +1,11 @@ package com.mraof.minestuck.block.redstone; +import com.mojang.serialization.MapCodec; import com.mraof.minestuck.block.BlockUtil; +import com.mraof.minestuck.blockentity.MSBlockEntityTypes; import com.mraof.minestuck.blockentity.redstone.WirelessRedstoneTransmitterBlockEntity; import com.mraof.minestuck.client.gui.MSScreenFactories; import com.mraof.minestuck.effects.CreativeShockEffect; -import com.mraof.minestuck.blockentity.MSBlockEntityTypes; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.DustParticleOptions; @@ -44,6 +45,12 @@ public WirelessRedstoneTransmitterBlock(Properties properties) registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(POWER, 0).setValue(POWERED, false)); } + @Override + protected MapCodec codec() + { + return null; //todo + } + @Nullable @Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) diff --git a/src/main/java/com/mraof/minestuck/blockentity/ReturnNodeBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/ReturnNodeBlockEntity.java index 861e7ece9d..f2324f0107 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/ReturnNodeBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/ReturnNodeBlockEntity.java @@ -49,7 +49,7 @@ protected void teleport(ServerPlayer player) player.setPortalCooldown(); player.setDeltaMovement(Vec3.ZERO); player.fallDistance = 0; - MSCriteriaTriggers.RETURN_NODE.trigger(player); + MSCriteriaTriggers.RETURN_NODE.get().trigger(player); } } diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/AnthvilBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/AnthvilBlockEntity.java index 4b060afe33..2e72805c1c 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/AnthvilBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/AnthvilBlockEntity.java @@ -21,14 +21,10 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.util.LazyOptional; import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.ItemStackHandler; import net.neoforged.neoforge.items.wrapper.RangedWrapper; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Comparator; @@ -190,23 +186,18 @@ public boolean atMaxFuel() return fuel >= MAX_FUEL; } - private final LazyOptional inputHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 0, 1)); //regenerating item slot - private final LazyOptional fuelHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 1, 2)); //uranium fuel slot - - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) + @Nullable + public IItemHandler getItemHandler(@Nullable Direction side) { - if(cap == Capabilities.ITEM_HANDLER && side != null) - { - if(side == Direction.UP) - return inputHandler.cast(); - else if(side == Direction.DOWN) - return LazyOptional.empty(); - else - return fuelHandler.cast(); //will fill the anthvil with fuel if fed from the sides - } - return super.getCapability(cap, side); + if(side == null) + return this.itemHandler; + + if(side == Direction.UP) + return new RangedWrapper(itemHandler, 0, 1); + if(side == Direction.DOWN) + return null; + + return new RangedWrapper(itemHandler, 1, 2); } @Nullable diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/GristWidgetBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/GristWidgetBlockEntity.java index 388443e442..cb44bcadc3 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/GristWidgetBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/GristWidgetBlockEntity.java @@ -14,6 +14,7 @@ import com.mraof.minestuck.player.PlayerSavedData; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.world.MenuProvider; @@ -25,6 +26,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.ItemStackHandler; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -71,7 +73,7 @@ private void checkAndUpdateState() if(newState != this.getBlockState()) this.level.setBlock(this.getBlockPos(), newState, Block.UPDATE_CLIENTS); - + } private boolean isItemValid(int slot, ItemStack stack) @@ -112,7 +114,7 @@ public int getGristWidgetBoondollarValue() public static int getGristWidgetBoondollarValue(GristSet set) { - return set == null ? 0 : Math.max(1, (int) Math.pow(set.getValue(), 1/1.5)); + return set == null ? 0 : Math.max(1, (int) Math.pow(set.getValue(), 1 / 1.5)); } @Override @@ -190,4 +192,9 @@ public PlayerIdentifier getOwner() { return owner; } -} \ No newline at end of file + + public IItemHandler getItemHandler(@Nullable Direction ignored) + { + return this.itemHandler; + } +} diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/IntellibeamLaserstationBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/IntellibeamLaserstationBlockEntity.java index 8b72a9142b..427512d8c1 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/IntellibeamLaserstationBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/IntellibeamLaserstationBlockEntity.java @@ -88,7 +88,7 @@ public void onRightClick(Player player) waitTimer = 10; } else if(getCardItemExperience() >= EXP_LEVEL_CAPACITY) { - MSCriteriaTriggers.INTELLIBEAM_LASERSTATION.trigger((ServerPlayer) player, AlchemyHelper.getDecodedItem(analyzedCard)); + MSCriteriaTriggers.INTELLIBEAM_LASERSTATION.get().trigger((ServerPlayer) player, AlchemyHelper.getDecodedItem(analyzedCard)); applyReadableNBT(analyzedCard); takeCard(player); diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/MachineProcessBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/MachineProcessBlockEntity.java index 0ce3f3a55f..350730ca61 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/MachineProcessBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/MachineProcessBlockEntity.java @@ -1,27 +1,20 @@ package com.mraof.minestuck.blockentity.machine; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.util.LazyOptional; -import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.ItemStackHandler; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.function.BiPredicate; public abstract class MachineProcessBlockEntity extends BlockEntity { protected final ItemStackHandler itemHandler = createItemHandler(); - private final LazyOptional itemOptional = LazyOptional.of(() -> itemHandler); public static final int FUEL_INCREASE = 32; //how many units of fuel a chunk of uranium adds to a machine powered by it, used by Sendificator and UraniumCooker @@ -48,15 +41,6 @@ protected void saveAdditional(CompoundTag compound) compound.put("inventory", itemHandler.serializeNBT()); } - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) - { - if(cap == Capabilities.ITEM_HANDLER) - return itemOptional.cast(); - return super.getCapability(cap, side); - } - public static void serverTick(Level ignoredLevel, BlockPos ignoredPos, BlockState ignoredState, MachineProcessBlockEntity blockEntity) { blockEntity.tick(); diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/MiniAlchemiterBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/MiniAlchemiterBlockEntity.java index e6dbe5dde2..13709eae87 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/MiniAlchemiterBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/MiniAlchemiterBlockEntity.java @@ -27,14 +27,10 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.util.LazyOptional; import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.ItemStackHandler; import net.neoforged.neoforge.items.wrapper.RangedWrapper; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Objects; @@ -174,18 +170,14 @@ public Component getDisplayName() return Component.translatable(TITLE); } - private final LazyOptional sideHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, INPUT, INPUT + 1)); - private final LazyOptional downHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, OUTPUT, OUTPUT + 1)); - - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) + public IItemHandler getItemHandler(@Nullable Direction side) { - if(cap == Capabilities.ITEM_HANDLER && side != null) - { - return side == Direction.DOWN ? downHandler.cast() : sideHandler.cast(); - } - return super.getCapability(cap, side); + if(side == null) + return this.itemHandler; + + if(side == Direction.DOWN) + return new RangedWrapper(this.itemHandler, OUTPUT, OUTPUT + 1); + return new RangedWrapper(this.itemHandler, INPUT, INPUT + 1); } public int comparatorValue() diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/MiniCruxtruderBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/MiniCruxtruderBlockEntity.java index 2d1142a5b0..e90754902b 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/MiniCruxtruderBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/MiniCruxtruderBlockEntity.java @@ -16,14 +16,10 @@ import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.util.LazyOptional; import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.ItemStackHandler; import net.neoforged.neoforge.items.wrapper.RangedWrapper; -import javax.annotation.Nonnull; import javax.annotation.Nullable; public class MiniCruxtruderBlockEntity extends MachineProcessBlockEntity implements MenuProvider @@ -89,18 +85,14 @@ public Component getDisplayName() return Component.translatable(TITLE); } - private final LazyOptional sideHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 0, 1)); - private final LazyOptional downHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 1, 2)); - - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) + public IItemHandler getItemHandler(@Nullable Direction side) { - if(cap == Capabilities.ITEM_HANDLER && side != null) - { - return side == Direction.DOWN ? downHandler.cast() : sideHandler.cast(); - } - return super.getCapability(cap, side); + if(side == null) + return this.itemHandler; + + if(side == Direction.DOWN) + return new RangedWrapper(this.itemHandler, 1, 2); + return new RangedWrapper(this.itemHandler, 0, 1); } @Nullable diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/MiniPunchDesignixBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/MiniPunchDesignixBlockEntity.java index 4b2f73069e..fda80db463 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/MiniPunchDesignixBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/MiniPunchDesignixBlockEntity.java @@ -18,9 +18,6 @@ import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.util.LazyOptional; import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.IItemHandlerModifiable; import net.neoforged.neoforge.items.ItemStackHandler; @@ -134,10 +131,6 @@ public Component getDisplayName() return Component.translatable(TITLE); } - private final LazyOptional sideHandler = LazyOptional.of(this::createInputSlotHandler); - private final LazyOptional upHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 1, 2)); - private final LazyOptional downHandler = LazyOptional.of(() -> new CombinedInvWrapper(createInputSlotHandler(), new RangedWrapper(itemHandler, 2, 3))); - private IItemHandlerModifiable createInputSlotHandler() { return new RangedWrapper(itemHandler, 0, 1) @@ -153,16 +146,16 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) }; } - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) + public IItemHandler getItemHandler(@Nullable Direction side) { - if(cap == Capabilities.ITEM_HANDLER && side != null) - { - return side == Direction.DOWN ? downHandler.cast() : - side == Direction.UP ? upHandler.cast() : sideHandler.cast(); - } - return super.getCapability(cap, side); + if(side == null) + return this.itemHandler; + + if(side == Direction.DOWN) + return new CombinedInvWrapper(this.createInputSlotHandler(), new RangedWrapper(this.itemHandler, 2, 3)); + if(side == Direction.UP) + return new RangedWrapper(this.itemHandler, 1, 2); + return this.createInputSlotHandler(); } @Nullable diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/MiniTotemLatheBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/MiniTotemLatheBlockEntity.java index ddd7598e41..0f6e5e8bfd 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/MiniTotemLatheBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/MiniTotemLatheBlockEntity.java @@ -20,9 +20,6 @@ import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.util.LazyOptional; import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.IItemHandlerModifiable; import net.neoforged.neoforge.items.ItemStackHandler; @@ -141,10 +138,6 @@ public Component getDisplayName() return Component.translatable(TITLE); } - private final LazyOptional upHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 2, 3)); - private final LazyOptional downHandler = LazyOptional.of(() -> new CombinedInvWrapper(createSlotInputsHandler(), new RangedWrapper(itemHandler, 3, 4))); - private final LazyOptional sideHandler = LazyOptional.of(this::createSlotInputsHandler); - private IItemHandlerModifiable createSlotInputsHandler() { return new RangedWrapper(itemHandler, 0, 2) @@ -160,16 +153,16 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) }; } - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) + public IItemHandler getItemHandler(@Nullable Direction side) { - if(cap == Capabilities.ITEM_HANDLER && side != null) - { - return side == Direction.DOWN ? downHandler.cast() : - side == Direction.UP ? upHandler.cast() : sideHandler.cast(); - } - return super.getCapability(cap, side); + if(side == null) + return this.itemHandler; + + if(side == Direction.DOWN) + return new CombinedInvWrapper(this.createSlotInputsHandler(), new RangedWrapper(this.itemHandler, 3, 4)); + if(side == Direction.UP) + return new RangedWrapper(this.itemHandler, 2, 3); + return this.createSlotInputsHandler(); } @Nullable diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/PunchDesignixBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/PunchDesignixBlockEntity.java index 0372b3887d..7107c9a46f 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/PunchDesignixBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/PunchDesignixBlockEntity.java @@ -1,7 +1,9 @@ package com.mraof.minestuck.blockentity.machine; import com.mraof.minestuck.advancements.MSCriteriaTriggers; +import com.mraof.minestuck.alchemy.AlchemyHelper; import com.mraof.minestuck.alchemy.CardCaptchas; +import com.mraof.minestuck.api.alchemy.recipe.combination.CombinationMode; import com.mraof.minestuck.api.alchemy.recipe.combination.CombinationRecipe; import com.mraof.minestuck.api.alchemy.recipe.combination.CombinerContainer; import com.mraof.minestuck.block.MSBlocks; @@ -9,8 +11,6 @@ import com.mraof.minestuck.blockentity.MSBlockEntityTypes; import com.mraof.minestuck.client.gui.MSScreenFactories; import com.mraof.minestuck.item.MSItems; -import com.mraof.minestuck.alchemy.AlchemyHelper; -import com.mraof.minestuck.api.alchemy.recipe.combination.CombinationMode; import com.mraof.minestuck.util.WorldEventUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -182,7 +182,7 @@ public void punchCard(ServerPlayer player) if(!output.isEmpty()) { - MSCriteriaTriggers.PUNCH_DESIGNIX.trigger(player, captchaItemStack, storedStackInCard, output); + MSCriteriaTriggers.PUNCH_DESIGNIX.get().trigger(player, captchaItemStack, storedStackInCard, output); setCard(AlchemyHelper.createPunchedCard(output)); effects(true); } diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/SendificatorBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/SendificatorBlockEntity.java index 93f107d5d1..645a5b62d7 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/SendificatorBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/SendificatorBlockEntity.java @@ -18,15 +18,10 @@ import net.minecraft.world.inventory.DataSlot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.util.LazyOptional; import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.ItemStackHandler; import net.neoforged.neoforge.items.wrapper.RangedWrapper; -import net.neoforged.neoforge.network.NetworkHooks; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Optional; @@ -205,28 +200,22 @@ public void addFuel(short fuelAmount) fuel += fuelAmount; } - private final LazyOptional inputHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 0, 1)); //sendificated item slot - private final LazyOptional fuelHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 1, 2)); //uranium fuel slot - - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) + @Nullable + public IItemHandler getItemHandler(@Nullable Direction side) { - if(cap == Capabilities.ITEM_HANDLER && side != null) - { - if(side == Direction.UP) - return inputHandler.cast(); - else if(side == Direction.DOWN) - return LazyOptional.empty(); - else - return fuelHandler.cast(); //will fill the sendificator with fuel if fed from the sides - } - return super.getCapability(cap, side); + if(side == null) + return this.itemHandler; + + if(side == Direction.UP) + return new RangedWrapper(this.itemHandler, 0, 1); + if(side == Direction.DOWN) + return null; + return new RangedWrapper(this.itemHandler, 1, 2); } public void openMenu(ServerPlayer player) { - NetworkHooks.openScreen(player, this, SendificatorMenu.makeExtraDataWriter(this.worldPosition, this.destBlockPos)); + player.openMenu(this, SendificatorMenu.makeExtraDataWriter(this.worldPosition, this.destBlockPos)); } @Nullable diff --git a/src/main/java/com/mraof/minestuck/blockentity/machine/UraniumCookerBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/machine/UraniumCookerBlockEntity.java index 8331e2c56e..d57aaa7cfb 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/machine/UraniumCookerBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/machine/UraniumCookerBlockEntity.java @@ -20,14 +20,11 @@ import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.util.LazyOptional; import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.ItemStackHandler; import net.neoforged.neoforge.items.wrapper.RangedWrapper; import net.neoforged.neoforge.items.wrapper.RecipeWrapper; -import javax.annotation.Nonnull; + import javax.annotation.Nullable; import java.util.Comparator; import java.util.Optional; @@ -158,20 +155,16 @@ private boolean canIrradiate() return false; } - private final LazyOptional upHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 0, 1)); - private final LazyOptional downHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 2, 3)); - private final LazyOptional sideHandler = LazyOptional.of(() -> new RangedWrapper(itemHandler, 1, 2)); - - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) + public IItemHandler getItemHandler(@Nullable Direction side) { - if(cap == Capabilities.ITEM_HANDLER && side != null) - { - return side == Direction.DOWN ? downHandler.cast() : - side == Direction.UP ? upHandler.cast() : sideHandler.cast(); - } - return super.getCapability(cap, side); + if(side == null) + return this.itemHandler; + + if(side == Direction.DOWN) + return new RangedWrapper(itemHandler, 2, 3); + if(side == Direction.UP) + return new RangedWrapper(itemHandler, 0, 1); + return new RangedWrapper(itemHandler, 1, 2); } @Nullable diff --git a/src/main/java/com/mraof/minestuck/blockentity/redstone/AreaEffectBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/redstone/AreaEffectBlockEntity.java index 042a89a9dc..c3cf0b79d8 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/redstone/AreaEffectBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/redstone/AreaEffectBlockEntity.java @@ -68,13 +68,15 @@ public void giveEntitiesEffect() if(getBlockState().getValue(AreaEffectBlock.ALL_MOBS)) { - for(LivingEntity livingEntity : level.getEntitiesOfClass(LivingEntity.class, new AABB(minAreaPos, maxAreaPos))) + for(LivingEntity livingEntity : level.getEntitiesOfClass(LivingEntity.class, + AABB.encapsulatingFullBlocks(minAreaPos, maxAreaPos))) { iterateThroughEntities(livingEntity); } } else { - for(Player playerEntity : level.getEntitiesOfClass(Player.class, new AABB(minAreaPos, maxAreaPos))) + for(Player playerEntity : level.getEntitiesOfClass(Player.class, + AABB.encapsulatingFullBlocks(minAreaPos, maxAreaPos))) { iterateThroughEntities(playerEntity); } diff --git a/src/main/java/com/mraof/minestuck/blockentity/redstone/StatStorerBlockEntity.java b/src/main/java/com/mraof/minestuck/blockentity/redstone/StatStorerBlockEntity.java index fa229bcd05..ad59b62da2 100644 --- a/src/main/java/com/mraof/minestuck/blockentity/redstone/StatStorerBlockEntity.java +++ b/src/main/java/com/mraof/minestuck/blockentity/redstone/StatStorerBlockEntity.java @@ -327,7 +327,7 @@ public static void onEntityBred(BabyEntitySpawnEvent event) @SubscribeEvent public static void onExplosion(ExplosionEvent.Detonate event) { - attemptStatUpdate(1, StatStorerBlockEntity.ActiveType.EXPLOSIONS, BlockPos.containing(event.getExplosion().getPosition()), event.getLevel()); + attemptStatUpdate(1, StatStorerBlockEntity.ActiveType.EXPLOSIONS, BlockPos.containing(event.getExplosion().center()), event.getLevel()); } @SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = false) diff --git a/src/main/java/com/mraof/minestuck/client/gui/AlchemiterScreen.java b/src/main/java/com/mraof/minestuck/client/gui/AlchemiterScreen.java index 06bb09a93a..35f8a2f979 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/AlchemiterScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/AlchemiterScreen.java @@ -7,7 +7,6 @@ import com.mraof.minestuck.client.util.GuiUtil; import com.mraof.minestuck.item.MSItems; import com.mraof.minestuck.network.AlchemiterPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; @@ -15,6 +14,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; @@ -108,7 +108,7 @@ public boolean isPauseScreen() private void alchemize() { AlchemiterPacket packet = new AlchemiterPacket(alchemiter.getBlockPos(), itemQuantity); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); this.minecraft.setScreen(null); } diff --git a/src/main/java/com/mraof/minestuck/client/gui/AnthvilScreen.java b/src/main/java/com/mraof/minestuck/client/gui/AnthvilScreen.java index 5ba8763fa3..7441c6c1a0 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/AnthvilScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/AnthvilScreen.java @@ -9,7 +9,6 @@ import com.mraof.minestuck.client.util.GuiUtil; import com.mraof.minestuck.inventory.AnthvilMenu; import com.mraof.minestuck.network.AnthvilPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; @@ -17,6 +16,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; @@ -53,7 +53,8 @@ public void init() private void mend() { - MSPacketHandler.sendToServer(new AnthvilPacket()); //sends a request to mend and refuel uranium + //sends a request to mend and refuel uranium + PacketDistributor.SERVER.noArg().send(new AnthvilPacket()); } private void finish() diff --git a/src/main/java/com/mraof/minestuck/client/gui/AreaEffectScreen.java b/src/main/java/com/mraof/minestuck/client/gui/AreaEffectScreen.java index b9336ad264..c85e05b8b7 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/AreaEffectScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/AreaEffectScreen.java @@ -3,7 +3,6 @@ import com.mraof.minestuck.block.redstone.AreaEffectBlock; import com.mraof.minestuck.blockentity.redstone.AreaEffectBlockEntity; import com.mraof.minestuck.network.AreaEffectPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; @@ -15,6 +14,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.effect.MobEffect; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; @@ -161,7 +161,7 @@ private void finish() if(validInput) { - MSPacketHandler.sendToServer(new AreaEffectPacket(getEffect(effectTextField.getValue()), Mth.clamp(parseInt(effectAmplifierTextField), 0, 255), isAllMobs, minOffsetPos, maxOffsetPos, be.getBlockPos())); + PacketDistributor.SERVER.noArg().send(new AreaEffectPacket(getEffect(effectTextField.getValue()), Mth.clamp(parseInt(effectAmplifierTextField), 0, 255), isAllMobs, minOffsetPos, maxOffsetPos, be.getBlockPos())); onClose(); } diff --git a/src/main/java/com/mraof/minestuck/client/gui/ComputerScreen.java b/src/main/java/com/mraof/minestuck/client/gui/ComputerScreen.java index 5ce21c2872..4535c4690a 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/ComputerScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/ComputerScreen.java @@ -220,6 +220,6 @@ public PowerButton() } @Override - public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float pt) { /* invisible */ } + public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float pt) { /* invisible */ } } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/client/gui/ComputerThemeScreen.java b/src/main/java/com/mraof/minestuck/client/gui/ComputerThemeScreen.java index 31ed124a1b..68b6088382 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/ComputerThemeScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/ComputerThemeScreen.java @@ -4,13 +4,13 @@ import com.mraof.minestuck.computer.theme.ComputerTheme; import com.mraof.minestuck.computer.theme.ComputerThemes; import com.mraof.minestuck.computer.theme.MSComputerThemes; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.computer.ThemeSelectPacket; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import org.lwjgl.glfw.GLFW; import javax.annotation.ParametersAreNonnullByDefault; @@ -174,7 +174,7 @@ private void finish() { if(!selectedTheme.id().equals(computer.getTheme())) { - MSPacketHandler.sendToServer(ThemeSelectPacket.create(computer, selectedTheme.id())); + PacketDistributor.SERVER.noArg().send(ThemeSelectPacket.create(computer, selectedTheme.id())); } onClose(); @@ -191,7 +191,7 @@ public PowerButton() } @Override - public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float pt) + public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float pt) { } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/DialogueButton.java b/src/main/java/com/mraof/minestuck/client/gui/DialogueButton.java index b88c35f9c0..561d3d990c 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/DialogueButton.java +++ b/src/main/java/com/mraof/minestuck/client/gui/DialogueButton.java @@ -58,15 +58,6 @@ private boolean activeAndVisible() return this.active && this.visible; } - @Override - public void render(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY, float pPartialTick) - { - super.render(pGuiGraphics, pMouseX, pMouseY, pPartialTick); - - //occurs after renderWidget where the value is checked - wasHoveredOrFocused = isMouseOver(pMouseX, pMouseY) || isFocused(); - } - @Override public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { @@ -101,5 +92,7 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float guiGraphics.drawString(mc.font, messageLines.get(i), textX , pY, getFGColor(), false); pY += TEXT_SPACING; } + + wasHoveredOrFocused = isMouseOver(mouseX, mouseY) || isFocused(); } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/client/gui/DialogueScreen.java b/src/main/java/com/mraof/minestuck/client/gui/DialogueScreen.java index 86b41449aa..811c707293 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/DialogueScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/DialogueScreen.java @@ -4,7 +4,6 @@ import com.mraof.minestuck.entity.dialogue.Dialogue; import com.mraof.minestuck.entity.dialogue.DialogueAnimationData; import com.mraof.minestuck.network.DialoguePackets; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.screens.Screen; @@ -13,6 +12,7 @@ import net.minecraft.network.chat.TextColor; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.FormattedCharSequence; +import net.neoforged.neoforge.network.PacketDistributor; import software.bernie.geckolib.cache.texture.AnimatableTexture; import java.util.ArrayList; @@ -167,13 +167,13 @@ private void clickResponse(Dialogue.ResponseData responseData) { if(responseData.shouldClose()) Objects.requireNonNull(this.minecraft).popGuiLayer(); - MSPacketHandler.sendToServer(new DialoguePackets.TriggerResponse(responseData.index(), this.dialogueId)); + PacketDistributor.SERVER.noArg().send(new DialoguePackets.TriggerResponse(responseData.index(), this.dialogueId)); } @Override public void onClose() { - MSPacketHandler.sendToServer(new DialoguePackets.OnCloseScreen(this.dialogueId)); + PacketDistributor.SERVER.noArg().send(new DialoguePackets.OnCloseScreen(this.dialogueId)); super.onClose(); } diff --git a/src/main/java/com/mraof/minestuck/client/gui/EditmodeSettingsScreen.java b/src/main/java/com/mraof/minestuck/client/gui/EditmodeSettingsScreen.java index 3be634000a..d17890b2cf 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/EditmodeSettingsScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/EditmodeSettingsScreen.java @@ -5,7 +5,6 @@ import com.mraof.minestuck.computer.editmode.ClientEditmodeData; import com.mraof.minestuck.computer.editmode.EditmodeLocations; import com.mraof.minestuck.network.EditmodeTeleportPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -17,6 +16,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; @@ -161,7 +161,7 @@ public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) private void teleport(BlockPos pos) { EditmodeTeleportPacket packet = new EditmodeTeleportPacket(pos); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); } private void prevPage() diff --git a/src/main/java/com/mraof/minestuck/client/gui/GoButton.java b/src/main/java/com/mraof/minestuck/client/gui/GoButton.java index b1cda07d09..6e2860bf33 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/GoButton.java +++ b/src/main/java/com/mraof/minestuck/client/gui/GoButton.java @@ -1,13 +1,13 @@ package com.mraof.minestuck.client.gui; import com.mraof.minestuck.inventory.MachineContainerMenu; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.MachinePacket; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import org.lwjgl.glfw.GLFW; @MethodsReturnNonnullByDefault @@ -94,11 +94,11 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) private void onRegularClick() { - MSPacketHandler.sendToServer(new MachinePacket.SetRunning(!this.menu.isRunning())); + PacketDistributor.SERVER.noArg().send(new MachinePacket.SetRunning(!this.menu.isRunning())); } private void onLoopClick() { - MSPacketHandler.sendToServer(new MachinePacket.SetLooping(!this.menu.isLooping())); + PacketDistributor.SERVER.noArg().send(new MachinePacket.SetLooping(!this.menu.isLooping())); } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/GristSelectorScreen.java b/src/main/java/com/mraof/minestuck/client/gui/GristSelectorScreen.java index 7ae3900c8d..a5941cccfa 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/GristSelectorScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/GristSelectorScreen.java @@ -4,13 +4,13 @@ import com.mraof.minestuck.api.alchemy.GristType; import com.mraof.minestuck.api.alchemy.GristTypes; import com.mraof.minestuck.network.GristWildcardPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.List; @@ -104,7 +104,7 @@ public boolean mouseClicked(double xcor, double ycor, int mouseButton) if (isPointInRegion(gristXOffset, gristYOffset, 16, 16, xcor, ycor)) { this.onClose(); - MSPacketHandler.INSTANCE.sendToServer(new GristWildcardPacket(gristHolderPos, type)); + PacketDistributor.SERVER.noArg().send(new GristWildcardPacket(gristHolderPos, type)); return true; } offset++; diff --git a/src/main/java/com/mraof/minestuck/client/gui/PunchDesignixScreen.java b/src/main/java/com/mraof/minestuck/client/gui/PunchDesignixScreen.java index 0f874da6b6..fa2f274a4e 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/PunchDesignixScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/PunchDesignixScreen.java @@ -1,7 +1,6 @@ package com.mraof.minestuck.client.gui; import com.mraof.minestuck.blockentity.machine.PunchDesignixBlockEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.PunchDesignixPacket; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -10,6 +9,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.regex.Pattern; @@ -73,7 +73,7 @@ private void finish() String captcha = captchaTextField.getValue(); be.setCaptcha(captcha); PunchDesignixPacket packet = new PunchDesignixPacket(be.getBlockPos(), captcha); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); this.minecraft.setScreen(null); } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/RemoteObserverScreen.java b/src/main/java/com/mraof/minestuck/client/gui/RemoteObserverScreen.java index 707299adbb..b5553fc374 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/RemoteObserverScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/RemoteObserverScreen.java @@ -1,7 +1,6 @@ package com.mraof.minestuck.client.gui; import com.mraof.minestuck.blockentity.redstone.RemoteObserverBlockEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.RemoteObserverPacket; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -12,6 +11,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.entity.EntityType; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.Optional; @@ -118,7 +118,7 @@ private void finish() if(isValidAndObservableEntityType) entityType = attemptedEntityType.get(); - MSPacketHandler.sendToServer(new RemoteObserverPacket(activeType, observingRange, be.getBlockPos(), entityType)); + PacketDistributor.SERVER.noArg().send(new RemoteObserverPacket(activeType, observingRange, be.getBlockPos(), entityType)); onClose(); } else { diff --git a/src/main/java/com/mraof/minestuck/client/gui/SendificatorScreen.java b/src/main/java/com/mraof/minestuck/client/gui/SendificatorScreen.java index cc0b688862..0f65f036b3 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/SendificatorScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/SendificatorScreen.java @@ -4,7 +4,6 @@ import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.machine.SendificatorBlockEntity; import com.mraof.minestuck.inventory.SendificatorMenu; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.SendificatorPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; @@ -14,6 +13,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -133,7 +133,7 @@ private void updateDestinationPos() { if(parsedPos != null) { - MSPacketHandler.sendToServer(new SendificatorPacket(parsedPos)); + PacketDistributor.SERVER.noArg().send(new SendificatorPacket(parsedPos)); } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/StatStorerScreen.java b/src/main/java/com/mraof/minestuck/client/gui/StatStorerScreen.java index f9303e8308..a067ef2450 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/StatStorerScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/StatStorerScreen.java @@ -1,7 +1,6 @@ package com.mraof.minestuck.client.gui; import com.mraof.minestuck.blockentity.redstone.StatStorerBlockEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.StatStorerPacket; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -10,6 +9,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; @@ -83,7 +83,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia private void finish() { - MSPacketHandler.sendToServer(new StatStorerPacket(activeType, be.getBlockPos(), textToInt())); + PacketDistributor.SERVER.noArg().send(new StatStorerPacket(activeType, be.getBlockPos(), textToInt())); onClose(); } diff --git a/src/main/java/com/mraof/minestuck/client/gui/StoneTabletScreen.java b/src/main/java/com/mraof/minestuck/client/gui/StoneTabletScreen.java index c15178a5e4..68688bdf53 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/StoneTabletScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/StoneTabletScreen.java @@ -8,7 +8,6 @@ import com.mojang.blaze3d.vertex.VertexFormat; import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.gui.StoneTabletUtils.Point; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.StoneTabletPacket; import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; @@ -26,6 +25,7 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.commons.lang3.mutable.MutableInt; import org.lwjgl.glfw.GLFW; @@ -230,7 +230,7 @@ else if(SharedConstants.isAllowedChatCharacter(keycode) && canEdit) private void sendTabletToServer() { if(isModified && text != null) - MSPacketHandler.sendToServer(new StoneTabletPacket(text, hand)); + PacketDistributor.SERVER.noArg().send(new StoneTabletPacket(text, hand)); } private void setText(String text) diff --git a/src/main/java/com/mraof/minestuck/client/gui/StructureCoreScreen.java b/src/main/java/com/mraof/minestuck/client/gui/StructureCoreScreen.java index 707827fa47..2b99695fa5 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/StructureCoreScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/StructureCoreScreen.java @@ -1,7 +1,6 @@ package com.mraof.minestuck.client.gui; import com.mraof.minestuck.blockentity.redstone.StructureCoreBlockEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.StructureCorePacket; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -10,6 +9,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; @@ -97,7 +97,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia private void finish() { - MSPacketHandler.sendToServer(new StructureCorePacket(actionType, shutdownRange, be.getBlockPos())); + PacketDistributor.SERVER.noArg().send(new StructureCorePacket(actionType, shutdownRange, be.getBlockPos())); onClose(); } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/client/gui/SummonerScreen.java b/src/main/java/com/mraof/minestuck/client/gui/SummonerScreen.java index 43965d44e4..f6416a2040 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/SummonerScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/SummonerScreen.java @@ -2,7 +2,6 @@ import com.mraof.minestuck.block.redstone.SummonerBlock; import com.mraof.minestuck.blockentity.redstone.SummonerBlockEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.SummonerPacket; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -13,6 +12,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.entity.EntityType; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Optional; @@ -116,7 +116,7 @@ private void finish() Optional> attemptedEntityType = EntityType.byString(entityTypeTextField.getValue()); if(attemptedEntityType.isPresent()) { - MSPacketHandler.sendToServer(new SummonerPacket(isUntriggerable, summonRange, be.getBlockPos(), attemptedEntityType.get())); + PacketDistributor.SERVER.noArg().send(new SummonerPacket(isUntriggerable, summonRange, be.getBlockPos(), attemptedEntityType.get())); onClose(); } else { diff --git a/src/main/java/com/mraof/minestuck/client/gui/TitleSelectorScreen.java b/src/main/java/com/mraof/minestuck/client/gui/TitleSelectorScreen.java index ba9fb97d31..9cacd87476 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/TitleSelectorScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/TitleSelectorScreen.java @@ -1,6 +1,5 @@ package com.mraof.minestuck.client.gui; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.TitleSelectPacket; import com.mraof.minestuck.player.EnumAspect; import com.mraof.minestuck.player.EnumClass; @@ -12,6 +11,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; @@ -116,13 +116,13 @@ private void pickAspect(EnumAspect a) private void select() { - MSPacketHandler.sendToServer(new TitleSelectPacket(new Title(currentClass, currentAspect))); + PacketDistributor.SERVER.noArg().send(new TitleSelectPacket(new Title(currentClass, currentAspect))); onClose(); } private void random() { - MSPacketHandler.sendToServer(new TitleSelectPacket()); + PacketDistributor.SERVER.noArg().send(new TitleSelectPacket()); onClose(); } diff --git a/src/main/java/com/mraof/minestuck/client/gui/TransportalizerScreen.java b/src/main/java/com/mraof/minestuck/client/gui/TransportalizerScreen.java index fa97c1d467..2d1fc58c52 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/TransportalizerScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/TransportalizerScreen.java @@ -1,8 +1,6 @@ package com.mraof.minestuck.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import com.mraof.minestuck.blockentity.TransportalizerBlockEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.TransportalizerPacket; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -11,6 +9,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; @@ -83,11 +82,11 @@ private void finish() if(be.hasId()) { //Debug.print("Sending transportalizer packet with destination of " + this.destinationTextField.getText()); TransportalizerPacket.DestId packet = new TransportalizerPacket.DestId(be.getBlockPos(), text); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); minecraft.setScreen(null); } else { TransportalizerPacket.Id packet = new TransportalizerPacket.Id(be.getBlockPos(), text); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); minecraft.setScreen(null); } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/WirelessRedstoneTransmitterScreen.java b/src/main/java/com/mraof/minestuck/client/gui/WirelessRedstoneTransmitterScreen.java index a8142ebbb6..02a123662c 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/WirelessRedstoneTransmitterScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/WirelessRedstoneTransmitterScreen.java @@ -1,8 +1,6 @@ package com.mraof.minestuck.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import com.mraof.minestuck.blockentity.redstone.WirelessRedstoneTransmitterBlockEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.WirelessRedstoneTransmitterPacket; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; @@ -11,6 +9,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; public class WirelessRedstoneTransmitterScreen extends Screen { @@ -78,7 +77,7 @@ private void findReceiver() private void finish() { - MSPacketHandler.sendToServer(new WirelessRedstoneTransmitterPacket(parseBlockPos(), be.getBlockPos())); + PacketDistributor.SERVER.noArg().send(new WirelessRedstoneTransmitterPacket(parseBlockPos(), be.getBlockPos())); onClose(); } diff --git a/src/main/java/com/mraof/minestuck/client/gui/captchalouge/HashMapSylladexScreen.java b/src/main/java/com/mraof/minestuck/client/gui/captchalouge/HashMapSylladexScreen.java index 7f6b0b611e..27754021b0 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/captchalouge/HashMapSylladexScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/captchalouge/HashMapSylladexScreen.java @@ -4,13 +4,13 @@ import com.mraof.minestuck.inventory.captchalogue.HashMapModus; import com.mraof.minestuck.inventory.captchalogue.Modus; import com.mraof.minestuck.network.CaptchaDeckPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; public class HashMapSylladexScreen extends SylladexScreen { @@ -65,7 +65,7 @@ public void onClick(int mouseButton) if(this.item != null && mouseButton == 1) { CaptchaDeckPacket packet = CaptchaDeckPacket.get(this.index, true); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); } else super.onClick(mouseButton); } }); @@ -107,7 +107,7 @@ private void changeSetting() if(MinestuckConfig.SERVER.hashmapChatModusSetting.get() == MinestuckConfig.AvailableOptions.BOTH) { modus.ejectByChat = !modus.ejectByChat; - MSPacketHandler.sendToServer(CaptchaDeckPacket.modusParam((byte) 0, modus.ejectByChat ? 1 : 0)); + PacketDistributor.SERVER.noArg().send(CaptchaDeckPacket.modusParam((byte) 0, modus.ejectByChat ? 1 : 0)); } } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/client/gui/captchalouge/SylladexScreen.java b/src/main/java/com/mraof/minestuck/client/gui/captchalouge/SylladexScreen.java index 1f69240024..818c41932b 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/captchalouge/SylladexScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/captchalouge/SylladexScreen.java @@ -6,7 +6,6 @@ import com.mraof.minestuck.client.util.MSKeyHandler; import com.mraof.minestuck.inventory.captchalogue.CaptchaDeckHandler; import com.mraof.minestuck.network.CaptchaDeckPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -17,6 +16,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; @@ -253,7 +253,7 @@ public boolean keyPressed(int keyCode, int scanCode, int i) public void onEmptyConfirm(boolean result) { if(result) - MSPacketHandler.sendToServer(CaptchaDeckPacket.get(CaptchaDeckHandler.EMPTY_SYLLADEX, false)); + PacketDistributor.SERVER.noArg().send(CaptchaDeckPacket.get(CaptchaDeckHandler.EMPTY_SYLLADEX, false)); minecraft.screen = this; } @@ -335,7 +335,7 @@ else if(this.index != -1 && (mouseButton == 0 || mouseButton == 1)) if(toSend != -1) { CaptchaDeckPacket packet = CaptchaDeckPacket.get(toSend, mouseButton != 0); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/captchalouge/TreeSylladexScreen.java b/src/main/java/com/mraof/minestuck/client/gui/captchalouge/TreeSylladexScreen.java index 8257e6ac3a..1c8cbb3693 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/captchalouge/TreeSylladexScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/captchalouge/TreeSylladexScreen.java @@ -5,11 +5,11 @@ import com.mraof.minestuck.inventory.captchalogue.TreeModus; import com.mraof.minestuck.inventory.captchalogue.TreeModus.TreeNode; import com.mraof.minestuck.network.CaptchaDeckPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; public class TreeSylladexScreen extends SylladexScreen { @@ -97,7 +97,7 @@ private void changeSetting() if(MinestuckConfig.SERVER.treeModusSetting.get() == MinestuckConfig.AvailableOptions.BOTH) { modus.autoBalance = !modus.autoBalance; - MSPacketHandler.sendToServer(CaptchaDeckPacket.modusParam((byte) 0, modus.autoBalance ? 1 : 0)); + PacketDistributor.SERVER.noArg().send(CaptchaDeckPacket.modusParam((byte) 0, modus.autoBalance ? 1 : 0)); } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/playerStats/AtheneumScreen.java b/src/main/java/com/mraof/minestuck/client/gui/playerStats/AtheneumScreen.java index 8b3abc4602..0868fa3136 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/playerStats/AtheneumScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/playerStats/AtheneumScreen.java @@ -4,13 +4,13 @@ import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.inventory.AtheneumMenu; import com.mraof.minestuck.network.AtheneumPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.player.Inventory; +import net.neoforged.neoforge.network.PacketDistributor; import java.time.LocalDate; import java.time.Month; @@ -79,7 +79,7 @@ else if(more && ycor >= yOffset + DOWN_ARROW_Y && ycor < yOffset + DOWN_ARROW_Y } if(packet != null) { - MSPacketHandler.INSTANCE.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); return true; } } @@ -101,7 +101,7 @@ else if(more && scrollY < 0) if(packet != null) { - MSPacketHandler.INSTANCE.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); return true; } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/playerStats/CaptchaDeckScreen.java b/src/main/java/com/mraof/minestuck/client/gui/playerStats/CaptchaDeckScreen.java index 9bf19c8a9b..4c1d355a50 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/playerStats/CaptchaDeckScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/playerStats/CaptchaDeckScreen.java @@ -9,7 +9,6 @@ import com.mraof.minestuck.inventory.captchalogue.ModusTypes; import com.mraof.minestuck.item.CaptchaCardItem; import com.mraof.minestuck.network.CaptchaDeckPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -20,6 +19,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; public class CaptchaDeckScreen extends PlayerStatsContainerScreen { @@ -95,7 +95,7 @@ public void removed() return; } } - MSPacketHandler.sendToServer(CaptchaDeckPacket.modus()); + PacketDistributor.SERVER.noArg().send(CaptchaDeckPacket.modus()); } } @@ -112,7 +112,7 @@ private void sylladex() private void onConfirm(boolean result) { if(result && !menu.getMenuItem().isEmpty()) - MSPacketHandler.sendToServer(CaptchaDeckPacket.modus()); + PacketDistributor.SERVER.noArg().send(CaptchaDeckPacket.modus()); minecraft.screen = this; } diff --git a/src/main/java/com/mraof/minestuck/client/gui/playerStats/DataCheckerScreen.java b/src/main/java/com/mraof/minestuck/client/gui/playerStats/DataCheckerScreen.java index 76adadcb34..22a2f4ddde 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/playerStats/DataCheckerScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/playerStats/DataCheckerScreen.java @@ -4,7 +4,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mraof.minestuck.client.util.MSKeyHandler; import com.mraof.minestuck.network.DataCheckerPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.ClientPlayerData; import com.mraof.minestuck.player.EnumAspect; import com.mraof.minestuck.player.EnumClass; @@ -23,6 +22,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -72,7 +72,7 @@ public void init() refreshButton = addRenderableWidget(Button.builder(Component.empty(), button -> refresh()).pos(xOffset + GUI_WIDTH - 45, yOffset + 5).size(18, 18).build()); if(activeComponent == null) - MSPacketHandler.sendToServer(DataCheckerPacket.request()); + PacketDistributor.SERVER.noArg().send(DataCheckerPacket.request()); componentChanged(); } @@ -220,7 +220,7 @@ private void goBack() private void refresh() { - MSPacketHandler.sendToServer(DataCheckerPacket.request()); + PacketDistributor.SERVER.noArg().send(DataCheckerPacket.request()); activeComponent = null; componentChanged(); } diff --git a/src/main/java/com/mraof/minestuck/client/gui/playerStats/InventoryEditmodeScreen.java b/src/main/java/com/mraof/minestuck/client/gui/playerStats/InventoryEditmodeScreen.java index 7ed3a3ebcf..0bd5cfb1a9 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/playerStats/InventoryEditmodeScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/playerStats/InventoryEditmodeScreen.java @@ -6,7 +6,6 @@ import com.mraof.minestuck.client.gui.EditmodeSettingsScreen; import com.mraof.minestuck.inventory.EditmodeMenu; import com.mraof.minestuck.network.EditmodeInventoryPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; @@ -14,6 +13,7 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; +import net.neoforged.neoforge.network.PacketDistributor; import java.time.LocalDate; import java.time.Month; @@ -107,7 +107,7 @@ public boolean mouseClicked(double xcor, double ycor, int mouseButton) } if(packet != null) { - MSPacketHandler.INSTANCE.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); return true; } } diff --git a/src/main/java/com/mraof/minestuck/client/gui/playerStats/PlayerStatsScreen.java b/src/main/java/com/mraof/minestuck/client/gui/playerStats/PlayerStatsScreen.java index b11ab6e608..a332490025 100644 --- a/src/main/java/com/mraof/minestuck/client/gui/playerStats/PlayerStatsScreen.java +++ b/src/main/java/com/mraof/minestuck/client/gui/playerStats/PlayerStatsScreen.java @@ -7,7 +7,6 @@ import com.mraof.minestuck.client.gui.MinestuckScreen; import com.mraof.minestuck.client.util.MSKeyHandler; import com.mraof.minestuck.computer.editmode.ClientEditmodeData; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.MiscContainerPacket; import com.mraof.minestuck.player.ClientPlayerData; import com.mraof.minestuck.skaianet.client.SkaiaClient; @@ -26,6 +25,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.function.BiFunction; import java.util.function.Supplier; @@ -274,7 +274,7 @@ public static void openGui(boolean reload) mc.setScreen(containerScreen); if(mc.screen == containerScreen) - MSPacketHandler.sendToServer(new MiscContainerPacket(ordinal, ClientEditmodeData.isInEditmode())); + PacketDistributor.SERVER.noArg().send(new MiscContainerPacket(ordinal, ClientEditmodeData.isInEditmode())); } else mc.setScreen(ClientEditmodeData.isInEditmode() ? editmodeTab.createGuiInstance():normalTab.createGuiInstance()); } diff --git a/src/main/java/com/mraof/minestuck/client/renderer/blockentity/GateRenderer.java b/src/main/java/com/mraof/minestuck/client/renderer/blockentity/GateRenderer.java index 492f0238b3..d26b2c6247 100644 --- a/src/main/java/com/mraof/minestuck/client/renderer/blockentity/GateRenderer.java +++ b/src/main/java/com/mraof/minestuck/client/renderer/blockentity/GateRenderer.java @@ -12,6 +12,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; import org.joml.Matrix3f; import org.joml.Matrix4f; @@ -61,6 +62,7 @@ public int getViewDistance() @Override public AABB getRenderBoundingBox(GateBlockEntity blockEntity) { - return new AABB(blockEntity.getBlockPos().offset(-1, 0, -1), blockEntity.getBlockPos().offset(1, 1, 1)); + Vec3 corner = Vec3.atLowerCornerOf(blockEntity.getBlockPos().offset(-1, 0, -1)); + return new AABB(corner, corner.add(3, 1, 3)); } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/client/renderer/blockentity/ReturnNodeRenderer.java b/src/main/java/com/mraof/minestuck/client/renderer/blockentity/ReturnNodeRenderer.java index fc09e2a8aa..f62cc3d2b5 100644 --- a/src/main/java/com/mraof/minestuck/client/renderer/blockentity/ReturnNodeRenderer.java +++ b/src/main/java/com/mraof/minestuck/client/renderer/blockentity/ReturnNodeRenderer.java @@ -13,6 +13,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; import org.joml.Matrix3f; import org.joml.Matrix4f; @@ -79,6 +80,7 @@ public int getViewDistance() @Override public AABB getRenderBoundingBox(ReturnNodeBlockEntity blockEntity) { - return new AABB(blockEntity.getBlockPos().offset(-1, 0, -1), blockEntity.getBlockPos().offset(1, 1, 1)); + Vec3 corner = Vec3.atLowerCornerOf(blockEntity.getBlockPos().offset(-1, 0, -1)); + return new AABB(corner, corner.add(2, 1, 2)); } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/client/util/MSKeyHandler.java b/src/main/java/com/mraof/minestuck/client/util/MSKeyHandler.java index ba9d40504b..4eaefd8196 100644 --- a/src/main/java/com/mraof/minestuck/client/util/MSKeyHandler.java +++ b/src/main/java/com/mraof/minestuck/client/util/MSKeyHandler.java @@ -7,7 +7,6 @@ import com.mraof.minestuck.computer.editmode.ClientEditHandler; import com.mraof.minestuck.network.CaptchaDeckPacket; import com.mraof.minestuck.network.EffectTogglePacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; @@ -21,6 +20,7 @@ import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; import net.neoforged.neoforge.client.event.ScreenEvent; import net.neoforged.neoforge.client.settings.KeyConflictContext; +import net.neoforged.neoforge.network.PacketDistributor; import org.lwjgl.glfw.GLFW; @Mod.EventBusSubscriber(modid = Minestuck.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) @@ -90,7 +90,7 @@ public static void onKeyInput(InputEvent.Key event) //This is only called during captchalogueInGame(); if(effectToggleKey.isActiveAndMatches(input)) - MSPacketHandler.sendToServer(new EffectTogglePacket()); + PacketDistributor.SERVER.noArg().send(new EffectTogglePacket()); if(sylladexKey.isActiveAndMatches(input) && ClientPlayerData.getModus() != null) MSScreenFactories.displaySylladexScreen(ClientPlayerData.getModus()); @@ -101,7 +101,7 @@ public static void onKeyInput(InputEvent.Key event) //This is only called during private static void captchalogueInGame() { if(!Minecraft.getInstance().player.getMainHandItem().isEmpty()) - MSPacketHandler.sendToServer(CaptchaDeckPacket.captchalogue()); + PacketDistributor.SERVER.noArg().send(CaptchaDeckPacket.captchalogue()); } private static void captchalogueInGui(AbstractContainerScreen screen) @@ -110,7 +110,7 @@ private static void captchalogueInGui(AbstractContainerScreen screen) { Slot slot = screen.getSlotUnderMouse(); if(slot != null && slot.hasItem()) - MSPacketHandler.sendToServer(CaptchaDeckPacket.captchalogueInv(slot.index, screen.getMenu().containerId)); + PacketDistributor.SERVER.noArg().send(CaptchaDeckPacket.captchalogueInv(slot.index, screen.getMenu().containerId)); } } } diff --git a/src/main/java/com/mraof/minestuck/command/RungCommand.java b/src/main/java/com/mraof/minestuck/command/RungCommand.java index d9a71c8855..81b16b11cf 100644 --- a/src/main/java/com/mraof/minestuck/command/RungCommand.java +++ b/src/main/java/com/mraof/minestuck/command/RungCommand.java @@ -66,7 +66,7 @@ private static int setRung(CommandContext context, Collectio { for (ServerPlayer player : players) { PlayerSavedData.getData(player).getEcheladder().setByCommand(rung, progress); - MSCriteriaTriggers.ECHELADDER.trigger(player, rung); + MSCriteriaTriggers.ECHELADDER.get().trigger(player, rung); } context.getSource().sendSuccess(() -> Component.translatable(SET_SUCCESS, players.size(), rung, progress), true); return players.size(); diff --git a/src/main/java/com/mraof/minestuck/computer/ButtonListProgram.java b/src/main/java/com/mraof/minestuck/computer/ButtonListProgram.java index 18af3b1983..7d9add0c65 100644 --- a/src/main/java/com/mraof/minestuck/computer/ButtonListProgram.java +++ b/src/main/java/com/mraof/minestuck/computer/ButtonListProgram.java @@ -3,7 +3,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.client.gui.ComputerScreen; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.computer.ClearMessagePacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; @@ -12,6 +11,7 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.neoforged.neoforge.client.gui.widget.ExtendedButton; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -52,7 +52,7 @@ public final void onButtonPressed(ComputerScreen screen, Button button) if(data != null) { if(!screen.be.latestmessage.get(this.getId()).isEmpty()) - MSPacketHandler.sendToServer(new ClearMessagePacket(screen.be.getBlockPos(), this.getId())); + PacketDistributor.SERVER.noArg().send(new ClearMessagePacket(screen.be.getBlockPos(), this.getId())); onButtonPressed(screen.be, data.string, data.formatData); } screen.updateGui(); diff --git a/src/main/java/com/mraof/minestuck/computer/DiskBurner.java b/src/main/java/com/mraof/minestuck/computer/DiskBurner.java index bae5729798..881ac8447b 100644 --- a/src/main/java/com/mraof/minestuck/computer/DiskBurner.java +++ b/src/main/java/com/mraof/minestuck/computer/DiskBurner.java @@ -2,9 +2,9 @@ import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.computer.BurnDiskPacket; import net.minecraft.resources.ResourceLocation; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.ArrayList; @@ -42,10 +42,10 @@ public void onButtonPressed(ComputerBlockEntity be, String buttonName, Object[] { if(buttonName.equals(BURN_CLIENT_DISK)) { - MSPacketHandler.sendToServer(BurnDiskPacket.create(be, 0)); + PacketDistributor.SERVER.noArg().send(BurnDiskPacket.create(be, 0)); } else if(buttonName.equals(BURN_SERVER_DISK)) { - MSPacketHandler.sendToServer(BurnDiskPacket.create(be, 1)); + PacketDistributor.SERVER.noArg().send(BurnDiskPacket.create(be, 1)); } } diff --git a/src/main/java/com/mraof/minestuck/computer/SburbClient.java b/src/main/java/com/mraof/minestuck/computer/SburbClient.java index cc4ddcd57a..0230fb64fd 100644 --- a/src/main/java/com/mraof/minestuck/computer/SburbClient.java +++ b/src/main/java/com/mraof/minestuck/computer/SburbClient.java @@ -3,7 +3,6 @@ import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.client.gui.ColorSelectorScreen; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.computer.CloseRemoteSburbConnectionPacket; import com.mraof.minestuck.network.computer.CloseSburbConnectionPacket; import com.mraof.minestuck.network.computer.ConnectToSburbServerPacket; @@ -13,6 +12,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.ArrayList; import java.util.Map; @@ -68,14 +68,15 @@ public void onButtonPressed(ComputerBlockEntity be, String buttonName, Object[] { switch(buttonName) { - case RESUME_BUTTON -> MSPacketHandler.sendToServer(ResumeSburbConnectionPacket.asClient(be)); - case CONNECT_BUTTON -> MSPacketHandler.sendToServer(ConnectToSburbServerPacket.create(be, (Integer) data[1])); + case RESUME_BUTTON -> PacketDistributor.SERVER.noArg().send(ResumeSburbConnectionPacket.asClient(be)); + case CONNECT_BUTTON -> PacketDistributor.SERVER.noArg().send(ConnectToSburbServerPacket.create(be, (Integer) data[1])); case CLOSE_BUTTON -> { CompoundTag nbt = be.getData(getId()); if(!nbt.getBoolean("isResuming") && !nbt.getBoolean("connectedToServer")) - MSPacketHandler.sendToServer(CloseRemoteSburbConnectionPacket.asClient(be)); - else MSPacketHandler.sendToServer(CloseSburbConnectionPacket.asClient(be)); + PacketDistributor.SERVER.noArg().send(CloseRemoteSburbConnectionPacket.asClient(be)); + else + PacketDistributor.SERVER.noArg().send(CloseSburbConnectionPacket.asClient(be)); } case SELECT_COLOR -> Minecraft.getInstance().setScreen(new ColorSelectorScreen(be)); } diff --git a/src/main/java/com/mraof/minestuck/computer/SburbServer.java b/src/main/java/com/mraof/minestuck/computer/SburbServer.java index 8f9c5ddd8e..a5ec9603ab 100644 --- a/src/main/java/com/mraof/minestuck/computer/SburbServer.java +++ b/src/main/java/com/mraof/minestuck/computer/SburbServer.java @@ -4,13 +4,13 @@ import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.network.ClientEditPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.computer.CloseSburbConnectionPacket; import com.mraof.minestuck.network.computer.OpenSburbServerPacket; import com.mraof.minestuck.network.computer.ResumeSburbConnectionPacket; import com.mraof.minestuck.skaianet.client.ReducedConnection; import com.mraof.minestuck.skaianet.client.SkaiaClient; import net.minecraft.resources.ResourceLocation; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.ArrayList; @@ -69,11 +69,11 @@ public void onButtonPressed(ComputerBlockEntity be, String buttonName, Object[] case EDIT_BUTTON, GIVE_BUTTON -> { ClientEditPacket packet = ClientEditPacket.activate(be.ownerId, be.getData(getId()).getInt("connectedClient")); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); } - case RESUME_BUTTON -> MSPacketHandler.sendToServer(ResumeSburbConnectionPacket.asServer(be)); - case OPEN_BUTTON -> MSPacketHandler.sendToServer(OpenSburbServerPacket.create(be)); - case CLOSE_BUTTON -> MSPacketHandler.sendToServer(CloseSburbConnectionPacket.asServer(be)); + case RESUME_BUTTON -> PacketDistributor.SERVER.noArg().send(ResumeSburbConnectionPacket.asServer(be)); + case OPEN_BUTTON -> PacketDistributor.SERVER.noArg().send(OpenSburbServerPacket.create(be)); + case CLOSE_BUTTON -> PacketDistributor.SERVER.noArg().send(CloseSburbConnectionPacket.asServer(be)); } } diff --git a/src/main/java/com/mraof/minestuck/computer/editmode/ClientEditHandler.java b/src/main/java/com/mraof/minestuck/computer/editmode/ClientEditHandler.java index c476a8c53f..ba00436720 100644 --- a/src/main/java/com/mraof/minestuck/computer/editmode/ClientEditHandler.java +++ b/src/main/java/com/mraof/minestuck/computer/editmode/ClientEditHandler.java @@ -8,7 +8,6 @@ import com.mraof.minestuck.client.gui.playerStats.PlayerStatsScreen; import com.mraof.minestuck.client.util.GuiUtil; import com.mraof.minestuck.network.ClientEditPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.ClientPlayerData; import com.mraof.minestuck.player.GristCache; import com.mraof.minestuck.util.MSTags; @@ -40,6 +39,7 @@ import net.neoforged.neoforge.event.entity.player.EntityItemPickupEvent; import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.List; import java.util.Objects; @@ -52,7 +52,7 @@ public final class ClientEditHandler public static void onKeyPressed() { ClientEditPacket packet = ClientEditPacket.exit(); - MSPacketHandler.sendToServer(packet); + PacketDistributor.SERVER.noArg().send(packet); } @SubscribeEvent diff --git a/src/main/java/com/mraof/minestuck/computer/editmode/ClientEditToolDrag.java b/src/main/java/com/mraof/minestuck/computer/editmode/ClientEditToolDrag.java index 724e9c084b..8fd84d71eb 100644 --- a/src/main/java/com/mraof/minestuck/computer/editmode/ClientEditToolDrag.java +++ b/src/main/java/com/mraof/minestuck/computer/editmode/ClientEditToolDrag.java @@ -9,7 +9,6 @@ import com.mraof.minestuck.block.machine.EditmodeDestroyable; import com.mraof.minestuck.block.machine.MachineBlock; import com.mraof.minestuck.network.EditmodeDragPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.ClientPlayerData; import com.mraof.minestuck.util.MSCapabilities; import com.mraof.minestuck.util.MSSoundEvents; @@ -39,6 +38,7 @@ import net.neoforged.neoforge.client.event.RenderLevelStageEvent; import net.neoforged.neoforge.common.NeoForgeMod; import net.neoforged.neoforge.event.TickEvent; +import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Matrix4f; /** Class for handling the click-and-drag editmode tools (Revise and Recycle) on the client-side. @@ -62,7 +62,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) if (player == null || !player.isAlive() || !ClientEditmodeData.isInEditmode()) return; - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY, null).orElseThrow(() -> new IllegalStateException("EditTool Capability is missing on player " + player.getDisplayName().getString() + " on client-side!")); + IEditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); ClientEditToolDrag.doRecycleCode(mc, player, cap); ClientEditToolDrag.doReviseCode(mc, player, cap); @@ -80,7 +80,7 @@ public static void renderWorld(RenderLevelStageEvent event) */ private static void cancelDrag(IEditTools cap) { - MSPacketHandler.sendToServer(new EditmodeDragPacket.Reset()); + PacketDistributor.SERVER.noArg().send(new EditmodeDragPacket.Reset()); cap.resetDragTools(); } @@ -115,7 +115,7 @@ private static boolean tryBeginDrag(IEditTools.ToolMode targetTool, IEditTools c private static void updateDragPosition(IEditTools.ToolMode targetTool, IEditTools cap, Player player, KeyMapping toolKey) { cap.setEditPos2(getSelectionEndPoint(player, cap.getEditReachDistance(), targetTool == IEditTools.ToolMode.REVISE ? true : false)); - MSPacketHandler.sendToServer(new EditmodeDragPacket.Cursor(toolKey.isDown(), cap.getEditPos1(), cap.getEditPos2())); + PacketDistributor.SERVER.noArg().send(new EditmodeDragPacket.Cursor(toolKey.isDown(), cap.getEditPos1(), cap.getEditPos2())); } /** @@ -128,9 +128,9 @@ private static void updateDragPosition(IEditTools.ToolMode targetTool, IEditTool private static void finishDragging(IEditTools.ToolMode targetTool, IEditTools cap, Player player) { if(targetTool == IEditTools.ToolMode.REVISE) - MSPacketHandler.sendToServer(new EditmodeDragPacket.Fill(false, cap.getEditPos1(), cap.getEditPos2(), cap.getEditTraceHit(), cap.getEditTraceDirection())); + PacketDistributor.SERVER.noArg().send(new EditmodeDragPacket.Fill(false, cap.getEditPos1(), cap.getEditPos2(), cap.getEditTraceHit(), cap.getEditTraceDirection())); else - MSPacketHandler.sendToServer(new EditmodeDragPacket.Destroy(false, cap.getEditPos1(), cap.getEditPos2(), cap.getEditTraceHit(), cap.getEditTraceDirection())); + PacketDistributor.SERVER.noArg().send(new EditmodeDragPacket.Destroy(false, cap.getEditPos1(), cap.getEditPos2(), cap.getEditTraceHit(), cap.getEditTraceDirection())); playSoundAndSetParticles(player, targetTool == IEditTools.ToolMode.REVISE ? true : false, cap.getEditPos1(), cap.getEditPos2()); cap.resetDragTools(); @@ -369,7 +369,7 @@ public static void renderOutlines(RenderLevelStageEvent event) Player player = mc.player; Camera info = event.getCamera(); - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY, null).orElseThrow(() -> new IllegalStateException("EditTool Capability is empty on player " + player.getDisplayName().toString() + " on client-side!")); + IEditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); double d1 = info.getPosition().x; double d2 = info.getPosition().y; diff --git a/src/main/java/com/mraof/minestuck/computer/editmode/EditData.java b/src/main/java/com/mraof/minestuck/computer/editmode/EditData.java index 9036163380..11ec8ac0d9 100644 --- a/src/main/java/com/mraof/minestuck/computer/editmode/EditData.java +++ b/src/main/java/com/mraof/minestuck/computer/editmode/EditData.java @@ -1,7 +1,6 @@ package com.mraof.minestuck.computer.editmode; import com.mraof.minestuck.entity.DecoyEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.ServerEditPacket; import com.mraof.minestuck.network.data.EditmodeCacheLimitPacket; import com.mraof.minestuck.network.data.GristCachePacket; @@ -24,6 +23,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.GameType; import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -93,18 +93,18 @@ public DecoyEntity getDecoy() public void sendGristCacheToEditor() { GristCachePacket packet = new GristCachePacket(this.getGristCache().getGristSet(), true); - MSPacketHandler.sendToPlayer(packet, this.getEditor()); + PacketDistributor.PLAYER.with(this.getEditor()).send(packet); } public void sendCacheLimitToEditor() { long limit = PlayerSavedData.getData(this.getTarget(), player.server).getEcheladder().getGristCapacity(); - MSPacketHandler.sendToPlayer(new EditmodeCacheLimitPacket(limit), this.getEditor()); + PacketDistributor.PLAYER.with(this.getEditor()).send(new EditmodeCacheLimitPacket(limit)); } public void sendGivenItemsToEditor() { - MSPacketHandler.sendToPlayer(new ServerEditPacket.UpdateDeployList(DeployList.getDeployListTag(player.server, this.sburbData())), getEditor()); + PacketDistributor.PLAYER.with(getEditor()).send(new ServerEditPacket.UpdateDeployList(DeployList.getDeployListTag(player.server, this.sburbData()))); } public CompoundTag writeRecoveryData() diff --git a/src/main/java/com/mraof/minestuck/computer/editmode/EditToolsCapabilityProvider.java b/src/main/java/com/mraof/minestuck/computer/editmode/EditToolsCapabilityProvider.java deleted file mode 100644 index c04f2f3a45..0000000000 --- a/src/main/java/com/mraof/minestuck/computer/editmode/EditToolsCapabilityProvider.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mraof.minestuck.computer.editmode; - -import com.mraof.minestuck.util.MSCapabilities; -import net.minecraft.core.Direction; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.capabilities.ICapabilityProvider; -import net.neoforged.neoforge.common.util.LazyOptional; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class EditToolsCapabilityProvider implements ICapabilityProvider -{ - private final LazyOptional lazyInitSupplierEditTools = LazyOptional.of(this::getCachedEditTools); - private EditTools editTools; - - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) - { - if(MSCapabilities.EDIT_TOOLS_CAPABILITY == cap) - return (lazyInitSupplierEditTools).cast(); - return LazyOptional.empty(); - } - - private @Nonnull - EditTools getCachedEditTools() - { - if(editTools == null) - { - editTools = new EditTools(); - } - return editTools; - } -} diff --git a/src/main/java/com/mraof/minestuck/computer/editmode/IEditTools.java b/src/main/java/com/mraof/minestuck/computer/editmode/IEditTools.java index 79b1a33a90..2e29825618 100644 --- a/src/main/java/com/mraof/minestuck/computer/editmode/IEditTools.java +++ b/src/main/java/com/mraof/minestuck/computer/editmode/IEditTools.java @@ -18,7 +18,7 @@ * * @see ClientEditHandler */ - +@Deprecated //todo switch to just EditTools public interface IEditTools { enum ToolMode diff --git a/src/main/java/com/mraof/minestuck/computer/editmode/ServerEditHandler.java b/src/main/java/com/mraof/minestuck/computer/editmode/ServerEditHandler.java index c8c85988c2..43fc6bd27e 100644 --- a/src/main/java/com/mraof/minestuck/computer/editmode/ServerEditHandler.java +++ b/src/main/java/com/mraof/minestuck/computer/editmode/ServerEditHandler.java @@ -14,7 +14,6 @@ import com.mraof.minestuck.event.OnEntryEvent; import com.mraof.minestuck.event.SburbEvent; import com.mraof.minestuck.item.MSItems; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.ServerEditPacket; import com.mraof.minestuck.network.data.EditmodeLocationsPacket; import com.mraof.minestuck.player.GristCache; @@ -71,6 +70,7 @@ import net.neoforged.neoforge.event.level.BlockEvent; import net.neoforged.neoforge.event.server.ServerStartedEvent; import net.neoforged.neoforge.event.server.ServerStoppingEvent; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -178,7 +178,7 @@ private static void partialReset(DamageSource damageSource, float damage, EditDa editData.recover(); //TODO handle exception from failed recovery - MSPacketHandler.sendToPlayer(new ServerEditPacket.Exit(), player); + PacketDistributor.PLAYER.with(player).send(new ServerEditPacket.Exit()); editData.getDecoy().markedForDespawn = true; @@ -218,7 +218,7 @@ public static void newServerEditor(ServerPlayer player, PlayerIdentifier compute data.locations().validateClosestSource(player, targetData); - MSPacketHandler.sendToPlayer(new ServerEditPacket.Activate(), player); + PacketDistributor.PLAYER.with(player).send(new ServerEditPacket.Activate()); data.sendGivenItemsToEditor(); EditmodeLocationsPacket.send(data); @@ -273,7 +273,7 @@ public static void resendEditmodeStatus(ServerPlayer editor) EditData data = getData(editor); if(data != null) { - MSPacketHandler.sendToPlayer(new ServerEditPacket.Activate(), editor); + PacketDistributor.PLAYER.with(editor).send(new ServerEditPacket.Activate()); data.sendGivenItemsToEditor(); EditmodeLocationsPacket.send(data); @@ -281,7 +281,7 @@ public static void resendEditmodeStatus(ServerPlayer editor) data.sendCacheLimitToEditor(); } else { - MSPacketHandler.sendToPlayer(new ServerEditPacket.Exit(), editor); + PacketDistributor.PLAYER.with(editor).send(new ServerEditPacket.Exit()); } } @@ -380,7 +380,7 @@ public static void onRightClickBlockControl(PlayerInteractEvent.RightClickBlock { if(event.getEntity() instanceof ServerPlayer player && getData(event.getEntity()) != null) { - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY).orElseThrow(() -> new IllegalStateException("EditTools Capability is empty in RightClickBlock event on the server!")); + IEditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); if(!event.getEntity().canReach(event.getPos(), 0.0) || cap.getEditPos1() != null) { event.setCanceled(true); @@ -433,7 +433,7 @@ public static void onLeftClickBlockControl(PlayerInteractEvent.LeftClickBlock ev { if(event.getEntity() instanceof ServerPlayer player && getData(event.getEntity()) != null) { - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY).orElseThrow(() -> new IllegalStateException("EditTools Capability is empty in LeftClickBlock event on the server!")); + IEditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); if(!event.getEntity().canReach(event.getPos(), 0.0) || cap.getEditPos1() != null) { event.setCanceled(true); @@ -570,7 +570,7 @@ else if(player.level().isClientSide()) throw LOGGER.throwing(new IllegalStateException("Server Level is clientside in updateEditToolsServer()!")); - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY, null).orElseThrow(() -> LOGGER.throwing(new IllegalStateException("EditTools Capability is empty in updateEditToolsServer()!"))); + IEditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); //Gets whether the end of the selection-box (pos2) is lesser or greater than the origin-point (pos1) boolean signX = pos1.getX() < pos2.getX(); @@ -639,7 +639,7 @@ public static void updateCursorEntity(ServerPlayer player, Vec3 newPosition, flo */ public static void removeCursorEntity(ServerPlayer player, boolean rejected) { - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY, null).orElseThrow(() -> LOGGER.throwing(new IllegalStateException("EditTools Capability is empty in removeCursorEntity()!"))); + IEditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); if(cap.getEditCursorID() != null) { diff --git a/src/main/java/com/mraof/minestuck/data/MSAdvancementProvider.java b/src/main/java/com/mraof/minestuck/data/MSAdvancementProvider.java index 2b54049c3c..e70e6a09a8 100644 --- a/src/main/java/com/mraof/minestuck/data/MSAdvancementProvider.java +++ b/src/main/java/com/mraof/minestuck/data/MSAdvancementProvider.java @@ -15,7 +15,7 @@ import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.AdvancementRequirements; -import net.minecraft.advancements.FrameType; +import net.minecraft.advancements.AdvancementType; import net.minecraft.advancements.critereon.*; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; @@ -75,31 +75,81 @@ public static DataProvider create(PackOutput output, CompletableFuture saver, ExistingFileHelper existingFileHelper) { - AdvancementHolder root = Advancement.Builder.advancement().display(MSItems.RAW_CRUXITE.get(), Component.translatable(title(ROOT)), Component.translatable(desc(ROOT)), new ResourceLocation("minestuck:textures/gui/advancement_bg.png"), FrameType.TASK, false, false, false).addCriterion("raw_cruxite", InventoryChangeTrigger.TriggerInstance.hasItems(MSItems.RAW_CRUXITE.get())).save(saver, save_loc(ROOT)); - AdvancementHolder searching = Advancement.Builder.advancement().parent(root).display(Items.COMPASS, Component.translatable(title(SEARCHING)), Component.translatable(desc(SEARCHING)), null, FrameType.TASK, true, true, false).addCriterion("possess_scanner", InventoryChangeTrigger.TriggerInstance.hasItems(MSItems.TEMPLE_SCANNER.get())).save(saver, save_loc(SEARCHING)); - AdvancementHolder longTimeComing = Advancement.Builder.advancement().parent(root).display(MSItems.SBURB_CODE.get(), Component.translatable(title(LONG_TIME_COMING)), Component.translatable(desc(LONG_TIME_COMING)), null, FrameType.TASK, true, true, false).addCriterion("possess_code", InventoryChangeTrigger.TriggerInstance.hasItems(MSItems.SBURB_CODE.get())).save(saver, save_loc(LONG_TIME_COMING)); - AdvancementHolder connect = Advancement.Builder.advancement().parent(root).display(MSItems.CLIENT_DISK.get(), Component.translatable(title(CONNECT)), Component.translatable(desc(CONNECT)), null, FrameType.TASK, true, true, false).addCriterion("connection", EventTrigger.Instance.sburbConnection()).save(saver, save_loc(CONNECT)); - AdvancementHolder entry = Advancement.Builder.advancement().parent(connect).display(ColorHandler.setDefaultColor(new ItemStack(MSItems.CRUXITE_APPLE.get())), Component.translatable(title(ENTRY)), Component.translatable(desc(ENTRY)), null, FrameType.TASK, true, true, false).addCriterion("use_artifact", EventTrigger.Instance.cruxiteArtifact()).save(saver, save_loc(ENTRY)); - AdvancementHolder alchemy = Advancement.Builder.advancement().parent(entry).display(MSItems.CAPTCHA_CARD.get(), Component.translatable(title(ALCHEMY)), Component.translatable(desc(ALCHEMY)), null, FrameType.TASK, true, true, false).addCriterion("use_punch_designix", PunchDesignixTrigger.Instance.any()).save(saver, save_loc(ALCHEMY)); - AdvancementHolder newModus = Advancement.Builder.advancement().parent(alchemy).display(MSItems.HASHMAP_MODUS_CARD.get(), Component.translatable(title(NEW_MODUS)), Component.translatable(desc(NEW_MODUS)), null, FrameType.TASK, true, true, false).addCriterion("change_modus_type", ChangeModusTrigger.Instance.any()).save(saver, save_loc(NEW_MODUS)); - AdvancementHolder allModi = changeModusCriteria(Advancement.Builder.advancement().parent(newModus).display(MSItems.QUEUESTACK_MODUS_CARD.get(), Component.translatable(title(ALL_MODI)), Component.translatable(desc(ALL_MODI)), null, FrameType.GOAL, true, true, false).requirements(AdvancementRequirements.Strategy.AND)).save(saver, save_loc(ALL_MODI)); - AdvancementHolder goldSeeds = Advancement.Builder.advancement().parent(alchemy).display(MSBlocks.GOLD_SEEDS.get(), Component.translatable(title(GOLD_SEEDS)), Component.translatable(desc(GOLD_SEEDS)), null, FrameType.TASK, true, true, false).addCriterion("plant_gold_seeds", ItemUsedOnLocationTrigger.TriggerInstance.placedBlock(MSBlocks.GOLD_SEEDS.get())).save(saver, save_loc(GOLD_SEEDS)); - AdvancementHolder melonOverload = Advancement.Builder.advancement().parent(alchemy).display(MSItems.MELONSBANE.get(), Component.translatable(title(MELON_OVERLOAD)), Component.translatable(desc(MELON_OVERLOAD)), null, FrameType.TASK, true, true, true).addCriterion("melon_overload", EventTrigger.Instance.melonOverload()).save(saver, save_loc(MELON_OVERLOAD)); - AdvancementHolder treeModus = Advancement.Builder.advancement().parent(newModus).display(MSItems.TREE_MODUS_CARD.get(), Component.translatable(title(TREE_MODUS)), Component.translatable(desc(TREE_MODUS)), null, FrameType.TASK, true, true, false).addCriterion("tree_root", TreeModusRootTrigger.Instance.count(MinMaxBounds.Ints.atLeast(16))).save(saver, save_loc(TREE_MODUS)); - AdvancementHolder killOgre = Advancement.Builder.advancement().parent(entry).display(MSItems.POGO_HAMMER.get(), Component.translatable(title(KILL_OGRE)), Component.translatable(desc(KILL_OGRE)), null, FrameType.TASK, true, true, false).addCriterion("kill_ogre", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(MSEntityTypes.OGRE.get()))).save(saver, save_loc(KILL_OGRE)); - AdvancementHolder returnNode = Advancement.Builder.advancement().parent(entry).display(Items.RED_BED, Component.translatable(title(RETURN_NODE)), Component.translatable(desc(RETURN_NODE)), null, FrameType.TASK, true, true, false).addCriterion("touch_return_node", EventTrigger.Instance.returnNode()).save(saver, save_loc(RETURN_NODE)); - AdvancementHolder dungeon = Advancement.Builder.advancement().parent(returnNode).display(MSBlocks.FROST_BRICKS.get(), Component.translatable(title(DUNGEON)), Component.translatable(desc(DUNGEON)), null, FrameType.TASK, true, true, false).addCriterion("imp_dungeon", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inStructure(MSStructures.IMP_DUNGEON))).save(saver, save_loc(DUNGEON)); - AdvancementHolder commune = Advancement.Builder.advancement().parent(entry).display(MSItems.STONE_TABLET.get(), Component.translatable(title(COMMUNE)), Component.translatable(desc(COMMUNE)), null, FrameType.TASK, true, true, false).requirements(AdvancementRequirements.Strategy.AND).addCriterion("talk_to_consort", ConsortTalkTrigger.Instance.any()).addCriterion("visit_village", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inStructure(MSStructures.CONSORT_VILLAGE))).save(saver, save_loc(COMMUNE)); - AdvancementHolder frenchFry = Advancement.Builder.advancement().parent(commune).display(MSItems.FRENCH_FRY.get(), Component.translatable(title(FRENCH_FRY)), Component.translatable(desc(FRENCH_FRY)), null, FrameType.TASK, true, true, false).addCriterion("has_french_fry", ConsumeItemTrigger.TriggerInstance.usedItem(MSItems.FRENCH_FRY.get())).save(saver, save_loc(FRENCH_FRY)); - AdvancementHolder bugs = consumeBugCriteria(Advancement.Builder.advancement().parent(commune).display(MSItems.CHOCOLATE_BEETLE.get(), Component.translatable(title(BUGS)), Component.translatable(desc(BUGS)), null, FrameType.TASK, true, true, false).requirements(AdvancementRequirements.Strategy.OR)).save(saver, save_loc(BUGS)); - AdvancementHolder shadyBuyer = Advancement.Builder.advancement().parent(commune).display(MSItems.ROCK_COOKIE.get(), Component.translatable(title(SHADY_BUYER)), Component.translatable(desc(SHADY_BUYER)), null, FrameType.TASK, true, true, false).addCriterion("buy_item", ConsortItemTrigger.Instance.forType(EnumConsort.MerchantType.SHADY)).save(saver, save_loc(SHADY_BUYER)); - AdvancementHolder firstStep = Advancement.Builder.advancement().parent(root).display(BoondollarsItem.setCount(new ItemStack(MSItems.BOONDOLLARS.get()), 1), Component.translatable(title(FIRST_STEP)), Component.translatable(desc(FIRST_STEP)), null, FrameType.TASK, true, true, false).addCriterion("reach_rung", EcheladderTrigger.Instance.rung(MinMaxBounds.Ints.atLeast(1))).save(saver, save_loc(FIRST_STEP)); - AdvancementHolder doubleDigits = Advancement.Builder.advancement().parent(firstStep).display(BoondollarsItem.setCount(new ItemStack(MSItems.BOONDOLLARS.get()), 100), Component.translatable(title(DOUBLE_DIGITS)), Component.translatable(desc(DOUBLE_DIGITS)), null, FrameType.TASK, true, true, false).addCriterion("reach_rung", EcheladderTrigger.Instance.rung(MinMaxBounds.Ints.atLeast(10))).save(saver, save_loc(DOUBLE_DIGITS)); - AdvancementHolder halfwayPoint = Advancement.Builder.advancement().parent(doubleDigits).display(BoondollarsItem.setCount(new ItemStack(MSItems.BOONDOLLARS.get()), 1000), Component.translatable(title(HALFWAY_POINT)), Component.translatable(desc(HALFWAY_POINT)), null, FrameType.TASK, true, true, false).addCriterion("reach_rung", EcheladderTrigger.Instance.rung(MinMaxBounds.Ints.atLeast(25))).save(saver, save_loc(HALFWAY_POINT)); - AdvancementHolder bigOneMil = Advancement.Builder.advancement().parent(halfwayPoint).display(BoondollarsItem.setCount(new ItemStack(MSItems.BOONDOLLARS.get()), 1_000_000), Component.translatable(title(BIG_ONE_MIL)), Component.translatable(desc(BIG_ONE_MIL)), null, FrameType.GOAL, true, true, false).addCriterion("reach_rung", EcheladderTrigger.Instance.rung(MinMaxBounds.Ints.atLeast(44))).save(saver, save_loc(BIG_ONE_MIL)); - AdvancementHolder intellibeam = Advancement.Builder.advancement().parent(alchemy).display(MSItems.INTELLIBEAM_LASERSTATION.get(), Component.translatable(title(INTELLIBEAM)), Component.translatable(desc(INTELLIBEAM)), null, FrameType.TASK, true, true, false).addCriterion("use_intellibeam", IntellibeamLaserstationTrigger.Instance.any()).save(saver, save_loc(INTELLIBEAM)); - AdvancementHolder strongWeapon = Advancement.Builder.advancement().parent(alchemy).display(MSItems.CALEDFWLCH.get(), Component.translatable(title(LEGENDARY_WEAPON)), Component.translatable(desc(LEGENDARY_WEAPON)), null, FrameType.TASK, true, true, false).addCriterion("get_max_tier_weapon", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(MSTags.Items.LEGENDARY).build())).save(saver, save_loc(LEGENDARY_WEAPON)); - AdvancementHolder buyOutShop = Advancement.Builder.advancement().parent(commune).display(MSItems.CONE_OF_FLIES.get(), Component.translatable(title(BUY_OUT_SHOP)), Component.translatable(desc(BUY_OUT_SHOP)), null, FrameType.TASK, true, true, false).addCriterion("buy_everything", EventTrigger.Instance.buyOutShop()).save(saver, save_loc(BUY_OUT_SHOP)); + AdvancementHolder root = Advancement.Builder.advancement() + .display(MSItems.RAW_CRUXITE.get(), Component.translatable(title(ROOT)), Component.translatable(desc(ROOT)), new ResourceLocation("minestuck:textures/gui/advancement_bg.png"), AdvancementType.TASK, false, false, false) + .addCriterion("raw_cruxite", InventoryChangeTrigger.TriggerInstance.hasItems(MSItems.RAW_CRUXITE.get())).save(saver, save_loc(ROOT)); + AdvancementHolder searching = Advancement.Builder.advancement().parent(root) + .display(Items.COMPASS, Component.translatable(title(SEARCHING)), Component.translatable(desc(SEARCHING)), null, AdvancementType.TASK, true, true, false) + .addCriterion("possess_scanner", InventoryChangeTrigger.TriggerInstance.hasItems(MSItems.TEMPLE_SCANNER.get())).save(saver, save_loc(SEARCHING)); + AdvancementHolder longTimeComing = Advancement.Builder.advancement().parent(root) + .display(MSItems.SBURB_CODE.get(), Component.translatable(title(LONG_TIME_COMING)), Component.translatable(desc(LONG_TIME_COMING)), null, AdvancementType.TASK, true, true, false) + .addCriterion("possess_code", InventoryChangeTrigger.TriggerInstance.hasItems(MSItems.SBURB_CODE.get())).save(saver, save_loc(LONG_TIME_COMING)); + AdvancementHolder connect = Advancement.Builder.advancement().parent(root) + .display(MSItems.CLIENT_DISK.get(), Component.translatable(title(CONNECT)), Component.translatable(desc(CONNECT)), null, AdvancementType.TASK, true, true, false) + .addCriterion("connection", EventTrigger.Instance.sburbConnection()).save(saver, save_loc(CONNECT)); + AdvancementHolder entry = Advancement.Builder.advancement().parent(connect) + .display(ColorHandler.setDefaultColor(new ItemStack(MSItems.CRUXITE_APPLE.get())), Component.translatable(title(ENTRY)), Component.translatable(desc(ENTRY)), null, AdvancementType.TASK, true, true, false) + .addCriterion("use_artifact", EventTrigger.Instance.cruxiteArtifact()).save(saver, save_loc(ENTRY)); + AdvancementHolder alchemy = Advancement.Builder.advancement().parent(entry) + .display(MSItems.CAPTCHA_CARD.get(), Component.translatable(title(ALCHEMY)), Component.translatable(desc(ALCHEMY)), null, AdvancementType.TASK, true, true, false) + .addCriterion("use_punch_designix", PunchDesignixTrigger.Instance.any()).save(saver, save_loc(ALCHEMY)); + AdvancementHolder newModus = Advancement.Builder.advancement().parent(alchemy) + .display(MSItems.HASHMAP_MODUS_CARD.get(), Component.translatable(title(NEW_MODUS)), Component.translatable(desc(NEW_MODUS)), null, AdvancementType.TASK, true, true, false) + .addCriterion("change_modus_type", ChangeModusTrigger.Instance.any()).save(saver, save_loc(NEW_MODUS)); + AdvancementHolder allModi = changeModusCriteria(Advancement.Builder.advancement().parent(newModus) + .display(MSItems.QUEUESTACK_MODUS_CARD.get(), Component.translatable(title(ALL_MODI)), Component.translatable(desc(ALL_MODI)), null, AdvancementType.GOAL, true, true, false) + .requirements(AdvancementRequirements.Strategy.AND)).save(saver, save_loc(ALL_MODI)); + AdvancementHolder goldSeeds = Advancement.Builder.advancement().parent(alchemy) + .display(MSBlocks.GOLD_SEEDS.get(), Component.translatable(title(GOLD_SEEDS)), Component.translatable(desc(GOLD_SEEDS)), null, AdvancementType.TASK, true, true, false) + .addCriterion("plant_gold_seeds", ItemUsedOnLocationTrigger.TriggerInstance.placedBlock(MSBlocks.GOLD_SEEDS.get())).save(saver, save_loc(GOLD_SEEDS)); + AdvancementHolder melonOverload = Advancement.Builder.advancement().parent(alchemy) + .display(MSItems.MELONSBANE.get(), Component.translatable(title(MELON_OVERLOAD)), Component.translatable(desc(MELON_OVERLOAD)), null, AdvancementType.TASK, true, true, true) + .addCriterion("melon_overload", EventTrigger.Instance.melonOverload()).save(saver, save_loc(MELON_OVERLOAD)); + AdvancementHolder treeModus = Advancement.Builder.advancement().parent(newModus) + .display(MSItems.TREE_MODUS_CARD.get(), Component.translatable(title(TREE_MODUS)), Component.translatable(desc(TREE_MODUS)), null, AdvancementType.TASK, true, true, false) + .addCriterion("tree_root", TreeModusRootTrigger.Instance.count(MinMaxBounds.Ints.atLeast(16))).save(saver, save_loc(TREE_MODUS)); + AdvancementHolder killOgre = Advancement.Builder.advancement().parent(entry) + .display(MSItems.POGO_HAMMER.get(), Component.translatable(title(KILL_OGRE)), Component.translatable(desc(KILL_OGRE)), null, AdvancementType.TASK, true, true, false) + .addCriterion("kill_ogre", KilledTrigger.TriggerInstance.playerKilledEntity(EntityPredicate.Builder.entity().of(MSEntityTypes.OGRE.get()))).save(saver, save_loc(KILL_OGRE)); + AdvancementHolder returnNode = Advancement.Builder.advancement().parent(entry) + .display(Items.RED_BED, Component.translatable(title(RETURN_NODE)), Component.translatable(desc(RETURN_NODE)), null, AdvancementType.TASK, true, true, false) + .addCriterion("touch_return_node", EventTrigger.Instance.returnNode()).save(saver, save_loc(RETURN_NODE)); + AdvancementHolder dungeon = Advancement.Builder.advancement().parent(returnNode) + .display(MSBlocks.FROST_BRICKS.get(), Component.translatable(title(DUNGEON)), Component.translatable(desc(DUNGEON)), null, AdvancementType.TASK, true, true, false) + .addCriterion("imp_dungeon", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inStructure(MSStructures.IMP_DUNGEON))).save(saver, save_loc(DUNGEON)); + AdvancementHolder commune = Advancement.Builder.advancement().parent(entry) + .display(MSItems.STONE_TABLET.get(), Component.translatable(title(COMMUNE)), Component.translatable(desc(COMMUNE)), null, AdvancementType.TASK, true, true, false) + .requirements(AdvancementRequirements.Strategy.AND).addCriterion("talk_to_consort", ConsortTalkTrigger.Instance.any()).addCriterion("visit_village", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inStructure(MSStructures.CONSORT_VILLAGE))).save(saver, save_loc(COMMUNE)); + AdvancementHolder frenchFry = Advancement.Builder.advancement().parent(commune) + .display(MSItems.FRENCH_FRY.get(), Component.translatable(title(FRENCH_FRY)), Component.translatable(desc(FRENCH_FRY)), null, AdvancementType.TASK, true, true, false) + .addCriterion("has_french_fry", ConsumeItemTrigger.TriggerInstance.usedItem(MSItems.FRENCH_FRY.get())).save(saver, save_loc(FRENCH_FRY)); + AdvancementHolder bugs = consumeBugCriteria(Advancement.Builder.advancement() + .parent(commune).display(MSItems.CHOCOLATE_BEETLE.get(), Component.translatable(title(BUGS)), Component.translatable(desc(BUGS)), null, AdvancementType.TASK, true, true, false) + .requirements(AdvancementRequirements.Strategy.OR)).save(saver, save_loc(BUGS)); + AdvancementHolder shadyBuyer = Advancement.Builder.advancement().parent(commune) + .display(MSItems.ROCK_COOKIE.get(), Component.translatable(title(SHADY_BUYER)), Component.translatable(desc(SHADY_BUYER)), null, AdvancementType.TASK, true, true, false) + .addCriterion("buy_item", ConsortItemTrigger.Instance.forType(EnumConsort.MerchantType.SHADY)).save(saver, save_loc(SHADY_BUYER)); + AdvancementHolder firstStep = Advancement.Builder.advancement().parent(root) + .display(BoondollarsItem.setCount(new ItemStack(MSItems.BOONDOLLARS.get()), 1), Component.translatable(title(FIRST_STEP)), Component.translatable(desc(FIRST_STEP)), null, AdvancementType.TASK, true, true, false) + .addCriterion("reach_rung", EcheladderTrigger.Instance.rung(MinMaxBounds.Ints.atLeast(1))).save(saver, save_loc(FIRST_STEP)); + AdvancementHolder doubleDigits = Advancement.Builder.advancement().parent(firstStep) + .display(BoondollarsItem.setCount(new ItemStack(MSItems.BOONDOLLARS.get()), 100), Component.translatable(title(DOUBLE_DIGITS)), Component.translatable(desc(DOUBLE_DIGITS)), null, AdvancementType.TASK, true, true, false) + .addCriterion("reach_rung", EcheladderTrigger.Instance.rung(MinMaxBounds.Ints.atLeast(10))).save(saver, save_loc(DOUBLE_DIGITS)); + AdvancementHolder halfwayPoint = Advancement.Builder.advancement().parent(doubleDigits) + .display(BoondollarsItem.setCount(new ItemStack(MSItems.BOONDOLLARS.get()), 1000), Component.translatable(title(HALFWAY_POINT)), Component.translatable(desc(HALFWAY_POINT)), null, AdvancementType.TASK, true, true, false) + .addCriterion("reach_rung", EcheladderTrigger.Instance.rung(MinMaxBounds.Ints.atLeast(25))).save(saver, save_loc(HALFWAY_POINT)); + AdvancementHolder bigOneMil = Advancement.Builder.advancement().parent(halfwayPoint) + .display(BoondollarsItem.setCount(new ItemStack(MSItems.BOONDOLLARS.get()), 1_000_000), Component.translatable(title(BIG_ONE_MIL)), Component.translatable(desc(BIG_ONE_MIL)), null, AdvancementType.GOAL, true, true, false) + .addCriterion("reach_rung", EcheladderTrigger.Instance.rung(MinMaxBounds.Ints.atLeast(44))).save(saver, save_loc(BIG_ONE_MIL)); + AdvancementHolder intellibeam = Advancement.Builder.advancement().parent(alchemy) + .display(MSItems.INTELLIBEAM_LASERSTATION.get(), Component.translatable(title(INTELLIBEAM)), Component.translatable(desc(INTELLIBEAM)), null, AdvancementType.TASK, true, true, false) + .addCriterion("use_intellibeam", IntellibeamLaserstationTrigger.Instance.any()).save(saver, save_loc(INTELLIBEAM)); + AdvancementHolder strongWeapon = Advancement.Builder.advancement().parent(alchemy) + .display(MSItems.CALEDFWLCH.get(), Component.translatable(title(LEGENDARY_WEAPON)), Component.translatable(desc(LEGENDARY_WEAPON)), null, AdvancementType.TASK, true, true, false) + .addCriterion("get_max_tier_weapon", InventoryChangeTrigger.TriggerInstance.hasItems(ItemPredicate.Builder.item().of(MSTags.Items.LEGENDARY).build())).save(saver, save_loc(LEGENDARY_WEAPON)); + AdvancementHolder buyOutShop = Advancement.Builder.advancement().parent(commune) + .display(MSItems.CONE_OF_FLIES.get(), Component.translatable(title(BUY_OUT_SHOP)), Component.translatable(desc(BUY_OUT_SHOP)), null, AdvancementType.TASK, true, true, false) + .addCriterion("buy_everything", EventTrigger.Instance.buyOutShop()).save(saver, save_loc(BUY_OUT_SHOP)); } private static Advancement.Builder changeModusCriteria(Advancement.Builder builder) diff --git a/src/main/java/com/mraof/minestuck/data/MinestuckData.java b/src/main/java/com/mraof/minestuck/data/MinestuckData.java index de2ec1e9f5..80c0060535 100644 --- a/src/main/java/com/mraof/minestuck/data/MinestuckData.java +++ b/src/main/java/com/mraof/minestuck/data/MinestuckData.java @@ -1,7 +1,6 @@ package com.mraof.minestuck.data; import com.mraof.minestuck.Minestuck; -import com.mraof.minestuck.advancements.MSCriteriaTriggers; import com.mraof.minestuck.data.dialogue.*; import com.mraof.minestuck.data.loot_table.MSLootModifiers; import com.mraof.minestuck.data.loot_table.MinestuckLootTableProvider; @@ -9,9 +8,7 @@ import com.mraof.minestuck.data.tag.*; import com.mraof.minestuck.data.worldgen.*; import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.core.RegistrySetBuilder; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; @@ -31,16 +28,12 @@ public final class MinestuckData @SubscribeEvent public static void gatherData(GatherDataEvent event) { - MSCriteriaTriggers.register(); - DataGenerator gen = event.getGenerator(); PackOutput output = gen.getPackOutput(); - CompletableFuture lookupProvider = event.getLookupProvider().thenApply(provider -> { - return registrySetBuilder().buildPatch(RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY), provider); - }); ExistingFileHelper fileHelper = event.getExistingFileHelper(); - gen.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider(output, lookupProvider, Set.of(Minestuck.MOD_ID))); + var builtinEntries = gen.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider(output, event.getLookupProvider(), registrySetBuilder(), Set.of(Minestuck.MOD_ID))); + CompletableFuture lookupProvider = builtinEntries.getRegistryProvider(); var blockTags = gen.addProvider(event.includeServer(), new MinestuckBlockTagsProvider(output, lookupProvider, fileHelper)); gen.addProvider(event.includeServer(), new MinestuckItemTagsProvider(output, lookupProvider, blockTags.contentsGetter(), fileHelper)); @@ -54,7 +47,7 @@ public static void gatherData(GatherDataEvent event) gen.addProvider(event.includeServer(), new TitleLandTypeTagsProvider(output, lookupProvider, fileHelper)); gen.addProvider(event.includeServer(), new MSDamageTypeProvider.Tags(output, lookupProvider, fileHelper)); - gen.addProvider(event.includeServer(), new MinestuckRecipeProvider(output, lookupProvider)); + gen.addProvider(event.includeServer(), new MinestuckRecipeProvider(output)); gen.addProvider(event.includeServer(), new GeneratedGristCostConfigProvider(output, Minestuck.MOD_ID)); gen.addProvider(event.includeServer(), new ComputerThemeProvider(output)); diff --git a/src/main/java/com/mraof/minestuck/data/recipe/GeneratedGristCostBuilder.java b/src/main/java/com/mraof/minestuck/data/recipe/GeneratedGristCostBuilder.java index 8730ef130f..04b6cf5625 100644 --- a/src/main/java/com/mraof/minestuck/data/recipe/GeneratedGristCostBuilder.java +++ b/src/main/java/com/mraof/minestuck/data/recipe/GeneratedGristCostBuilder.java @@ -1,15 +1,10 @@ package com.mraof.minestuck.data.recipe; -import com.google.gson.JsonObject; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; +import com.mraof.minestuck.alchemy.recipe.generator.recipe.RecipeGeneratedGristCost; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.RecipeSerializer; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @ParametersAreNonnullByDefault @@ -26,33 +21,6 @@ private GeneratedGristCostBuilder() public void build(RecipeOutput recipeOutput, ResourceLocation id) { - recipeOutput.accept(new GeneratedGristCostBuilder.Result(id.withPrefix("grist_costs/"))); - } - - private record Result(ResourceLocation id) implements FinishedRecipe - { - @Override - public void serializeRecipeData(JsonObject jsonObject) - { - } - - @Override - public ResourceLocation id() - { - return id; - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.RECIPE_GRIST_COST.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + recipeOutput.accept(id.withPrefix("grist_costs/"), new RecipeGeneratedGristCost(), null); } } diff --git a/src/main/java/com/mraof/minestuck/data/recipe/IrradiatingFallbackRecipeBuilder.java b/src/main/java/com/mraof/minestuck/data/recipe/IrradiatingFallbackRecipeBuilder.java index 31c8239726..d14609b245 100644 --- a/src/main/java/com/mraof/minestuck/data/recipe/IrradiatingFallbackRecipeBuilder.java +++ b/src/main/java/com/mraof/minestuck/data/recipe/IrradiatingFallbackRecipeBuilder.java @@ -1,20 +1,12 @@ package com.mraof.minestuck.data.recipe; -import com.google.gson.JsonObject; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; +import com.mraof.minestuck.item.crafting.IrradiatingFallbackRecipe; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.AbstractCookingRecipe; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; -import javax.annotation.Nullable; -import java.util.Objects; - @MethodsReturnNonnullByDefault public class IrradiatingFallbackRecipeBuilder { @@ -32,44 +24,6 @@ public static IrradiatingFallbackRecipeBuilder fallback(RecipeType fallbackType; - - public Result(ResourceLocation id, RecipeType fallbackType) - { - this.id = id; - this.fallbackType = fallbackType; - } - - @Override - public void serializeRecipeData(JsonObject jsonObject) - { - ResourceLocation typeLocation = Objects.requireNonNull(BuiltInRegistries.RECIPE_TYPE.getKey(fallbackType)); - jsonObject.addProperty("fallback_type", typeLocation.toString()); - } - - @Override - public ResourceLocation id() - { - return id; - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.IRRADIATING_FALLBACK.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + recipeOutput.accept(id, new IrradiatingFallbackRecipe(fallbackType), null); } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/data/recipe/IrradiatingRecipeBuilder.java b/src/main/java/com/mraof/minestuck/data/recipe/IrradiatingRecipeBuilder.java index 1d8e045f25..a139f63ec8 100644 --- a/src/main/java/com/mraof/minestuck/data/recipe/IrradiatingRecipeBuilder.java +++ b/src/main/java/com/mraof/minestuck/data/recipe/IrradiatingRecipeBuilder.java @@ -1,19 +1,14 @@ package com.mraof.minestuck.data.recipe; -import com.google.gson.JsonObject; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; +import com.mraof.minestuck.item.crafting.IrradiatingRecipe; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.Criterion; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeBuilder; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.CookingBookCategory; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; import javax.annotation.Nullable; @@ -62,38 +57,6 @@ public Item getResult() @Override public void save(RecipeOutput output, ResourceLocation recipeId) { - output.accept(new Result(recipeId, this.ingredient, this.result, this.experience, this.cookingTime)); - } - - private record Result(ResourceLocation id, Ingredient ingredient, Item result, float experience, int cookingTime) implements FinishedRecipe - { - @Override - public void serializeRecipeData(JsonObject json) - { - json.addProperty("category", CookingBookCategory.MISC.getSerializedName()); - json.add("ingredient", this.ingredient.toJson(false)); - json.addProperty("result", BuiltInRegistries.ITEM.getKey(this.result).toString()); - json.addProperty("experience", this.experience); - json.addProperty("cookingtime", this.cookingTime); - } - - @Override - public ResourceLocation id() - { - return this.id; - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.IRRADIATING.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return null; - } + output.accept(recipeId, new IrradiatingRecipe("", CookingBookCategory.MISC, this.ingredient, this.result.getDefaultInstance(), this.experience, this.cookingTime), null); } } diff --git a/src/main/java/com/mraof/minestuck/data/recipe/MinestuckCombinationsProvider.java b/src/main/java/com/mraof/minestuck/data/recipe/MinestuckCombinationsProvider.java index 83e80954d9..88a3e5d228 100644 --- a/src/main/java/com/mraof/minestuck/data/recipe/MinestuckCombinationsProvider.java +++ b/src/main/java/com/mraof/minestuck/data/recipe/MinestuckCombinationsProvider.java @@ -213,12 +213,12 @@ public static void buildRecipes(RecipeOutput consumer) CombinationRecipeBuilder.of(Items.OCHRE_FROGLIGHT).input(Items.MAGMA_CREAM).or().input(Items.GRASS_BLOCK).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.ECHO_SHARD).input(Items.SCULK).or().input(Items.DIAMOND).buildFor(consumer, Minestuck.MOD_ID); //Plants - CombinationRecipeBuilder.of(Items.GRASS_BLOCK).input(Items.DIRT).and().namedInput(Items.GRASS).buildFor(consumer, Minestuck.MOD_ID); + CombinationRecipeBuilder.of(Items.GRASS_BLOCK).input(Items.DIRT).and().namedInput(Items.SHORT_GRASS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.GRASS_BLOCK).input(Items.DIRT).and().namedInput(Items.WHEAT_SEEDS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.MUD).input(Items.DIRT).and().namedInput(Items.WATER_BUCKET).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.MYCELIUM).input(Items.GRASS_BLOCK).and().input(Tags.Items.MUSHROOMS).buildFor(consumer, Minestuck.MOD_ID); - CombinationRecipeBuilder.of(Items.CACTUS).input(Items.SAND).and().input(Items.GRASS).buildFor(consumer, Minestuck.MOD_ID); - CombinationRecipeBuilder.of(Items.DEAD_BUSH).input(Items.SAND).or().namedInput(Items.GRASS).buildFor(consumer, Minestuck.MOD_ID); + CombinationRecipeBuilder.of(Items.CACTUS).input(Items.SAND).and().input(Items.SHORT_GRASS).buildFor(consumer, Minestuck.MOD_ID); + CombinationRecipeBuilder.of(Items.DEAD_BUSH).input(Items.SAND).or().namedInput(Items.SHORT_GRASS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.DEAD_BUSH).input(Items.SAND).or().namedInput(ItemTags.SAPLINGS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.LILY_PAD).input(ItemTags.LEAVES).or().input(Items.WATER_BUCKET).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.VINE).input(ItemTags.LEAVES).and().input(Items.LADDER).buildFor(consumer, Minestuck.MOD_ID); @@ -230,9 +230,9 @@ public static void buildRecipes(RecipeOutput consumer) CombinationRecipeBuilder.of(Items.FLOWERING_AZALEA_LEAVES).input(ItemTags.FLOWERS).and().input(Items.AZALEA_LEAVES).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.BIG_DRIPLEAF).input(Items.BONE_MEAL).or().input(Items.SMALL_DRIPLEAF).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.SMALL_DRIPLEAF).input(Items.SPYGLASS).or().input(Items.LILY_PAD).buildFor(consumer, Minestuck.MOD_ID); - CombinationRecipeBuilder.of(Items.MOSS_BLOCK).input(Items.GRASS_BLOCK).or().input(Items.GRASS).buildFor(consumer, Minestuck.MOD_ID); + CombinationRecipeBuilder.of(Items.MOSS_BLOCK).input(Items.GRASS_BLOCK).or().input(Items.SHORT_GRASS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.ROOTED_DIRT).input(Items.VINE).and().input(Items.DIRT).buildFor(consumer, Minestuck.MOD_ID); - CombinationRecipeBuilder.of(Items.MOSS_CARPET).input(Items.GRASS_BLOCK).and().input(Items.GRASS).buildFor(consumer, Minestuck.MOD_ID); + CombinationRecipeBuilder.of(Items.MOSS_CARPET).input(Items.GRASS_BLOCK).and().input(Items.SHORT_GRASS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.SPORE_BLOSSOM).input(Items.LILY_PAD).or().input(Items.BONE_MEAL).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.GLOW_BERRIES).input(Items.GLOWSTONE_DUST).and().input(Items.SWEET_BERRIES).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.GLOW_LICHEN).input(Items.GLOWSTONE_DUST).or().input(Items.VINE).buildFor(consumer, Minestuck.MOD_ID); @@ -289,8 +289,8 @@ public static void buildRecipes(RecipeOutput consumer) CombinationRecipeBuilder.of(Items.GLOWSTONE).input(Items.NETHERRACK).and().input(Items.GLOWSTONE_DUST).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.CRIMSON_STEM).input(ItemTags.LOGS).or().input(Items.CRIMSON_FUNGUS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.WARPED_STEM).input(ItemTags.LOGS).or().input(Items.WARPED_FUNGUS).buildFor(consumer, Minestuck.MOD_ID); - CombinationRecipeBuilder.of(Items.CRIMSON_ROOTS).input(Items.GRASS).or().input(Items.CRIMSON_FUNGUS).buildFor(consumer, Minestuck.MOD_ID); - CombinationRecipeBuilder.of(Items.WARPED_ROOTS).input(Items.GRASS).or().input(Items.WARPED_FUNGUS).buildFor(consumer, Minestuck.MOD_ID); + CombinationRecipeBuilder.of(Items.CRIMSON_ROOTS).input(Items.SHORT_GRASS).or().input(Items.CRIMSON_FUNGUS).buildFor(consumer, Minestuck.MOD_ID); + CombinationRecipeBuilder.of(Items.WARPED_ROOTS).input(Items.SHORT_GRASS).or().input(Items.WARPED_FUNGUS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.WEEPING_VINES).input(Items.VINE).and().input(Items.CRIMSON_ROOTS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.TWISTING_VINES).input(Items.VINE).and().input(Items.WARPED_ROOTS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.CRIMSON_NYLIUM).input(Items.MYCELIUM).or().input(Items.CRIMSON_FUNGUS).buildFor(consumer, Minestuck.MOD_ID); @@ -336,7 +336,7 @@ public static void buildRecipes(RecipeOutput consumer) CombinationRecipeBuilder.of(Items.GOLDEN_HORSE_ARMOR).input(Items.GOLD_INGOT).and().input(Items.SADDLE).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.IRON_HORSE_ARMOR).input(Items.IRON_INGOT).and().input(Items.SADDLE).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.SADDLE).input(Items.STRING).and().input(Items.LEATHER).buildFor(consumer, Minestuck.MOD_ID); - CombinationRecipeBuilder.of(Items.SHEARS).input(Items.IRON_INGOT).and().input(Items.GRASS).buildFor(consumer, Minestuck.MOD_ID); + CombinationRecipeBuilder.of(Items.SHEARS).input(Items.IRON_INGOT).and().input(Items.SHORT_GRASS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.FIRE_CHARGE).input(Items.BLAZE_POWDER).or().input(Items.GUNPOWDER).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.BOW).input(Items.WOODEN_SWORD).or().input(Items.ARROW).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(Items.FLOWER_POT).input(ItemTags.SMALL_FLOWERS).and().input(Items.BRICK).buildFor(consumer, Minestuck.MOD_ID); @@ -865,7 +865,7 @@ public static void buildRecipes(RecipeOutput consumer) CombinationRecipeBuilder.of(MSBlocks.CHIPBOARD).input(ItemTags.LOGS).and().input(Items.COBBLESTONE).build(consumer); CombinationRecipeBuilder.of(MSBlocks.WOOD_SHAVINGS).input(ItemTags.LOGS).or().namedInput(Items.STONECUTTER).build(consumer); CombinationRecipeBuilder.of(MSBlocks.WOOD_SHAVINGS).input(ItemTags.LOGS).or().namedInput(MSItems.CARVING_TOOL).build(consumer); - CombinationRecipeBuilder.of(MSBlocks.WOODEN_GRASS).input(ItemTags.PLANKS).or().input(Items.GRASS).build(consumer); + CombinationRecipeBuilder.of(MSBlocks.WOODEN_GRASS).input(ItemTags.PLANKS).or().input(Items.SHORT_GRASS).build(consumer); CombinationRecipeBuilder.of(MSItems.CARVED_BUSH).input(MSItems.UNCARVED_WOOD).or().namedInput(ItemTags.SAPLINGS).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(MSItems.CARVED_BUSH).input(MSItems.UNCARVED_WOOD).or().namedInput(ItemTags.LEAVES).buildFor(consumer, Minestuck.MOD_ID); CombinationRecipeBuilder.of(MSBlocks.TREATED_UNCARVED_WOOD).input(MSItems.UNCARVED_WOOD).or().input(MSItems.MOLTEN_AMBER_BUCKET).build(consumer); diff --git a/src/main/java/com/mraof/minestuck/data/recipe/MinestuckGristCostsProvider.java b/src/main/java/com/mraof/minestuck/data/recipe/MinestuckGristCostsProvider.java index ea982de765..ac787dfbef 100644 --- a/src/main/java/com/mraof/minestuck/data/recipe/MinestuckGristCostsProvider.java +++ b/src/main/java/com/mraof/minestuck/data/recipe/MinestuckGristCostsProvider.java @@ -168,7 +168,7 @@ public static void buildRecipes(RecipeOutput recipeSaver) GristCostRecipeBuilder.of(Items.BROWN_MUSHROOM).grist(IODINE, 5).buildFor(recipeSaver, Minestuck.MOD_ID); GristCostRecipeBuilder.of(Items.RED_MUSHROOM).grist(IODINE, 3).grist(RUBY, 1).buildFor(recipeSaver, Minestuck.MOD_ID); GristCostRecipeBuilder.of(Items.CACTUS).grist(AMBER, 4).grist(IODINE, 1).buildFor(recipeSaver, Minestuck.MOD_ID); - GristCostRecipeBuilder.of(Items.GRASS).grist(BUILD, 1).buildFor(recipeSaver, Minestuck.MOD_ID); + GristCostRecipeBuilder.of(Items.SHORT_GRASS).grist(BUILD, 1).buildFor(recipeSaver, Minestuck.MOD_ID); GristCostRecipeBuilder.of(Items.FERN).grist(BUILD, 1).buildFor(recipeSaver, Minestuck.MOD_ID); GristCostRecipeBuilder.of(Items.VINE).grist(BUILD, 2).grist(AMBER, 1).buildFor(recipeSaver, Minestuck.MOD_ID); GristCostRecipeBuilder.of(Items.LILY_PAD).grist(AMBER, 4).grist(IODINE, 1).buildFor(recipeSaver, Minestuck.MOD_ID); diff --git a/src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java b/src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java index ef5df7f3ad..403f31bf68 100644 --- a/src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java +++ b/src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java @@ -10,7 +10,6 @@ import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.InventoryChangeTrigger; -import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; @@ -24,15 +23,14 @@ import javax.annotation.ParametersAreNonnullByDefault; import java.util.Objects; -import java.util.concurrent.CompletableFuture; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class MinestuckRecipeProvider extends RecipeProvider { - public MinestuckRecipeProvider(PackOutput output, CompletableFuture lookupProvider) + public MinestuckRecipeProvider(PackOutput output) { - super(output, lookupProvider); + super(output); } @Override diff --git a/src/main/java/com/mraof/minestuck/data/recipe/NonMirroredRecipeBuilder.java b/src/main/java/com/mraof/minestuck/data/recipe/NonMirroredRecipeBuilder.java index 46090cae37..0bc938b24c 100644 --- a/src/main/java/com/mraof/minestuck/data/recipe/NonMirroredRecipeBuilder.java +++ b/src/main/java/com/mraof/minestuck/data/recipe/NonMirroredRecipeBuilder.java @@ -1,16 +1,15 @@ package com.mraof.minestuck.data.recipe; -import com.google.gson.JsonObject; -import com.mraof.minestuck.item.crafting.MSRecipeTypes; +import com.mraof.minestuck.item.crafting.NonMirroredRecipe; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; -import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.level.ItemLike; import net.neoforged.neoforge.common.conditions.ICondition; @@ -48,40 +47,12 @@ public Advancement.Builder advancement() } @Override - public void accept(FinishedRecipe finishedRecipe, ICondition... conditions) + public void accept(ResourceLocation id, Recipe recipe, @Nullable AdvancementHolder advancement, ICondition... conditions) { - recipeOutput.accept(new ResultWrapper(finishedRecipe), conditions); + if(recipe instanceof ShapedRecipe shapedRecipe) + recipeOutput.accept(id, new NonMirroredRecipe(shapedRecipe), advancement, conditions); } }, recipeName); } - - private record ResultWrapper(FinishedRecipe shapedRecipe) implements FinishedRecipe - { - - @Override - public void serializeRecipeData(JsonObject jsonObject) - { - shapedRecipe.serializeRecipeData(jsonObject); - } - - @Override - public ResourceLocation id() - { - return shapedRecipe.id(); - } - - @Override - public RecipeSerializer type() - { - return MSRecipeTypes.NON_MIRRORED.get(); - } - - @Nullable - @Override - public AdvancementHolder advancement() - { - return this.shapedRecipe.advancement(); - } - } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/effects/CreativeShockEffect.java b/src/main/java/com/mraof/minestuck/effects/CreativeShockEffect.java index 58d47ec06c..e8ed0b40dc 100644 --- a/src/main/java/com/mraof/minestuck/effects/CreativeShockEffect.java +++ b/src/main/java/com/mraof/minestuck/effects/CreativeShockEffect.java @@ -2,26 +2,26 @@ import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.item.artifact.CruxiteArtifactItem; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.StopCreativeShockEffectPacket; import com.mraof.minestuck.util.MSTags; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.EnderpearlItem; -import net.minecraft.world.item.ItemStack; import net.neoforged.bus.api.EventPriority; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.common.EffectCure; import net.neoforged.neoforge.event.TickEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.event.level.ExplosionEvent; +import net.neoforged.neoforge.network.PacketDistributor; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; /** * This is an adapted version of Cibernet's code in Minestuck Universe, credit goes to him! @@ -67,9 +67,9 @@ public static void stopElytraFlying(Player player, int survivalAmplifierThreshol } @Override - public List getCurativeItems() + public void fillEffectCures(Set cures, MobEffectInstance effectInstance) { - return new ArrayList<>(); //prevent milk from curing creative shock + //prevent milk from curing creative shock } @Override @@ -162,6 +162,6 @@ public static void onEffectEnd(ServerPlayer serverPlayerEntity) serverPlayerEntity.getAbilities().mayBuild = !serverPlayerEntity.gameMode.getGameModeForPlayer().isBlockPlacingRestricted(); //block placing restricted was hasLimitedInteractions(), mayBuild was allowEdit StopCreativeShockEffectPacket packet = new StopCreativeShockEffectPacket(serverPlayerEntity.gameMode.getGameModeForPlayer().isBlockPlacingRestricted()); - MSPacketHandler.sendToPlayer(packet, serverPlayerEntity); + PacketDistributor.PLAYER.with(serverPlayerEntity).send(packet); } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/entity/DecoyEntity.java b/src/main/java/com/mraof/minestuck/entity/DecoyEntity.java index 297005179c..4d6291ac54 100644 --- a/src/main/java/com/mraof/minestuck/entity/DecoyEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/DecoyEntity.java @@ -4,8 +4,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.DamageTypeTags; @@ -19,14 +17,13 @@ import net.minecraft.world.level.GameType; import net.minecraft.world.level.Level; import net.neoforged.neoforge.common.util.FakePlayer; -import net.neoforged.neoforge.entity.IEntityAdditionalSpawnData; -import net.neoforged.neoforge.network.NetworkHooks; +import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.UUID; -public class DecoyEntity extends Mob implements IEntityAdditionalSpawnData +public class DecoyEntity extends Mob implements IEntityWithComplexSpawn { private static final Logger LOGGER = LogManager.getLogger(); @@ -43,9 +40,9 @@ public class DecoyEntity extends Mob implements IEntityAdditionalSpawnData public Inventory inventory; - public DecoyEntity(Level level) + public DecoyEntity(EntityType type, Level level) { - super(MSEntityTypes.PLAYER_DECOY.get(), level); + super(type, level); inventory = new Inventory(null); if(!level.isClientSide) //If not spawned the way it should markedForDespawn = true; @@ -150,12 +147,6 @@ public void readSpawnData(FriendlyByteBuf additionalData) yBodyRot = getYRot(); } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - public UUID getPlayerID() { return playerId; diff --git a/src/main/java/com/mraof/minestuck/entity/LotusFlowerEntity.java b/src/main/java/com/mraof/minestuck/entity/LotusFlowerEntity.java index 7d5e8477be..17cb282efa 100644 --- a/src/main/java/com/mraof/minestuck/entity/LotusFlowerEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/LotusFlowerEntity.java @@ -3,7 +3,6 @@ import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.item.loot.MSLootTables; import com.mraof.minestuck.network.LotusFlowerPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.util.MSSoundEvents; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.particles.ParticleTypes; @@ -11,8 +10,6 @@ import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; @@ -26,8 +23,8 @@ import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.phys.Vec3; -import net.neoforged.neoforge.entity.IEntityAdditionalSpawnData; -import net.neoforged.neoforge.network.NetworkHooks; +import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import software.bernie.geckolib.animatable.GeoEntity; @@ -47,7 +44,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public class LotusFlowerEntity extends LivingEntity implements GeoEntity, IEntityAdditionalSpawnData +public class LotusFlowerEntity extends LivingEntity implements GeoEntity, IEntityWithComplexSpawn { private static final Logger LOGGER = LogManager.getLogger(); @@ -203,7 +200,7 @@ protected void updateAndSendAnimation(Animation animation) { this.animationType = animation; LotusFlowerPacket packet = LotusFlowerPacket.createPacket(this, animation); //this packet allows information to be exchanged between server and client where one side cant access the other easily or reliably - MSPacketHandler.sendToTracking(packet, this); + PacketDistributor.TRACKING_ENTITY.with(this).send(packet); } /** @@ -259,12 +256,6 @@ public void readSpawnData(FriendlyByteBuf additionalData) animationType = Animation.values()[additionalData.readInt()]; } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - public void setAnimationFromPacket(Animation newAnimation) { if(level().isClientSide) //allows client-side effects tied to server-side events diff --git a/src/main/java/com/mraof/minestuck/entity/MSEntityTypes.java b/src/main/java/com/mraof/minestuck/entity/MSEntityTypes.java index 1efaccb04b..22186201a6 100644 --- a/src/main/java/com/mraof/minestuck/entity/MSEntityTypes.java +++ b/src/main/java/com/mraof/minestuck/entity/MSEntityTypes.java @@ -49,7 +49,7 @@ public final class MSEntityTypes public static final Supplier> GRIST = REGISTER.register("grist", () -> EntityType.Builder.of(GristEntity::new, MobCategory.MISC).sized(1 / 3F, 1 / 3F).setTrackingRange(4).setUpdateInterval(20).build(new ResourceLocation(Minestuck.MOD_ID, "grist").toString())); public static final Supplier> VITALITY_GEL = REGISTER.register("vitality_gel", () -> EntityType.Builder.of(VitalityGelEntity::new, MobCategory.MISC).sized(1 / 4F, 1 / 4F).setTrackingRange(4).setUpdateInterval(20).build(new ResourceLocation(Minestuck.MOD_ID, "vitality_gel").toString())); - public static final Supplier> PLAYER_DECOY = REGISTER.register("player_decoy", () -> EntityType.Builder.createNothing(MobCategory.MISC).setCustomClientFactory((spawnEntity, world) -> new DecoyEntity(world)).noSave().noSummon().build(new ResourceLocation(Minestuck.MOD_ID, "player_decoy").toString())); + public static final Supplier> PLAYER_DECOY = REGISTER.register("player_decoy", () -> EntityType.Builder.of(DecoyEntity::new, MobCategory.MISC).noSave().noSummon().build(new ResourceLocation(Minestuck.MOD_ID, "player_decoy").toString())); public static final Supplier> SERVER_CURSOR = REGISTER.register("server_cursor", () -> EntityType.Builder.of(ServerCursorEntity::new, MobCategory.MISC).noSave().noSummon().sized(0.1F, 0.1F).setShouldReceiveVelocityUpdates(false).setTrackingRange(4).fireImmune().build(new ResourceLocation(Minestuck.MOD_ID, "server_cursor").toString())); public static final Supplier> METAL_BOAT = REGISTER.register("metal_boat", () -> EntityType.Builder.of(MetalBoatEntity::new, MobCategory.MISC).sized(1.375F, 0.5625F).build(new ResourceLocation(Minestuck.MOD_ID, "metal_boat").toString())); diff --git a/src/main/java/com/mraof/minestuck/entity/ServerCursorEntity.java b/src/main/java/com/mraof/minestuck/entity/ServerCursorEntity.java index cc967a7003..2cd40a9397 100644 --- a/src/main/java/com/mraof/minestuck/entity/ServerCursorEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/ServerCursorEntity.java @@ -1,11 +1,8 @@ package com.mraof.minestuck.entity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.ServerCursorPacket; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.HumanoidArm; @@ -13,8 +10,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; -import net.neoforged.neoforge.entity.IEntityAdditionalSpawnData; -import net.neoforged.neoforge.network.NetworkHooks; +import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; +import net.neoforged.neoforge.network.PacketDistributor; import software.bernie.geckolib.animatable.GeoEntity; import software.bernie.geckolib.core.animatable.GeoAnimatable; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; @@ -28,7 +25,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public class ServerCursorEntity extends LivingEntity implements GeoEntity, IEntityAdditionalSpawnData +public class ServerCursorEntity extends LivingEntity implements GeoEntity, IEntityWithComplexSpawn { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -86,12 +83,6 @@ public void readSpawnData(FriendlyByteBuf additionalData) animationType = AnimationType.values()[additionalData.readInt()]; } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - @Override public void aiStep() { @@ -172,7 +163,7 @@ public void setAnimation(AnimationType animation) if(!removalFlag) this.despawnTimer = 0; ServerCursorPacket packet = ServerCursorPacket.createPacket(this, animation); //this packet allows information to be exchanged between server and client where one side cant access the other easily or reliably - MSPacketHandler.sendToTracking(packet, this); + PacketDistributor.TRACKING_ENTITY.with(this).send(packet); } else setAnimationFromPacket(animation); } diff --git a/src/main/java/com/mraof/minestuck/entity/carapacian/PawnEntity.java b/src/main/java/com/mraof/minestuck/entity/carapacian/PawnEntity.java index c3861cec90..b9238bcec3 100644 --- a/src/main/java/com/mraof/minestuck/entity/carapacian/PawnEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/carapacian/PawnEntity.java @@ -194,7 +194,7 @@ protected void populateDefaultEquipmentSlots(RandomSource random, DifficultyInst @Override public void performRangedAttack(LivingEntity target, float distanceFactor) { - Arrow arrow = new Arrow(this.level(), this); + Arrow arrow = new Arrow(this.level(), this, new ItemStack(Items.ARROW)); double d0 = target.getX() - this.getX(); double d1 = target.getBoundingBox().minY + (double) (target.getBbHeight() / 3.0F) - arrow.getY(); double d2 = target.getZ() - this.getZ(); diff --git a/src/main/java/com/mraof/minestuck/entity/consort/ConsortEntity.java b/src/main/java/com/mraof/minestuck/entity/consort/ConsortEntity.java index 8182c2d9fb..3dbe804c17 100644 --- a/src/main/java/com/mraof/minestuck/entity/consort/ConsortEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/consort/ConsortEntity.java @@ -170,7 +170,7 @@ protected InteractionResult mobInteract(Player player, InteractionHand hand) this.dialogueComponent.tryStartDialogue(serverPlayer); this.dialogueComponent.getStartingDialogue().ifPresent(dialogueId -> { - MSCriteriaTriggers.CONSORT_TALK.trigger(serverPlayer, dialogueId.toString(), this); + MSCriteriaTriggers.CONSORT_TALK.get().trigger(serverPlayer, dialogueId.toString(), this); if(ticksUntilDialogueReset == 0) ticksUntilDialogueReset = 24000 + level().random.nextInt(24000); }); diff --git a/src/main/java/com/mraof/minestuck/entity/dialogue/DialogueComponent.java b/src/main/java/com/mraof/minestuck/entity/dialogue/DialogueComponent.java index 67863f9082..581e1602ee 100644 --- a/src/main/java/com/mraof/minestuck/entity/dialogue/DialogueComponent.java +++ b/src/main/java/com/mraof/minestuck/entity/dialogue/DialogueComponent.java @@ -2,7 +2,6 @@ import com.mojang.datafixers.util.Pair; import com.mraof.minestuck.network.DialoguePackets; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.util.MSCapabilities; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.*; @@ -13,6 +12,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -252,8 +252,8 @@ private void closeCurrentDialogue(UUID playerId) if(player == null) return; - if(player.getCapability(MSCapabilities.CURRENT_DIALOGUE).orElseThrow(IllegalStateException::new).lastTalkedTo(this.entity)) - MSPacketHandler.sendToPlayer(new DialoguePackets.CloseScreen(), player); + if(player.getData(MSCapabilities.CURRENT_DIALOGUE_ATTACHMENT.get()).lastTalkedTo(this.entity)) + PacketDistributor.PLAYER.with(player).send(new DialoguePackets.CloseScreen()); } public void tryStartDialogue(ServerPlayer player) @@ -282,8 +282,7 @@ public void tryOpenScreenForDialogue(ServerPlayer serverPlayer, ResourceLocation public void openScreenForDialogue(ServerPlayer player, ResourceLocation dialogueId, Dialogue.NodeSelector dialogue, @Nullable Dialogue.NextDialogue source) { - CurrentDialogue dialogueData = player.getCapability(MSCapabilities.CURRENT_DIALOGUE) - .orElseThrow(IllegalStateException::new); + CurrentDialogue dialogueData = player.getData(MSCapabilities.CURRENT_DIALOGUE_ATTACHMENT.get()); dialogueData.getComponent(player.level()).ifPresent(oldComponent -> oldComponent.clearOngoingDialogue(player)); Pair node = dialogue.pickNode(this.entity, player); @@ -292,7 +291,7 @@ public void openScreenForDialogue(ServerPlayer player, ResourceLocation dialogue this.ongoingDialogue.put(player.getUUID(), new OngoingDialogue(nodeReference, player.position())); DialoguePackets.OpenScreen packet = new DialoguePackets.OpenScreen(dialogueData.newDialogue(this.entity), data); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } public Optional validateAndGetCurrentNode(ServerPlayer player) diff --git a/src/main/java/com/mraof/minestuck/entity/dialogue/Trigger.java b/src/main/java/com/mraof/minestuck/entity/dialogue/Trigger.java index a0c3db809e..bbdd7d956f 100644 --- a/src/main/java/com/mraof/minestuck/entity/dialogue/Trigger.java +++ b/src/main/java/com/mraof/minestuck/entity/dialogue/Trigger.java @@ -28,7 +28,6 @@ import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; -import net.neoforged.neoforge.network.NetworkHooks; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -133,7 +132,7 @@ public void triggerEffect(LivingEntity entity, ServerPlayer player) consortEntity.stocks = new ConsortMerchantInventory(consortEntity, ConsortRewardHandler.generateStock(this.lootTable, consortEntity, consortEntity.level().random)); } - NetworkHooks.openScreen(player, new SimpleMenuProvider(consortEntity, Component.literal("Consort shop")), consortEntity::writeShopMenuBuffer); + player.openMenu(new SimpleMenuProvider(consortEntity, Component.literal("Consort shop")), consortEntity::writeShopMenuBuffer); } } } @@ -345,7 +344,7 @@ public void triggerEffect(LivingEntity entity, ServerPlayer player) { player.spawnAtLocation(itemstack, 0.0F); if(entity instanceof ConsortEntity consortEntity) - MSCriteriaTriggers.CONSORT_ITEM.trigger(player, lootTable.toString(), itemstack, consortEntity); + MSCriteriaTriggers.CONSORT_ITEM.get().trigger(player, lootTable.toString(), itemstack, consortEntity); } } } diff --git a/src/main/java/com/mraof/minestuck/entity/dialogue/condition/Condition.java b/src/main/java/com/mraof/minestuck/entity/dialogue/condition/Condition.java index 89ac171a17..0e513d37cb 100644 --- a/src/main/java/com/mraof/minestuck/entity/dialogue/condition/Condition.java +++ b/src/main/java/com/mraof/minestuck/entity/dialogue/condition/Condition.java @@ -36,7 +36,7 @@ import net.minecraft.world.level.storage.LevelData; import net.minecraft.world.phys.Vec3; import net.minecraft.world.scores.Objective; -import net.minecraft.world.scores.Score; +import net.minecraft.world.scores.PlayerScoreEntry; import net.minecraft.world.scores.Scoreboard; import javax.annotation.Nullable; @@ -839,7 +839,7 @@ public boolean test(LivingEntity entity, ServerPlayer player) if(objective == null) return false; - Collection scores = scoreboard.getPlayerScores(objective); + Collection scores = scoreboard.listPlayerScores(objective); //go with originally written scoreboard name if not "player" or "npc" String modOwnerName = switch(ownerName) @@ -849,7 +849,7 @@ public boolean test(LivingEntity entity, ServerPlayer player) default -> ownerName; }; - return scores.stream().filter(score -> score.getOwner().equals(modOwnerName)).anyMatch(score -> score.getScore() == value); + return scores.stream().filter(score -> score.owner().equals(modOwnerName)).anyMatch(score -> score.value() == value); } @Override diff --git a/src/main/java/com/mraof/minestuck/entity/item/BarbasolBombEntity.java b/src/main/java/com/mraof/minestuck/entity/item/BarbasolBombEntity.java index 8ca3954ada..bb5de5c577 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/BarbasolBombEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/BarbasolBombEntity.java @@ -2,15 +2,12 @@ import com.mraof.minestuck.item.MSItems; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.ThrowableItemProjectile; import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; import net.minecraft.world.phys.HitResult; -import net.neoforged.neoforge.network.NetworkHooks; public class BarbasolBombEntity extends ThrowableItemProjectile { @@ -57,12 +54,6 @@ protected void onHit(HitResult result) this.discard(); } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - @Override protected Item getDefaultItem() { diff --git a/src/main/java/com/mraof/minestuck/entity/item/BouncingProjectileEntity.java b/src/main/java/com/mraof/minestuck/entity/item/BouncingProjectileEntity.java index b489aede60..7f4b55f4e9 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/BouncingProjectileEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/BouncingProjectileEntity.java @@ -7,8 +7,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.sounds.SoundSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; @@ -23,7 +21,6 @@ import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; -import net.neoforged.neoforge.network.NetworkHooks; public class BouncingProjectileEntity extends ThrowableItemProjectile { @@ -162,12 +159,6 @@ public void addAdditionalSaveData(CompoundTag compound) compound.putInt("inBlockTicks", inBlockTicks); } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - @Override protected Item getDefaultItem() { diff --git a/src/main/java/com/mraof/minestuck/entity/item/ConsumableProjectileEntity.java b/src/main/java/com/mraof/minestuck/entity/item/ConsumableProjectileEntity.java index d9a6c44f9b..3b2dc06ae1 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/ConsumableProjectileEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/ConsumableProjectileEntity.java @@ -3,8 +3,6 @@ import com.mraof.minestuck.entity.underling.UnderlingEntity; import com.mraof.minestuck.item.MSItems; import com.mraof.minestuck.item.weapon.projectiles.ProjectileDamaging; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.entity.Entity; @@ -18,7 +16,6 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult; -import net.neoforged.neoforge.network.NetworkHooks; public class ConsumableProjectileEntity extends ThrowableItemProjectile { @@ -69,12 +66,6 @@ protected void onHit(HitResult result) this.discard(); } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - @Override protected Item getDefaultItem() { diff --git a/src/main/java/com/mraof/minestuck/entity/item/GristEntity.java b/src/main/java/com/mraof/minestuck/entity/item/GristEntity.java index 8a73e62c83..a39bc4a2ef 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/GristEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/GristEntity.java @@ -10,7 +10,6 @@ import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.entity.MSEntityTypes; import com.mraof.minestuck.network.GristRejectAnimationPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.GristCache; import com.mraof.minestuck.player.IdentifierHandler; import com.mraof.minestuck.player.PlayerIdentifier; @@ -19,8 +18,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.RandomSource; @@ -29,14 +26,14 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.neoforged.neoforge.common.util.FakePlayer; -import net.neoforged.neoforge.entity.IEntityAdditionalSpawnData; -import net.neoforged.neoforge.network.NetworkHooks; +import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.Nullable; import java.util.function.Consumer; import java.util.function.Predicate; -public class GristEntity extends Entity implements IEntityAdditionalSpawnData +public class GristEntity extends Entity implements IEntityWithComplexSpawn { //TODO Perhaps use a data manager for grist type in the same way as the underling entity? public int cycle; @@ -326,7 +323,7 @@ public void playerTouch(Player player) else { GristRejectAnimationPacket packet = GristRejectAnimationPacket.createPacket(this); - MSPacketHandler.sendToTracking(packet, this); + PacketDistributor.TRACKING_ENTITY.with(this).send(packet); } } @@ -381,10 +378,4 @@ public void readSpawnData(FriendlyByteBuf data) gristType = data.readById(GristTypes.REGISTRY); gristValue = data.readLong(); } - - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/entity/item/HangingArtEntity.java b/src/main/java/com/mraof/minestuck/entity/item/HangingArtEntity.java index 13c023a8c5..0b0a6a336b 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/HangingArtEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/HangingArtEntity.java @@ -5,8 +5,6 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; @@ -16,8 +14,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.GameRules; import net.minecraft.world.level.Level; -import net.neoforged.neoforge.entity.IEntityAdditionalSpawnData; -import net.neoforged.neoforge.network.NetworkHooks; +import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -25,7 +22,7 @@ import java.util.Optional; import java.util.Set; -public abstract class HangingArtEntity extends HangingEntity implements IEntityAdditionalSpawnData +public abstract class HangingArtEntity extends HangingEntity implements IEntityWithComplexSpawn { private static final Logger LOGGER = LogManager.getLogger(); @@ -183,12 +180,6 @@ public void readSpawnData(FriendlyByteBuf data) this.setDirection(facing); } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - public abstract Set getArtSet(); public abstract T getDefault(); diff --git a/src/main/java/com/mraof/minestuck/entity/item/HologramEntity.java b/src/main/java/com/mraof/minestuck/entity/item/HologramEntity.java index c4909b440b..83907a77fc 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/HologramEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/HologramEntity.java @@ -3,8 +3,6 @@ import com.mraof.minestuck.block.MSBlocks; import com.mraof.minestuck.entity.MSEntityTypes; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; @@ -13,7 +11,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.neoforged.neoforge.network.NetworkHooks; public class HologramEntity extends Entity { @@ -75,10 +72,4 @@ public void setItem(ItemStack item) public void setItem(int id) { } - - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/entity/item/MetalBoatEntity.java b/src/main/java/com/mraof/minestuck/entity/item/MetalBoatEntity.java index 4b57997808..6fdfb6b144 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/MetalBoatEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/MetalBoatEntity.java @@ -6,8 +6,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; @@ -20,8 +18,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; -import net.neoforged.neoforge.entity.IEntityAdditionalSpawnData; -import net.neoforged.neoforge.network.NetworkHooks; +import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,7 +28,7 @@ import java.util.List; import java.util.function.Supplier; -public class MetalBoatEntity extends Boat implements IEntityAdditionalSpawnData +public class MetalBoatEntity extends Boat implements IEntityWithComplexSpawn { private static final Logger LOGGER = LogManager.getLogger(); @@ -142,12 +139,6 @@ public void readSpawnData(FriendlyByteBuf additionalData) this.type = Type.fromString(additionalData.readUtf(16)); } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - public enum Type implements CustomBoatItem.BoatProvider { IRON(1 / 1.5F, () -> Items.IRON_INGOT, MSItems.IRON_BOAT, new ResourceLocation("minestuck", "textures/entity/iron_boat.png")), diff --git a/src/main/java/com/mraof/minestuck/entity/item/ReturningProjectileEntity.java b/src/main/java/com/mraof/minestuck/entity/item/ReturningProjectileEntity.java index 666d8ad7d7..e5cad06e1a 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/ReturningProjectileEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/ReturningProjectileEntity.java @@ -7,8 +7,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.sounds.SoundSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; @@ -23,7 +21,6 @@ import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; -import net.neoforged.neoforge.network.NetworkHooks; public class ReturningProjectileEntity extends ThrowableItemProjectile { @@ -148,12 +145,6 @@ public void addAdditionalSaveData(CompoundTag compound) compound.putBoolean("noBlockCollision", noBlockCollision); } - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - @Override protected Item getDefaultItem() { diff --git a/src/main/java/com/mraof/minestuck/entity/item/VitalityGelEntity.java b/src/main/java/com/mraof/minestuck/entity/item/VitalityGelEntity.java index 3677b16e61..22a04f703b 100644 --- a/src/main/java/com/mraof/minestuck/entity/item/VitalityGelEntity.java +++ b/src/main/java/com/mraof/minestuck/entity/item/VitalityGelEntity.java @@ -7,18 +7,15 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.Mth; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.*; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; -import net.neoforged.neoforge.entity.IEntityAdditionalSpawnData; -import net.neoforged.neoforge.network.NetworkHooks; +import net.neoforged.neoforge.entity.IEntityWithComplexSpawn; -public class VitalityGelEntity extends Entity implements IEntityAdditionalSpawnData +public class VitalityGelEntity extends Entity implements IEntityWithComplexSpawn { public int cycle; @@ -248,10 +245,4 @@ public void readSpawnData(FriendlyByteBuf data) { this.healAmount = data.readInt(); } - - @Override - public Packet getAddEntityPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/entry/EntryProcess.java b/src/main/java/com/mraof/minestuck/entry/EntryProcess.java index 7d3907dc2e..46d8c7fa92 100644 --- a/src/main/java/com/mraof/minestuck/entry/EntryProcess.java +++ b/src/main/java/com/mraof/minestuck/entry/EntryProcess.java @@ -8,7 +8,6 @@ import com.mraof.minestuck.blockentity.TransportalizerBlockEntity; import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.network.EntryEffectPackets; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.IdentifierHandler; import com.mraof.minestuck.player.PlayerIdentifier; import com.mraof.minestuck.skaianet.SburbHandler; @@ -42,6 +41,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.event.TickEvent; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -148,7 +148,7 @@ public static void enter(ServerPlayer player, BlockPos pos) waitingProcess = process; startTime = player.level().getGameTime() + MinestuckConfig.COMMON.entryDelay.get(); - MSPacketHandler.sendToAll(new EntryEffectPackets.Effect(player.level().dimension(), process.origin, process.artifactRange)); + PacketDistributor.ALL.noArg().send(new EntryEffectPackets.Effect(player.level().dimension(), process.origin, process.artifactRange)); LOGGER.info("Entry prep done in {}ms", System.currentTimeMillis() - time); } @@ -191,7 +191,7 @@ public static void onServerTick(TickEvent.ServerTickEvent event) waitingProcess.landLevel.getChunkSource().removeRegionTicket(CHUNK_TICKET_TYPE, new ChunkPos(0, 0), 0, Unit.INSTANCE); waitingProcess.runEntry(); waitingProcess = null; - MSPacketHandler.sendToAll(new EntryEffectPackets.Clear()); + PacketDistributor.ALL.noArg().send(new EntryEffectPackets.Clear()); } } } diff --git a/src/main/java/com/mraof/minestuck/fluid/MSFluidType.java b/src/main/java/com/mraof/minestuck/fluid/MSFluidType.java index f17710ee68..d241caae16 100644 --- a/src/main/java/com/mraof/minestuck/fluid/MSFluidType.java +++ b/src/main/java/com/mraof/minestuck/fluid/MSFluidType.java @@ -86,7 +86,7 @@ protected static boolean handleMovement(MSFluidType fluidType, LivingEntity enti Vec3 fallAdjustedMoveVec = entity.getFluidFallingAdjustedMovement(gravity, isSinking, entity.getDeltaMovement()); entity.setDeltaMovement(fallAdjustedMoveVec); - LastFluidTickData data = entity.getCapability(MSCapabilities.LAST_FLUID_TICK).orElseThrow(IllegalStateException::new); + LastFluidTickData data = entity.getData(MSCapabilities.LAST_FLUID_TICK_ATTACHMENT.get()); long tick = entity.level().getGameTime(); long lastTick = Objects.requireNonNullElse(data.lastTickMap.get(fluidType), 0L); diff --git a/src/main/java/com/mraof/minestuck/inventory/AtheneumMenu.java b/src/main/java/com/mraof/minestuck/inventory/AtheneumMenu.java index c71b1f7bfb..e900d9584e 100644 --- a/src/main/java/com/mraof/minestuck/inventory/AtheneumMenu.java +++ b/src/main/java/com/mraof/minestuck/inventory/AtheneumMenu.java @@ -6,7 +6,6 @@ import com.mraof.minestuck.computer.editmode.EditData; import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.network.AtheneumPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.skaianet.SburbPlayerData; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; @@ -18,6 +17,7 @@ import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.ArrayList; import java.util.List; @@ -143,7 +143,7 @@ private void sendPacket() } AtheneumPacket.Update packet = new AtheneumPacket.Update(scroll > 0, INVENTORY_SIZE + (scroll * INVENTORY_COLUMNS) < items.size(), itemList); - MSPacketHandler.sendToPlayer(packet, serverPlayer); + PacketDistributor.PLAYER.with(serverPlayer).send(packet); } public void receiveUpdatePacket(AtheneumPacket.Update packet) diff --git a/src/main/java/com/mraof/minestuck/inventory/ConsortMerchantInventory.java b/src/main/java/com/mraof/minestuck/inventory/ConsortMerchantInventory.java index 0d880a61b4..a9ba9f7a8b 100644 --- a/src/main/java/com/mraof/minestuck/inventory/ConsortMerchantInventory.java +++ b/src/main/java/com/mraof/minestuck/inventory/ConsortMerchantInventory.java @@ -78,7 +78,7 @@ public void handlePurchase(ServerPlayer player, boolean all, int index) { prices[index] = 0; if (Arrays.stream(prices).sum() == 0) - MSCriteriaTriggers.BUY_OUT_SHOP.trigger(player); + MSCriteriaTriggers.BUY_OUT_SHOP.get().trigger(player); } if (player.addItem(items)) diff --git a/src/main/java/com/mraof/minestuck/inventory/EditmodeMenu.java b/src/main/java/com/mraof/minestuck/inventory/EditmodeMenu.java index ad8e083c43..c1dc6c3cdc 100644 --- a/src/main/java/com/mraof/minestuck/inventory/EditmodeMenu.java +++ b/src/main/java/com/mraof/minestuck/inventory/EditmodeMenu.java @@ -5,7 +5,6 @@ import com.mraof.minestuck.computer.editmode.EditData; import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.network.EditmodeInventoryPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.skaianet.SburbPlayerData; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; @@ -16,6 +15,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.ArrayList; import java.util.List; @@ -137,7 +137,7 @@ private void sendPacket() } EditmodeInventoryPacket packet = EditmodeInventoryPacket.update(itemList, scroll > 0, scroll*2 + 14 < items.size()); - MSPacketHandler.sendToPlayer(packet, serverPlayer); + PacketDistributor.PLAYER.with(serverPlayer).send(packet); } public void receiveUpdatePacket(EditmodeInventoryPacket packet) diff --git a/src/main/java/com/mraof/minestuck/inventory/captchalogue/CaptchaDeckHandler.java b/src/main/java/com/mraof/minestuck/inventory/captchalogue/CaptchaDeckHandler.java index 2e827cb5e0..8aaaf2e480 100644 --- a/src/main/java/com/mraof/minestuck/inventory/captchalogue/CaptchaDeckHandler.java +++ b/src/main/java/com/mraof/minestuck/inventory/captchalogue/CaptchaDeckHandler.java @@ -7,7 +7,6 @@ import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.item.BoondollarsItem; import com.mraof.minestuck.item.MSItems; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.data.ModusDataPacket; import com.mraof.minestuck.player.ClientPlayerData; import com.mraof.minestuck.player.PlayerData; @@ -28,6 +27,7 @@ import net.neoforged.fml.LogicalSide; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.event.entity.living.LivingDropsEvent; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -132,7 +132,7 @@ private static ItemStack changeModus(ServerPlayer player, ItemStack modusItem, @ PlayerSavedData.getData(player).setModus(newModus); - MSCriteriaTriggers.CHANGE_MODUS.trigger(player, newModus); + MSCriteriaTriggers.CHANGE_MODUS.get().trigger(player, newModus); return oldModus == null ? ItemStack.EMPTY : oldModus.getModusItem(); } @@ -240,7 +240,7 @@ private static boolean putInModus(ServerPlayer player, Modus modus, ItemStack st boolean result = modus.putItemStack(player, stack.copy()); if(result) { - MSCriteriaTriggers.CAPTCHALOGUE.trigger(player, modus, stack); + MSCriteriaTriggers.CAPTCHALOGUE.get().trigger(player, modus, stack); stack.setCount(0); } return result; @@ -325,7 +325,7 @@ private static void dropSylladex(ServerPlayer player) } else { modus.initModus(null, player, null, size); - MSPacketHandler.sendToPlayer(ModusDataPacket.create(modus), player); + PacketDistributor.PLAYER.with(player).send(ModusDataPacket.create(modus)); } } diff --git a/src/main/java/com/mraof/minestuck/inventory/captchalogue/Modus.java b/src/main/java/com/mraof/minestuck/inventory/captchalogue/Modus.java index 1a61ea08a9..8eec1c6795 100644 --- a/src/main/java/com/mraof/minestuck/inventory/captchalogue/Modus.java +++ b/src/main/java/com/mraof/minestuck/inventory/captchalogue/Modus.java @@ -1,6 +1,5 @@ package com.mraof.minestuck.inventory.captchalogue; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.data.ModusDataPacket; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; @@ -8,6 +7,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; import net.neoforged.fml.LogicalSide; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.Objects; @@ -84,7 +84,7 @@ public final void checkAndResend(ServerPlayer player) { if(needResend) { - MSPacketHandler.sendToPlayer(ModusDataPacket.create(this), player); + PacketDistributor.PLAYER.with(player).send(ModusDataPacket.create(this)); needResend = false; } } diff --git a/src/main/java/com/mraof/minestuck/inventory/captchalogue/TreeModus.java b/src/main/java/com/mraof/minestuck/inventory/captchalogue/TreeModus.java index 10ab016aa9..cdc166e3ea 100644 --- a/src/main/java/com/mraof/minestuck/inventory/captchalogue/TreeModus.java +++ b/src/main/java/com/mraof/minestuck/inventory/captchalogue/TreeModus.java @@ -11,6 +11,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; import net.neoforged.fml.LogicalSide; + import java.util.ArrayList; import java.util.List; @@ -143,7 +144,7 @@ public ItemStack getItem(ServerPlayer player, int id, boolean asCard) } if(id == 0) - MSCriteriaTriggers.TREE_MODUS_ROOT.trigger(player, node.getSize()); + MSCriteriaTriggers.TREE_MODUS_ROOT.get().trigger(player, node.getSize()); ArrayList list = node.removeItems(id); markDirty(); diff --git a/src/main/java/com/mraof/minestuck/inventory/musicplayer/IMusicPlaying.java b/src/main/java/com/mraof/minestuck/inventory/musicplayer/IMusicPlaying.java index ea7838b9f4..f2ef1eb374 100644 --- a/src/main/java/com/mraof/minestuck/inventory/musicplayer/IMusicPlaying.java +++ b/src/main/java/com/mraof/minestuck/inventory/musicplayer/IMusicPlaying.java @@ -12,7 +12,7 @@ * * @see MusicPlayerWeapon */ - +@Deprecated //todo switch to just MusicPlaying public interface IMusicPlaying { void setMusicPlaying(ItemStack cassettePlayer, EnumCassetteType cassetteType); diff --git a/src/main/java/com/mraof/minestuck/inventory/musicplayer/MusicPlayerItemCapProvider.java b/src/main/java/com/mraof/minestuck/inventory/musicplayer/MusicPlayerItemCapProvider.java deleted file mode 100644 index fa2290059c..0000000000 --- a/src/main/java/com/mraof/minestuck/inventory/musicplayer/MusicPlayerItemCapProvider.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.mraof.minestuck.inventory.musicplayer; - -import com.mraof.minestuck.item.weapon.MusicPlayerWeapon; -import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.capabilities.ICapabilityProvider; -import net.neoforged.neoforge.common.util.INBTSerializable; -import net.neoforged.neoforge.common.util.LazyOptional; -import net.neoforged.neoforge.items.IItemHandler; -import net.neoforged.neoforge.items.ItemStackHandler; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -/** - * A capability provider that exposes an item handler capability with one item slot. - * - * @see MusicPlayerWeapon - */ - -public class MusicPlayerItemCapProvider implements ICapabilityProvider, INBTSerializable -{ - private final LazyOptional lazyInitSupplierItemHandler = LazyOptional.of(this::getCachedInventory); - private ItemStackHandler itemHandler; - - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) - { - return Capabilities.ITEM_HANDLER.orEmpty(cap, lazyInitSupplierItemHandler); - } - - private @Nonnull ItemStackHandler getCachedInventory() - { - if(itemHandler == null) - { - itemHandler = new ItemStackHandler(1); - } - return itemHandler; - } - - @Override - public CompoundTag serializeNBT() - { - return getCachedInventory().serializeNBT(); - } - - @Override - public void deserializeNBT(CompoundTag nbt) - { - getCachedInventory().deserializeNBT(nbt); - } -} - diff --git a/src/main/java/com/mraof/minestuck/inventory/musicplayer/MusicPlayingCapabilityProvider.java b/src/main/java/com/mraof/minestuck/inventory/musicplayer/MusicPlayingCapabilityProvider.java deleted file mode 100644 index 42dac0e207..0000000000 --- a/src/main/java/com/mraof/minestuck/inventory/musicplayer/MusicPlayingCapabilityProvider.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mraof.minestuck.inventory.musicplayer; - -import com.mraof.minestuck.util.MSCapabilities; -import net.minecraft.core.Direction; -import net.neoforged.neoforge.common.capabilities.Capability; -import net.neoforged.neoforge.common.capabilities.ICapabilityProvider; -import net.neoforged.neoforge.common.util.LazyOptional; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public class MusicPlayingCapabilityProvider implements ICapabilityProvider -{ - private final LazyOptional lazyInitSupplierMusicPlaying = LazyOptional.of(this::getCachedMusicPlaying); - private MusicPlaying musicPlaying; - - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) - { - if(MSCapabilities.MUSIC_PLAYING_CAPABILITY == cap) - return (lazyInitSupplierMusicPlaying).cast(); - return LazyOptional.empty(); - } - - private @Nonnull MusicPlaying getCachedMusicPlaying() - { - if(musicPlaying == null) - { - musicPlaying = new MusicPlaying(); - } - return musicPlaying; - } -} - diff --git a/src/main/java/com/mraof/minestuck/item/crafting/NonMirroredRecipe.java b/src/main/java/com/mraof/minestuck/item/crafting/NonMirroredRecipe.java index eb7d4c1e49..f1cb80dd25 100644 --- a/src/main/java/com/mraof/minestuck/item/crafting/NonMirroredRecipe.java +++ b/src/main/java/com/mraof/minestuck/item/crafting/NonMirroredRecipe.java @@ -1,26 +1,30 @@ package com.mraof.minestuck.item.crafting; import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.core.NonNullList; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.CraftingBookCategory; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.ShapedRecipe; +import net.minecraft.world.item.crafting.*; import net.minecraft.world.level.Level; +import net.neoforged.fml.util.ObfuscationReflectionHelper; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.Objects; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class NonMirroredRecipe extends ShapedRecipe { - public NonMirroredRecipe(String group, CraftingBookCategory category, int width, int height, NonNullList ingredients, ItemStack result) + public NonMirroredRecipe(ShapedRecipe recipe) { - super(group, category, width, height, ingredients, result); + this(recipe.getGroup(), recipe.category(), getPattern(recipe), recipe.getResultItem(null), recipe.showNotification()); + } + + public NonMirroredRecipe(String group, CraftingBookCategory category, ShapedRecipePattern pattern, ItemStack result, boolean showNotification) + { + super(group, category, pattern, result, showNotification); } public RecipeSerializer getSerializer() { return MSRecipeTypes.NON_MIRRORED.get(); @@ -56,13 +60,19 @@ protected boolean checkMatch(CraftingContainer inv, int x, int y) } return true; } - + + private static ShapedRecipePattern getPattern(ShapedRecipe recipe) + { + ShapedRecipePattern pattern = ObfuscationReflectionHelper.getPrivateValue(ShapedRecipe.class, recipe, "pattern"); + return Objects.requireNonNull(pattern); + } + @SuppressWarnings("DataFlowIssue") public static class Serializer implements RecipeSerializer { - private static final Codec CODEC = RecipeSerializer.SHAPED_RECIPE.codec().xmap( - recipe -> new NonMirroredRecipe(recipe.getGroup(), recipe.category(), recipe.getRecipeWidth(), recipe.getRecipeHeight(), recipe.getIngredients(), recipe.getResultItem(null)), - recipe -> new ShapedRecipe(recipe.getGroup(), recipe.category(), recipe.getRecipeWidth(), recipe.getRecipeHeight(), recipe.getIngredients(), recipe.getResultItem(null))); + private static final Codec CODEC = ((MapCodec.MapCodecCodec) ShapedRecipe.Serializer.CODEC).codec().xmap( + NonMirroredRecipe::new, + recipe -> new ShapedRecipe(recipe.getGroup(), recipe.category(), getPattern(recipe), recipe.getResultItem(null), recipe.showNotification())).codec(); @Override public Codec codec() @@ -73,7 +83,7 @@ public Codec codec() @Override public NonMirroredRecipe fromNetwork(FriendlyByteBuf buffer) { ShapedRecipe recipe = RecipeSerializer.SHAPED_RECIPE.fromNetwork(buffer); - return new NonMirroredRecipe(recipe.getGroup(), recipe.category(), recipe.getRecipeWidth(), recipe.getRecipeHeight(), recipe.getIngredients(), recipe.getResultItem(null)); + return new NonMirroredRecipe(recipe); } @Override public void toNetwork(FriendlyByteBuf buffer, NonMirroredRecipe recipe) { diff --git a/src/main/java/com/mraof/minestuck/item/loot/LandTableLootEntry.java b/src/main/java/com/mraof/minestuck/item/loot/LandTableLootEntry.java index 443c94a42a..aad41a03f9 100644 --- a/src/main/java/com/mraof/minestuck/item/loot/LandTableLootEntry.java +++ b/src/main/java/com/mraof/minestuck/item/loot/LandTableLootEntry.java @@ -93,7 +93,7 @@ private void expandFrom(ResourceLocation tableName, LootContext context, Consume return; } - LootPoolEntryContainer[] entries = accessWithReflection(pool); + List entries = accessWithReflection(pool); if(entries != null) { for(LootPoolEntryContainer entry : entries) @@ -147,7 +147,7 @@ private static Field getLootEntryField() { try { - return ObfuscationReflectionHelper.findField(LootPool.class, "f_79023_"); + return ObfuscationReflectionHelper.findField(LootPool.class, "entries"); } catch(ObfuscationReflectionHelper.UnableToFindFieldException e) { LOGGER.error("Unable to get field for lootPool.lootEntries. Will be unable to fully insert loot from land type loot tables.", e); @@ -156,7 +156,7 @@ private static Field getLootEntryField() } @Nullable - private LootPoolEntryContainer[] accessWithReflection(LootPool pool) + private List accessWithReflection(LootPool pool) { if(lootEntries == null) return null; @@ -164,7 +164,7 @@ private LootPoolEntryContainer[] accessWithReflection(LootPool pool) { try { - return (LootPoolEntryContainer[]) lootEntries.get(pool); + return (List) lootEntries.get(pool); } catch(Exception e) { LOGGER.error("Got exception when accessing loot entries field for loot pool. Will use simpler behaviour for this time.", e); diff --git a/src/main/java/com/mraof/minestuck/item/weapon/DestroyBlockEffect.java b/src/main/java/com/mraof/minestuck/item/weapon/DestroyBlockEffect.java index 13635ffaba..d97d72c084 100644 --- a/src/main/java/com/mraof/minestuck/item/weapon/DestroyBlockEffect.java +++ b/src/main/java/com/mraof/minestuck/item/weapon/DestroyBlockEffect.java @@ -51,7 +51,7 @@ static DestroyBlockEffect extraHarvests(boolean melonOverload, float percentage, entity.addEffect(new MobEffectInstance(MobEffects.DIG_SPEED, 1800, 3)); if(entity instanceof ServerPlayer player) - MSCriteriaTriggers.MELON_OVERLOAD.trigger(player); + MSCriteriaTriggers.MELON_OVERLOAD.get().trigger(player); } } }; diff --git a/src/main/java/com/mraof/minestuck/item/weapon/FarmineEffect.java b/src/main/java/com/mraof/minestuck/item/weapon/FarmineEffect.java index 18cb6bffa6..3a9e9dc15c 100644 --- a/src/main/java/com/mraof/minestuck/item/weapon/FarmineEffect.java +++ b/src/main/java/com/mraof/minestuck/item/weapon/FarmineEffect.java @@ -51,7 +51,7 @@ private void initializeFarMineLists() { farMineForbiddenBlocks.add(Blocks.OBSIDIAN); - addAssociation(Blocks.DIRT, Blocks.GRASS); + addAssociation(Blocks.DIRT, Blocks.GRASS_BLOCK); addAssociation(Blocks.DIRT, Blocks.MYCELIUM); addAssociation(Blocks.DIRT, Blocks.DIRT_PATH); addAssociation(Blocks.END_STONE, MSBlocks.END_GRASS.get()); diff --git a/src/main/java/com/mraof/minestuck/item/weapon/MagicAOERightClickEffect.java b/src/main/java/com/mraof/minestuck/item/weapon/MagicAOERightClickEffect.java index b1e9a5d709..cebaa9133b 100644 --- a/src/main/java/com/mraof/minestuck/item/weapon/MagicAOERightClickEffect.java +++ b/src/main/java/com/mraof/minestuck/item/weapon/MagicAOERightClickEffect.java @@ -2,7 +2,6 @@ import com.mraof.minestuck.client.util.MagicEffect; import com.mraof.minestuck.entity.underling.UnderlingEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.MagicAOEEffectPacket; import com.mraof.minestuck.player.PlayerSavedData; import com.mraof.minestuck.util.MSSoundEvents; @@ -119,8 +118,8 @@ protected void sendEffectPacket(Level level, AABB aabb) Vec3 minAOEBound = new Vec3(aabb.minX, aabb.minY, aabb.minZ); Vec3 maxAOEBound = new Vec3(aabb.maxX, aabb.maxY, aabb.maxZ); - MSPacketHandler.sendToNear(new MagicAOEEffectPacket(type, minAOEBound, maxAOEBound), - new PacketDistributor.TargetPoint(centerPos.x, centerPos.y, centerPos.z, 64, level.dimension())); + PacketDistributor.NEAR.with(new PacketDistributor.TargetPoint(centerPos.x, centerPos.y, centerPos.z, 64, level.dimension())) + .send(new MagicAOEEffectPacket(type, minAOEBound, maxAOEBound)); } } diff --git a/src/main/java/com/mraof/minestuck/item/weapon/MagicRangedRightClickEffect.java b/src/main/java/com/mraof/minestuck/item/weapon/MagicRangedRightClickEffect.java index ee4c61d09b..07a294d1b4 100644 --- a/src/main/java/com/mraof/minestuck/item/weapon/MagicRangedRightClickEffect.java +++ b/src/main/java/com/mraof/minestuck/item/weapon/MagicRangedRightClickEffect.java @@ -2,7 +2,6 @@ import com.mraof.minestuck.client.util.MagicEffect; import com.mraof.minestuck.entity.underling.UnderlingEntity; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.MagicRangedEffectPacket; import com.mraof.minestuck.player.PlayerSavedData; import com.mraof.minestuck.util.MSSoundEvents; @@ -110,8 +109,8 @@ private void magicAttack(Level level, ServerPlayer player) protected void sendEffectPacket(Level level, Vec3 pos, Vec3 lookVec, int length, boolean collides) { if(type != null) - MSPacketHandler.sendToNear(new MagicRangedEffectPacket(type, pos, lookVec, length, collides), - new PacketDistributor.TargetPoint(pos.x, pos.y, pos.z, 64, level.dimension())); + PacketDistributor.NEAR.with(new PacketDistributor.TargetPoint(pos.x, pos.y, pos.z, 64, level.dimension())) + .send(new MagicRangedEffectPacket(type, pos, lookVec, length, collides)); } protected void targetEffect(ServerPlayer player) diff --git a/src/main/java/com/mraof/minestuck/item/weapon/MusicPlayerWeapon.java b/src/main/java/com/mraof/minestuck/item/weapon/MusicPlayerWeapon.java index cc2bedd3f2..eb95d18001 100644 --- a/src/main/java/com/mraof/minestuck/item/weapon/MusicPlayerWeapon.java +++ b/src/main/java/com/mraof/minestuck/item/weapon/MusicPlayerWeapon.java @@ -6,12 +6,9 @@ import com.mraof.minestuck.block.EnumCassetteType; import com.mraof.minestuck.inventory.musicplayer.CassetteContainerMenu; import com.mraof.minestuck.inventory.musicplayer.IMusicPlaying; -import com.mraof.minestuck.inventory.musicplayer.MusicPlayerItemCapProvider; import com.mraof.minestuck.item.CassetteItem; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.MusicPlayerPacket; import com.mraof.minestuck.util.MSCapabilities; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.RandomSource; @@ -30,14 +27,9 @@ import net.minecraft.world.level.Level; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; -import net.neoforged.neoforge.common.capabilities.Capabilities; -import net.neoforged.neoforge.common.capabilities.ICapabilityProvider; import net.neoforged.neoforge.event.TickEvent; import net.neoforged.neoforge.items.IItemHandler; -import net.neoforged.neoforge.items.ItemStackHandler; -import net.neoforged.neoforge.network.NetworkHooks; - -import javax.annotation.Nullable; +import net.neoforged.neoforge.network.PacketDistributor; /** *

@@ -56,7 +48,6 @@ * The sprite of the item can change depending of if a cassette is currently inside or not. * The tag used to do so is HasCassette. *

- * {@link #getShareTag(ItemStack)} * {@link #hasCassette(ItemStack)} */ @@ -67,25 +58,6 @@ public class MusicPlayerWeapon extends WeaponItem private final float volume; private final float pitch; - private static IItemHandler getItemHandler(ItemStack itemStack) - { - return itemStack.getCapability(Capabilities.ITEM_HANDLER).orElseThrow(() -> - new IllegalArgumentException("Expected an item handler for the music player item, but " + itemStack + " does not expose an item handler.")); - } - - private static IMusicPlaying getMusicPlaying(LivingEntity entity) - { - return entity.getCapability(MSCapabilities.MUSIC_PLAYING_CAPABILITY).orElseThrow(() -> - new IllegalArgumentException("Expected an music playing for this entity, but " + entity + " does not expose a music playing.")); - } - - @Nullable - @Override - public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundTag nbt) - { - return new MusicPlayerItemCapProvider(); - } - public MusicPlayerWeapon(Builder builder, Properties properties, float volume, float pitch) { super(builder, properties); @@ -106,10 +78,10 @@ public InteractionResultHolder use(Level level, Player playerIn, Inte { ItemStack musicPlayer = playerIn.getItemInHand(handIn); - IItemHandler itemStackHandlerMusicPlayer = getItemHandler(musicPlayer); - IMusicPlaying musicPlayingCap = getMusicPlaying(playerIn); + IItemHandler itemStackHandlerMusicPlayer = musicPlayer.getData(MSCapabilities.MUSIC_PLAYER_INVENTORY_ATTACHMENT.get()); + IMusicPlaying musicPlayingCap = playerIn.getData(MSCapabilities.MUSIC_PLAYING_ATTACHMENT.get()); - if(!level.isClientSide) + if(playerIn instanceof ServerPlayer serverPlayer) { if(playerIn.isCrouching()) { @@ -126,7 +98,7 @@ public InteractionResultHolder use(Level level, Player playerIn, Inte packet = MusicPlayerPacket.createPacket(playerIn, EnumCassetteType.NONE, 0, 0); musicPlayingCap.setMusicPlaying(ItemStack.EMPTY, EnumCassetteType.NONE); } - MSPacketHandler.sendToTrackingAndSelf(packet, playerIn); + PacketDistributor.TRACKING_ENTITY_AND_SELF.with(playerIn).send(packet); } } //open the GUI if right-clicked @@ -134,9 +106,10 @@ public InteractionResultHolder use(Level level, Player playerIn, Inte { MusicPlayerPacket packet = MusicPlayerPacket.createPacket(playerIn, EnumCassetteType.NONE, 0, 0); musicPlayingCap.setMusicPlaying(ItemStack.EMPTY, EnumCassetteType.NONE); - MSPacketHandler.sendToTrackingAndSelf(packet, playerIn); //This will stop the music before opening the GUI + //This will stop the music before opening the GUI + PacketDistributor.TRACKING_ENTITY_AND_SELF.with(playerIn).send(packet); - NetworkHooks.openScreen((ServerPlayer) playerIn, new SimpleMenuProvider((pContainerId, pInventory, pPlayer) -> + serverPlayer.openMenu(new SimpleMenuProvider((pContainerId, pInventory, pPlayer) -> new CassetteContainerMenu(pContainerId, pInventory, itemStackHandlerMusicPlayer, musicPlayer), Component.translatable(TITLE))); } @@ -159,7 +132,7 @@ public static void playerTick(TickEvent.PlayerTickEvent tickEvent) if(tickEvent.side.isServer() && tickEvent.phase == TickEvent.Phase.END && tickEvent.player.isAlive()) { Player player = tickEvent.player; - IMusicPlaying musicPlayingCap = getMusicPlaying(player); + IMusicPlaying musicPlayingCap = player.getData(MSCapabilities.MUSIC_PLAYING_ATTACHMENT.get()); if(!(player.getItemInHand(InteractionHand.MAIN_HAND) == musicPlayingCap.getCurrentMusicPlayer() || player.getItemInHand(InteractionHand.OFF_HAND) == musicPlayingCap.getCurrentMusicPlayer()) || @@ -169,7 +142,7 @@ public static void playerTick(TickEvent.PlayerTickEvent tickEvent) { //If the Cassette player isn't in hand and is playing music, stop it MusicPlayerPacket packet = MusicPlayerPacket.createPacket(player, EnumCassetteType.NONE, 0, 0); musicPlayingCap.setMusicPlaying(ItemStack.EMPTY, EnumCassetteType.NONE); - MSPacketHandler.sendToTrackingAndSelf(packet, player); + PacketDistributor.TRACKING_ENTITY_AND_SELF.with(player).send(packet); } } @@ -185,7 +158,7 @@ public static void playerTick(TickEvent.PlayerTickEvent tickEvent) @Override public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity attacker) { - IMusicPlaying musicPlaying = getMusicPlaying(attacker); + IMusicPlaying musicPlaying = attacker.getData(MSCapabilities.MUSIC_PLAYING_ATTACHMENT.get()); if(musicPlaying.getCassetteType() != EnumCassetteType.NONE && musicPlaying.getCurrentMusicPlayer() == stack) { RandomSource r = attacker.level().getRandom(); @@ -218,33 +191,8 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta return super.hurtEnemy(stack, target, attacker); } - @Nullable - @Override - public CompoundTag getShareTag(ItemStack stack) - { - IItemHandler iitemHandler = getItemHandler(stack); - CompoundTag nbt = stack.getTag() != null ? stack.getTag() : new CompoundTag(); - if(iitemHandler instanceof ItemStackHandler itemHandler) - nbt.put("cassette", itemHandler.serializeNBT()); - return nbt; - } - - @Override - public void readShareTag(ItemStack stack, @Nullable CompoundTag nbt) - { - if(nbt == null) - stack.setTag(null); - else - { - IItemHandler iitemHandler = getItemHandler(stack); - if(iitemHandler instanceof ItemStackHandler itemHandler) - itemHandler.deserializeNBT(nbt.getCompound("cassette")); - stack.setTag(nbt); - } - } - public static boolean hasCassette(ItemStack stack) { - return !getItemHandler(stack).getStackInSlot(0).isEmpty(); + return !stack.getData(MSCapabilities.MUSIC_PLAYER_INVENTORY_ATTACHMENT.get()).getStackInSlot(0).isEmpty(); } } diff --git a/src/main/java/com/mraof/minestuck/item/weapon/OnHitEffect.java b/src/main/java/com/mraof/minestuck/item/weapon/OnHitEffect.java index 20e2121a72..a49ffcfb3a 100644 --- a/src/main/java/com/mraof/minestuck/item/weapon/OnHitEffect.java +++ b/src/main/java/com/mraof/minestuck/item/weapon/OnHitEffect.java @@ -7,7 +7,6 @@ import com.mraof.minestuck.item.MSItems; import com.mraof.minestuck.item.loot.MSLootTables; import com.mraof.minestuck.network.ClientMovementPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.EnumAspect; import com.mraof.minestuck.player.PlayerSavedData; import com.mraof.minestuck.player.Title; @@ -44,6 +43,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.common.util.FakePlayer; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.List; import java.util.function.Supplier; @@ -357,7 +357,7 @@ static OnHitEffect mutualKnockback(float knockback) if(attacker instanceof ServerPlayer player) { ClientMovementPacket packet = ClientMovementPacket.createPacket(attackerVec); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } }; } diff --git a/src/main/java/com/mraof/minestuck/network/AlchemiterPacket.java b/src/main/java/com/mraof/minestuck/network/AlchemiterPacket.java index 276fbe6b8c..2f4276c58c 100644 --- a/src/main/java/com/mraof/minestuck/network/AlchemiterPacket.java +++ b/src/main/java/com/mraof/minestuck/network/AlchemiterPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.machine.AlchemiterBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class AlchemiterPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("alchemiter"); + private final BlockPos pos; private final int quantity; @@ -17,13 +21,19 @@ public AlchemiterPacket(BlockPos pos, int quantity) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeInt(quantity); } - public static AlchemiterPacket decode(FriendlyByteBuf buffer) + public static AlchemiterPacket read(FriendlyByteBuf buffer) { BlockPos pos = buffer.readBlockPos(); int quantity = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/AnthvilPacket.java b/src/main/java/com/mraof/minestuck/network/AnthvilPacket.java index 18558fac41..7e22ca0c8a 100644 --- a/src/main/java/com/mraof/minestuck/network/AnthvilPacket.java +++ b/src/main/java/com/mraof/minestuck/network/AnthvilPacket.java @@ -1,20 +1,29 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.machine.AnthvilBlockEntity; import com.mraof.minestuck.inventory.AnthvilMenu; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; public class AnthvilPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("anthvil"); + @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() { + return ID; + } + @Override + public void write(FriendlyByteBuf buffer) + { } - public static AnthvilPacket decode(FriendlyByteBuf buffer) + public static AnthvilPacket read(FriendlyByteBuf ignored) { return new AnthvilPacket(); } diff --git a/src/main/java/com/mraof/minestuck/network/AreaEffectPacket.java b/src/main/java/com/mraof/minestuck/network/AreaEffectPacket.java index 1e4bccf2c7..cffb1893e6 100644 --- a/src/main/java/com/mraof/minestuck/network/AreaEffectPacket.java +++ b/src/main/java/com/mraof/minestuck/network/AreaEffectPacket.java @@ -1,11 +1,13 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.block.redstone.AreaEffectBlock; import com.mraof.minestuck.blockentity.redstone.AreaEffectBlockEntity; import com.mraof.minestuck.effects.MSEffects; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.level.block.Block; @@ -15,6 +17,8 @@ public class AreaEffectPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("area_effect"); + private final MobEffect effect; private final int effectAmp; private final boolean isAllMobs; @@ -33,7 +37,13 @@ public AreaEffectPacket(MobEffect effect, int effectAmp, boolean isAllMobs, Bloc } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeId(BuiltInRegistries.MOB_EFFECT, effect); buffer.writeInt(effectAmp); @@ -43,7 +53,7 @@ public void encode(FriendlyByteBuf buffer) buffer.writeBlockPos(beBlockPos); } - public static AreaEffectPacket decode(FriendlyByteBuf buffer) + public static AreaEffectPacket read(FriendlyByteBuf buffer) { MobEffect effect = Objects.requireNonNullElse(buffer.readById(BuiltInRegistries.MOB_EFFECT), MSEffects.CREATIVE_SHOCK.get()); diff --git a/src/main/java/com/mraof/minestuck/network/AtheneumPacket.java b/src/main/java/com/mraof/minestuck/network/AtheneumPacket.java index 92c84c28cc..a933246eaa 100644 --- a/src/main/java/com/mraof/minestuck/network/AtheneumPacket.java +++ b/src/main/java/com/mraof/minestuck/network/AtheneumPacket.java @@ -1,9 +1,11 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.gui.playerStats.AtheneumScreen; import com.mraof.minestuck.inventory.AtheneumMenu; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; @@ -15,14 +17,21 @@ public final class AtheneumPacket public record Scroll(boolean scrollUp) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("atheneum/scroll"); @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(scrollUp); } - public static Scroll decode(FriendlyByteBuf buffer) + public static Scroll read(FriendlyByteBuf buffer) { boolean scrollUp = buffer.readBoolean(); return new Scroll(scrollUp); @@ -39,8 +48,16 @@ public void execute(ServerPlayer player) public record Update(boolean less, boolean more, List inventory) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("atheneum/update"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(less); buffer.writeBoolean(more); @@ -48,7 +65,7 @@ public void encode(FriendlyByteBuf buffer) buffer.writeItem(stack); } - public static Update decode(FriendlyByteBuf buffer) + public static Update read(FriendlyByteBuf buffer) { boolean less = buffer.readBoolean(); boolean more = buffer.readBoolean(); diff --git a/src/main/java/com/mraof/minestuck/network/CaptchaDeckPacket.java b/src/main/java/com/mraof/minestuck/network/CaptchaDeckPacket.java index 28dd554b26..310466dd6d 100644 --- a/src/main/java/com/mraof/minestuck/network/CaptchaDeckPacket.java +++ b/src/main/java/com/mraof/minestuck/network/CaptchaDeckPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.computer.editmode.ServerEditHandler; -import com.mraof.minestuck.inventory.captchalogue.CaptchaDeckMenu; import com.mraof.minestuck.inventory.captchalogue.CaptchaDeckHandler; +import com.mraof.minestuck.inventory.captchalogue.CaptchaDeckMenu; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.EquipmentSlot; +//todo this packet should really be split into multiple packets public class CaptchaDeckPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("captcha_deck"); private static final byte MODUS = 0; private static final byte CAPTCHALOGUE = 1; @@ -74,7 +78,13 @@ public static CaptchaDeckPacket captchalogueInv(int slotIndex, int windowId) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeByte(type); //Packet type if(type == GET) //Take item from modus @@ -92,7 +102,7 @@ public void encode(FriendlyByteBuf buffer) } } - public static CaptchaDeckPacket decode(FriendlyByteBuf buffer) + public static CaptchaDeckPacket read(FriendlyByteBuf buffer) { CaptchaDeckPacket packet = new CaptchaDeckPacket(); packet.type = buffer.readByte(); diff --git a/src/main/java/com/mraof/minestuck/network/ClientEditPacket.java b/src/main/java/com/mraof/minestuck/network/ClientEditPacket.java index bf003f3e75..46f3ff2a83 100644 --- a/src/main/java/com/mraof/minestuck/network/ClientEditPacket.java +++ b/src/main/java/com/mraof/minestuck/network/ClientEditPacket.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.computer.editmode.DeployEntry; import com.mraof.minestuck.computer.editmode.DeployList; @@ -11,6 +12,7 @@ import com.mraof.minestuck.skaianet.SburbHandler; import com.mraof.minestuck.skaianet.SburbPlayerData; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.players.ServerOpListEntry; import net.minecraft.world.item.ItemStack; @@ -19,6 +21,8 @@ public class ClientEditPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("client_edit"); + private final int user; private final int target; @@ -39,7 +43,13 @@ public static ClientEditPacket activate(int user, int target) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { if(user != -1) { @@ -48,7 +58,7 @@ public void encode(FriendlyByteBuf buffer) } } - public static ClientEditPacket decode(FriendlyByteBuf buffer) + public static ClientEditPacket read(FriendlyByteBuf buffer) { if(buffer.readableBytes() > 0) { diff --git a/src/main/java/com/mraof/minestuck/network/ClientMovementPacket.java b/src/main/java/com/mraof/minestuck/network/ClientMovementPacket.java index 9b6c2af789..906ea38de4 100644 --- a/src/main/java/com/mraof/minestuck/network/ClientMovementPacket.java +++ b/src/main/java/com/mraof/minestuck/network/ClientMovementPacket.java @@ -1,8 +1,10 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; /** @@ -10,6 +12,8 @@ */ public class ClientMovementPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("client_movement"); + private final double moveX; private final double moveY; private final double moveZ; @@ -27,14 +31,20 @@ private ClientMovementPacket(double moveX, double moveY, double moveZ) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeDouble(moveX); buffer.writeDouble(moveY); buffer.writeDouble(moveZ); } - public static ClientMovementPacket decode(FriendlyByteBuf buffer) + public static ClientMovementPacket read(FriendlyByteBuf buffer) { double moveX = buffer.readDouble(); double moveY = buffer.readDouble(); diff --git a/src/main/java/com/mraof/minestuck/network/ColorSelectPacket.java b/src/main/java/com/mraof/minestuck/network/ColorSelectPacket.java index f00ef6cb95..99543fd8f8 100644 --- a/src/main/java/com/mraof/minestuck/network/ColorSelectPacket.java +++ b/src/main/java/com/mraof/minestuck/network/ColorSelectPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; -import com.mraof.minestuck.util.ColorHandler; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.player.PlayerSavedData; +import com.mraof.minestuck.util.ColorHandler; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class ColorSelectPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("color_select"); + private final int colorIndex; public ColorSelectPacket(int colorIndex) @@ -15,12 +19,18 @@ public ColorSelectPacket(int colorIndex) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(colorIndex); } - public static ColorSelectPacket decode(FriendlyByteBuf buffer) + public static ColorSelectPacket read(FriendlyByteBuf buffer) { int color = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/DataCheckerPacket.java b/src/main/java/com/mraof/minestuck/network/DataCheckerPacket.java index 6f1f046b5e..c6143e2b3d 100644 --- a/src/main/java/com/mraof/minestuck/network/DataCheckerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/DataCheckerPacket.java @@ -1,18 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.gui.playerStats.DataCheckerScreen; import com.mraof.minestuck.skaianet.DataCheckerManager; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtIo; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - public class DataCheckerPacket implements MSPacket.PlayToBoth { + public static final ResourceLocation ID = Minestuck.id("data_checker"); private static int index = 0; @@ -40,40 +38,28 @@ public static DataCheckerPacket data(int index, CompoundTag nbtData) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(packetIndex); if(nbtData != null) { - try - { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - NbtIo.writeCompressed(nbtData, bytes); - buffer.writeBytes(bytes.toByteArray()); - } - catch (IOException e) - { - e.printStackTrace(); - } + buffer.writeNbt(nbtData); } } - public static DataCheckerPacket decode(FriendlyByteBuf buffer) + public static DataCheckerPacket read(FriendlyByteBuf buffer) { int packetIndex = buffer.readInt(); CompoundTag nbt = null; if(buffer.readableBytes() > 0) { - byte[] bytes = new byte[buffer.readableBytes()]; - buffer.readBytes(bytes); - try - { - nbt = NbtIo.readCompressed(new ByteArrayInputStream(bytes)); - } - catch(IOException e) - { - e.printStackTrace(); - } + nbt = buffer.readNbt(); } return new DataCheckerPacket(packetIndex, nbt); diff --git a/src/main/java/com/mraof/minestuck/network/DialoguePackets.java b/src/main/java/com/mraof/minestuck/network/DialoguePackets.java index 32ffb19adf..1390edf179 100644 --- a/src/main/java/com/mraof/minestuck/network/DialoguePackets.java +++ b/src/main/java/com/mraof/minestuck/network/DialoguePackets.java @@ -1,10 +1,12 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.gui.MSScreenFactories; import com.mraof.minestuck.entity.dialogue.Dialogue; import com.mraof.minestuck.entity.dialogue.DialogueComponent; import com.mraof.minestuck.util.MSCapabilities; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import java.util.Optional; @@ -13,14 +15,22 @@ public final class DialoguePackets { public record OpenScreen(int dialogueId, Dialogue.DialogueData dialogueData) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("dialogue/open_screen"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeInt(this.dialogueId); this.dialogueData.write(buffer); } - public static OpenScreen decode(FriendlyByteBuf buffer) + public static OpenScreen read(FriendlyByteBuf buffer) { int dialogueId = buffer.readInt(); var dialogueData = Dialogue.DialogueData.read(buffer); @@ -37,12 +47,20 @@ public void execute() public record CloseScreen() implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("dialogue/close_screen"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { } - public static CloseScreen decode(FriendlyByteBuf ignored) + public static CloseScreen read(FriendlyByteBuf ignored) { return new CloseScreen(); } @@ -56,13 +74,21 @@ public void execute() public record OnCloseScreen(int dialogueId) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("dialogue/on_close_screen"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeInt(this.dialogueId); } - public static OnCloseScreen decode(FriendlyByteBuf buffer) + public static OnCloseScreen read(FriendlyByteBuf buffer) { int dialogueId = buffer.readInt(); @@ -72,8 +98,7 @@ public static OnCloseScreen decode(FriendlyByteBuf buffer) @Override public void execute(ServerPlayer player) { - player.getCapability(MSCapabilities.CURRENT_DIALOGUE) - .orElseThrow(IllegalStateException::new) + player.getData(MSCapabilities.CURRENT_DIALOGUE_ATTACHMENT.get()) .validateAndGetComponent(player.level(), this.dialogueId) .ifPresent(component -> component.clearOngoingDialogue(player)); } @@ -81,14 +106,22 @@ public void execute(ServerPlayer player) public record TriggerResponse(int responseIndex, int dialogueId) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("dialogue/trigger_response"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeInt(this.responseIndex); buffer.writeInt(this.dialogueId); } - public static TriggerResponse decode(FriendlyByteBuf buffer) + public static TriggerResponse read(FriendlyByteBuf buffer) { int responseIndex = buffer.readInt(); int dialogueId = buffer.readInt(); @@ -99,8 +132,7 @@ public static TriggerResponse decode(FriendlyByteBuf buffer) @Override public void execute(ServerPlayer player) { - player.getCapability(MSCapabilities.CURRENT_DIALOGUE) - .orElseThrow(IllegalStateException::new) + player.getData(MSCapabilities.CURRENT_DIALOGUE_ATTACHMENT.get()) .validateAndGetComponent(player.level(), this.dialogueId) .ifPresent(component -> findAndTriggerResponse(player, component)); } diff --git a/src/main/java/com/mraof/minestuck/network/EditmodeDragPacket.java b/src/main/java/com/mraof/minestuck/network/EditmodeDragPacket.java index c7e9202355..5a6c169ca1 100644 --- a/src/main/java/com/mraof/minestuck/network/EditmodeDragPacket.java +++ b/src/main/java/com/mraof/minestuck/network/EditmodeDragPacket.java @@ -1,10 +1,11 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.MinestuckConfig; -import com.mraof.minestuck.api.alchemy.recipe.GristCostRecipe; import com.mraof.minestuck.api.alchemy.GristSet; -import com.mraof.minestuck.api.alchemy.MutableGristSet; import com.mraof.minestuck.api.alchemy.GristTypes; +import com.mraof.minestuck.api.alchemy.MutableGristSet; +import com.mraof.minestuck.api.alchemy.recipe.GristCostRecipe; import com.mraof.minestuck.computer.editmode.*; import com.mraof.minestuck.player.GristCache; import com.mraof.minestuck.util.MSCapabilities; @@ -12,6 +13,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; @@ -27,15 +29,11 @@ import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.util.function.Consumer; public final class EditmodeDragPacket { - private static final Logger LOGGER = LogManager.getLogger(); - private static boolean editModePlaceCheck(EditData data, Player player, GristSet cost, BlockPos pos, Consumer missingGristTracker) { if(!player.level().getBlockState(pos).canBeReplaced()) @@ -74,8 +72,16 @@ else if(!MinestuckConfig.SERVER.gristRefund.get() && entry == null) public record Fill(boolean isDown, BlockPos positionStart, BlockPos positionEnd, Vec3 hitVector, Direction side) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("editmode_drag/fill"); + @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(isDown); buffer.writeBlockPos(positionStart); @@ -86,7 +92,7 @@ public void encode(FriendlyByteBuf buffer) buffer.writeEnum(side); } - public static Fill decode(FriendlyByteBuf buffer) + public static Fill read(FriendlyByteBuf buffer) { boolean isDragging = buffer.readBoolean(); BlockPos positionStart = buffer.readBlockPos(); @@ -105,7 +111,7 @@ public void execute(ServerPlayer player) if(data == null) return; - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY).orElseThrow(() -> LOGGER.throwing(new IllegalStateException("EditTool Capability is missing on player " + player.getDisplayName().getString() + " on server-side (during packet execution)!"))); + IEditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); cap.setEditPos1(positionStart); cap.setEditPos2(positionEnd); @@ -156,8 +162,16 @@ public void execute(ServerPlayer player) public record Destroy(boolean isDown, BlockPos positionStart, BlockPos positionEnd, Vec3 hitVector, Direction side) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("editmode_drag/destroy"); + @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(isDown); buffer.writeBlockPos(positionStart); @@ -168,7 +182,7 @@ public void encode(FriendlyByteBuf buffer) buffer.writeEnum(side); } - public static Destroy decode(FriendlyByteBuf buffer) + public static Destroy read(FriendlyByteBuf buffer) { boolean isDragging = buffer.readBoolean(); BlockPos positionStart = buffer.readBlockPos(); @@ -187,7 +201,7 @@ public void execute(ServerPlayer player) if(data == null) return; - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY).orElseThrow(() -> LOGGER.throwing(new IllegalStateException("EditTool Capability is missing on player " + player.getDisplayName().getString() + " on server-side (during packet execution)!"))); + EditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); cap.setEditPos1(positionStart); cap.setEditPos2(positionEnd); @@ -228,15 +242,23 @@ public void execute(ServerPlayer player) public record Cursor(boolean isDown, BlockPos positionStart, BlockPos positionEnd) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("editmode_drag/cursor"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(isDown); buffer.writeBlockPos(positionStart); buffer.writeBlockPos(positionEnd); } - public static Cursor decode(FriendlyByteBuf buffer) + public static Cursor read(FriendlyByteBuf buffer) { boolean isDragging = buffer.readBoolean(); BlockPos positionStart = buffer.readBlockPos(); @@ -249,7 +271,7 @@ public void execute(ServerPlayer player) { if(!player.level().isClientSide() && ServerEditHandler.getData(player) != null) { - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY).orElseThrow(() -> LOGGER.throwing(new IllegalStateException("EditTool Capability is missing on player " + player.getDisplayName().getString() + " on server-side (during packet execution)!"))); + EditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); cap.setEditPos1(positionStart); cap.setEditPos2(positionEnd); @@ -261,12 +283,20 @@ public void execute(ServerPlayer player) public record Reset() implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("editmode_drag/reset"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { } - public static Reset decode(FriendlyByteBuf buffer) + public static Reset read(FriendlyByteBuf buffer) { return new Reset(); } @@ -276,7 +306,7 @@ public void execute(ServerPlayer player) { if(!player.level().isClientSide()) { - IEditTools cap = player.getCapability(MSCapabilities.EDIT_TOOLS_CAPABILITY).orElseThrow(() -> LOGGER.throwing(new IllegalStateException("EditTool Capability is missing on player " + player.getDisplayName().getString() + " on server-side (during packet execution)!"))); + EditTools cap = player.getData(MSCapabilities.EDIT_TOOLS_ATTACHMENT.get()); ServerEditHandler.removeCursorEntity(player, true); cap.resetDragTools(); diff --git a/src/main/java/com/mraof/minestuck/network/EditmodeInventoryPacket.java b/src/main/java/com/mraof/minestuck/network/EditmodeInventoryPacket.java index baf29981a9..5c2e09c85a 100644 --- a/src/main/java/com/mraof/minestuck/network/EditmodeInventoryPacket.java +++ b/src/main/java/com/mraof/minestuck/network/EditmodeInventoryPacket.java @@ -1,9 +1,11 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.gui.playerStats.InventoryEditmodeScreen; import com.mraof.minestuck.inventory.EditmodeMenu; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; @@ -12,6 +14,7 @@ public class EditmodeInventoryPacket implements MSPacket.PlayToBoth { + public static final ResourceLocation ID = Minestuck.id("editmode_inventory"); private final boolean b1, b2; private final List inventory; @@ -34,7 +37,13 @@ public static EditmodeInventoryPacket scroll(boolean isRight) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(b1); if(inventory != null) @@ -45,7 +54,7 @@ public void encode(FriendlyByteBuf buffer) } } - public static EditmodeInventoryPacket decode(FriendlyByteBuf buffer) + public static EditmodeInventoryPacket read(FriendlyByteBuf buffer) { boolean b1 = buffer.readBoolean(); if(buffer.readableBytes() > 0) diff --git a/src/main/java/com/mraof/minestuck/network/EditmodeTeleportPacket.java b/src/main/java/com/mraof/minestuck/network/EditmodeTeleportPacket.java index bbdd1366d8..e783f2e3ab 100644 --- a/src/main/java/com/mraof/minestuck/network/EditmodeTeleportPacket.java +++ b/src/main/java/com/mraof/minestuck/network/EditmodeTeleportPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.computer.editmode.EditData; import com.mraof.minestuck.computer.editmode.EditmodeLocations; import com.mraof.minestuck.world.storage.MSExtraData; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class EditmodeTeleportPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("editmode_teleport"); + private final BlockPos pos; public EditmodeTeleportPacket(BlockPos pos) @@ -17,12 +21,18 @@ public EditmodeTeleportPacket(BlockPos pos) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); } - public static EditmodeTeleportPacket decode(FriendlyByteBuf buffer) + public static EditmodeTeleportPacket read(FriendlyByteBuf buffer) { BlockPos pos = buffer.readBlockPos(); return new EditmodeTeleportPacket(pos); diff --git a/src/main/java/com/mraof/minestuck/network/EffectTogglePacket.java b/src/main/java/com/mraof/minestuck/network/EffectTogglePacket.java index 576db08efd..eaff5774f1 100644 --- a/src/main/java/com/mraof/minestuck/network/EffectTogglePacket.java +++ b/src/main/java/com/mraof/minestuck/network/EffectTogglePacket.java @@ -1,22 +1,32 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.player.PlayerData; import com.mraof.minestuck.player.PlayerSavedData; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class EffectTogglePacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("effect_toggle"); + public static final String ON = "minestuck.aspect_effects.on"; public static final String OFF = "minestuck.aspect_effects.off"; @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { } - public static EffectTogglePacket decode(FriendlyByteBuf buffer) + public static EffectTogglePacket read(FriendlyByteBuf ignored) { return new EffectTogglePacket(); } diff --git a/src/main/java/com/mraof/minestuck/network/EntryEffectPackets.java b/src/main/java/com/mraof/minestuck/network/EntryEffectPackets.java index 75151a80e1..47e1758597 100644 --- a/src/main/java/com/mraof/minestuck/network/EntryEffectPackets.java +++ b/src/main/java/com/mraof/minestuck/network/EntryEffectPackets.java @@ -1,25 +1,35 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.EntryEffect; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.Registries; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; public final class EntryEffectPackets { public record Effect(ResourceKey level, BlockPos center, int range) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("entry_effect/effect"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeResourceLocation(level.location()); buffer.writeBlockPos(center); buffer.writeInt(range); } - public static Effect decode(FriendlyByteBuf buffer) + public static Effect read(FriendlyByteBuf buffer) { ResourceKey level = ResourceKey.create(Registries.DIMENSION, buffer.readResourceLocation()); BlockPos pos = buffer.readBlockPos(); @@ -36,12 +46,20 @@ public void execute() public record Clear() implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("entry_effect/clear"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { } - public static Clear decode(FriendlyByteBuf ignored) + public static Clear read(FriendlyByteBuf ignored) { return new Clear(); } diff --git a/src/main/java/com/mraof/minestuck/network/GristRejectAnimationPacket.java b/src/main/java/com/mraof/minestuck/network/GristRejectAnimationPacket.java index c84bcee86f..7aa1094477 100644 --- a/src/main/java/com/mraof/minestuck/network/GristRejectAnimationPacket.java +++ b/src/main/java/com/mraof/minestuck/network/GristRejectAnimationPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.entity.item.GristEntity; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; import java.util.Objects; public class GristRejectAnimationPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("grist_reject_animation"); + private final int entityID; public static GristRejectAnimationPacket createPacket(GristEntity entity) @@ -23,12 +27,18 @@ private GristRejectAnimationPacket(int entityID) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(entityID); } - public static GristRejectAnimationPacket decode(FriendlyByteBuf buffer) + public static GristRejectAnimationPacket read(FriendlyByteBuf buffer) { int entityID = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/GristToastPacket.java b/src/main/java/com/mraof/minestuck/network/GristToastPacket.java index 26dfee3b01..3fb537fb30 100644 --- a/src/main/java/com/mraof/minestuck/network/GristToastPacket.java +++ b/src/main/java/com/mraof/minestuck/network/GristToastPacket.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.alchemy.GristHelper; import com.mraof.minestuck.api.alchemy.GristSet; @@ -9,11 +10,14 @@ import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.player.PlayerIdentifier; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; +import net.neoforged.neoforge.network.PacketDistributor; public record GristToastPacket(GristSet gristValue, GristHelper.EnumSource source, boolean isCacheOwner) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("grist_toast"); /** * Sends a request to make a client-side Toast Notification for incoming/outgoing grist, if enabled in the config. @@ -28,7 +32,7 @@ public static void notify(MinecraftServer server, PlayerIdentifier player, Grist if(MinestuckConfig.SERVER.showGristChanges.get()) { if(player.getPlayer(server) != null) - MSPacketHandler.sendToPlayer(new GristToastPacket(set, source, true), player.getPlayer(server)); + PacketDistributor.PLAYER.with(player.getPlayer(server)).send(new GristToastPacket(set, source, true)); if(source == GristHelper.EnumSource.SERVER) { @@ -37,21 +41,27 @@ public static void notify(MinecraftServer server, PlayerIdentifier player, Grist return; if(!player.appliesTo(ed.getEditor())) - MSPacketHandler.sendToPlayer(new GristToastPacket(set, source, false), ed.getEditor()); + PacketDistributor.PLAYER.with(ed.getEditor()).send(new GristToastPacket(set, source, false)); } } } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { GristSet.write(gristValue, buffer); buffer.writeEnum(source); buffer.writeBoolean(isCacheOwner); } - public static GristToastPacket decode(FriendlyByteBuf buffer) + public static GristToastPacket read(FriendlyByteBuf buffer) { ImmutableGristSet gristValue = GristSet.read(buffer); GristHelper.EnumSource source = buffer.readEnum(GristHelper.EnumSource.class); diff --git a/src/main/java/com/mraof/minestuck/network/GristWildcardPacket.java b/src/main/java/com/mraof/minestuck/network/GristWildcardPacket.java index 26ab127264..39083a539b 100644 --- a/src/main/java/com/mraof/minestuck/network/GristWildcardPacket.java +++ b/src/main/java/com/mraof/minestuck/network/GristWildcardPacket.java @@ -1,10 +1,12 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.api.alchemy.GristType; import com.mraof.minestuck.api.alchemy.GristTypes; import com.mraof.minestuck.blockentity.machine.GristWildcardHolder; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -13,6 +15,8 @@ public class GristWildcardPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("grist_wildcard"); + private static final Logger LOGGER = LogManager.getLogger(); private final GristType gristType; @@ -25,13 +29,19 @@ public GristWildcardPacket(BlockPos pos, GristType gristType) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeId(GristTypes.REGISTRY, gristType); buffer.writeBlockPos(pos); } - public static GristWildcardPacket decode(FriendlyByteBuf buffer) + public static GristWildcardPacket read(FriendlyByteBuf buffer) { GristType gristType = buffer.readById(GristTypes.REGISTRY); BlockPos pos = buffer.readBlockPos(); diff --git a/src/main/java/com/mraof/minestuck/network/LotusFlowerPacket.java b/src/main/java/com/mraof/minestuck/network/LotusFlowerPacket.java index 92c2aa1fd8..9a440fc5df 100644 --- a/src/main/java/com/mraof/minestuck/network/LotusFlowerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/LotusFlowerPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.entity.LotusFlowerEntity; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; public class LotusFlowerPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("lotus_flower"); + private final int entityID; private final LotusFlowerEntity.Animation animation; @@ -22,13 +26,19 @@ private LotusFlowerPacket(int entityID, LotusFlowerEntity.Animation animation) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(entityID); buffer.writeInt(animation.ordinal()); } - public static LotusFlowerPacket decode(FriendlyByteBuf buffer) + public static LotusFlowerPacket read(FriendlyByteBuf buffer) { int entityID = buffer.readInt(); //readInt spits out the values you gave to the PacketBuffer in encode in that order LotusFlowerEntity.Animation animation = LotusFlowerEntity.Animation.values()[buffer.readInt()]; diff --git a/src/main/java/com/mraof/minestuck/network/MSPacket.java b/src/main/java/com/mraof/minestuck/network/MSPacket.java index d9d0f4ff05..9d31297723 100644 --- a/src/main/java/com/mraof/minestuck/network/MSPacket.java +++ b/src/main/java/com/mraof/minestuck/network/MSPacket.java @@ -1,60 +1,46 @@ package com.mraof.minestuck.network; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerPlayer; -import net.neoforged.neoforge.network.NetworkEvent; -import net.neoforged.neoforge.network.PlayNetworkDirection; +import net.neoforged.neoforge.network.handling.IPlayPayloadHandler; +import net.neoforged.neoforge.network.registration.IDirectionAwarePayloadHandlerBuilder; public interface MSPacket { - void encode(FriendlyByteBuf buffer); - - void consume(NetworkEvent.Context ctx); - @Deprecated // Generally bad design to write multi-purpose packets. Such a packet should *generally* be written as several types of packets instead. - interface PlayToBoth extends MSPacket + interface PlayToBoth extends PlayToClient, PlayToServer { - @Override - default void consume(NetworkEvent.Context ctx) - { - if(ctx.getDirection() == PlayNetworkDirection.PLAY_TO_SERVER) - ctx.enqueueWork(() -> this.execute(ctx.getSender())); - else if(ctx.getDirection() == PlayNetworkDirection.PLAY_TO_CLIENT) - ctx.enqueueWork(this::execute); - - ctx.setPacketHandled(true); - } - void execute(); void execute(ServerPlayer player); + + static

void handlerBoth(IDirectionAwarePayloadHandlerBuilder> builder) + { + PlayToClient.handler(builder); + PlayToServer.handler(builder); + } } - interface PlayToClient extends MSPacket + interface PlayToClient extends CustomPacketPayload { - @Override - default void consume(NetworkEvent.Context ctx) + void execute(); + + static

void handler(IDirectionAwarePayloadHandlerBuilder> builder) { - if(ctx.getDirection() == PlayNetworkDirection.PLAY_TO_CLIENT) - ctx.enqueueWork(this::execute); - - ctx.setPacketHandled(true); + builder.client((payload, context) -> context.workHandler().execute(payload::execute)); } - - void execute(); } - interface PlayToServer extends MSPacket + interface PlayToServer extends CustomPacketPayload { - @Override - default void consume(NetworkEvent.Context ctx) + void execute(ServerPlayer player); + + static

void handler(IDirectionAwarePayloadHandlerBuilder> builder) { - if(ctx.getDirection() == PlayNetworkDirection.PLAY_TO_SERVER) - ctx.enqueueWork(() -> this.execute(ctx.getSender())); - - ctx.setPacketHandled(true); + builder.server((payload, context) -> context.workHandler().execute(() -> { + if(context.player().isPresent() && context.player().get() instanceof ServerPlayer serverPlayer) + payload.execute(serverPlayer); + })); } - - void execute(ServerPlayer player); } } diff --git a/src/main/java/com/mraof/minestuck/network/MSPacketHandler.java b/src/main/java/com/mraof/minestuck/network/MSPacketHandler.java deleted file mode 100644 index 2ed4e36364..0000000000 --- a/src/main/java/com/mraof/minestuck/network/MSPacketHandler.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.mraof.minestuck.network; - -import com.mraof.minestuck.Minestuck; -import com.mraof.minestuck.network.computer.*; -import com.mraof.minestuck.network.data.*; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.Entity; -import net.neoforged.neoforge.network.INetworkDirection; -import net.neoforged.neoforge.network.NetworkRegistry; -import net.neoforged.neoforge.network.PacketDistributor; -import net.neoforged.neoforge.network.PlayNetworkDirection; -import net.neoforged.neoforge.network.simple.MessageFunctions; -import net.neoforged.neoforge.network.simple.SimpleChannel; - -import java.util.Optional; - -public class MSPacketHandler -{ - private static final String PROTOCOL_VERSION = "3"; - public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel(new ResourceLocation(Minestuck.MOD_ID, "main"), - () -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals); - - public static void setupChannel() - { - nextIndex = 0; - - registerToClientMessage(DataCheckerPermissionPacket.class, DataCheckerPermissionPacket::decode); - registerToClientMessage(EcheladderDataPacket.class, EcheladderDataPacket::decode); - registerToClientMessage(ColorDataPacket.class, ColorDataPacket::decode); - registerToClientMessage(ModusDataPacket.class, ModusDataPacket::decode); - registerToClientMessage(BoondollarDataPacket.class, BoondollarDataPacket::decode); - registerToClientMessage(ConsortReputationDataPacket.class, ConsortReputationDataPacket::decode); - registerToClientMessage(GristCachePacket.class, GristCachePacket::decode); - registerToClientMessage(EditmodeCacheLimitPacket.class, EditmodeCacheLimitPacket::decode); - registerToClientMessage(TitleDataPacket.class, TitleDataPacket::decode); - registerToClientMessage(LandTypesDataPacket.class, LandTypesDataPacket::decode); - - registerToServerMessage(CaptchaDeckPacket.class, CaptchaDeckPacket::decode); - registerToServerMessage(ColorSelectPacket.class, ColorSelectPacket::decode); - registerToServerMessage(RGBColorSelectPacket.class, RGBColorSelectPacket::decode); - registerToBothMessage(TitleSelectPacket.class, TitleSelectPacket::decode); - - registerToClientMessage(DialoguePackets.OpenScreen.class, DialoguePackets.OpenScreen::decode); - registerToClientMessage(DialoguePackets.CloseScreen.class, DialoguePackets.CloseScreen::decode); - registerToServerMessage(DialoguePackets.OnCloseScreen.class, DialoguePackets.OnCloseScreen::decode); - registerToServerMessage(DialoguePackets.TriggerResponse.class, DialoguePackets.TriggerResponse::decode); - - registerToServerMessage(ConnectToSburbServerPacket.class, ConnectToSburbServerPacket::decode); - registerToServerMessage(OpenSburbServerPacket.class, OpenSburbServerPacket::decode); - registerToServerMessage(ResumeSburbConnectionPacket.class, ResumeSburbConnectionPacket::decode); - registerToServerMessage(CloseSburbConnectionPacket.class, CloseSburbConnectionPacket::decode); - registerToServerMessage(CloseRemoteSburbConnectionPacket.class, CloseRemoteSburbConnectionPacket::decode); - registerToServerMessage(ClearMessagePacket.class, ClearMessagePacket::decode); - - registerToClientMessage(SkaianetInfoPacket.Data.class, SkaianetInfoPacket.Data::decode); - registerToClientMessage(SkaianetInfoPacket.HasEntered.class, SkaianetInfoPacket.HasEntered::decode); - registerToServerMessage(SkaianetInfoPacket.Request.class, SkaianetInfoPacket.Request::decode); - registerToClientMessage(SkaianetInfoPacket.LandChains.class, SkaianetInfoPacket.LandChains::decode); - - registerToServerMessage(BurnDiskPacket.class, BurnDiskPacket::decode); - registerToServerMessage(ThemeSelectPacket.class, ThemeSelectPacket::decode); - registerToBothMessage(DataCheckerPacket.class, DataCheckerPacket::decode); - registerToServerMessage(ClientEditPacket.class, ClientEditPacket::decode); - registerToClientMessage(ServerEditPacket.Activate.class, ServerEditPacket.Activate::decode); - registerToClientMessage(ServerEditPacket.UpdateDeployList.class, ServerEditPacket.UpdateDeployList::decode); - registerToClientMessage(ServerEditPacket.Exit.class, ServerEditPacket.Exit::decode); - registerToClientMessage(EditmodeLocationsPacket.class, EditmodeLocationsPacket::decode); - registerToServerMessage(MiscContainerPacket.class, MiscContainerPacket::decode); - registerToServerMessage(EditmodeDragPacket.Fill.class, EditmodeDragPacket.Fill::decode); - registerToServerMessage(EditmodeDragPacket.Destroy.class, EditmodeDragPacket.Destroy::decode); - registerToServerMessage(EditmodeDragPacket.Cursor.class, EditmodeDragPacket.Cursor::decode); - registerToServerMessage(EditmodeDragPacket.Reset.class, EditmodeDragPacket.Reset::decode); - registerToBothMessage(EditmodeInventoryPacket.class, EditmodeInventoryPacket::decode); - registerToServerMessage(EditmodeTeleportPacket.class, EditmodeTeleportPacket::decode); - registerToServerMessage(MachinePacket.SetRunning.class, MachinePacket.SetRunning::decode); - registerToServerMessage(MachinePacket.SetLooping.class, MachinePacket.SetLooping::decode); - registerToServerMessage(AlchemiterPacket.class, AlchemiterPacket::decode); - registerToServerMessage(PunchDesignixPacket.class, PunchDesignixPacket::decode); - registerToServerMessage(GristWildcardPacket.class, GristWildcardPacket::decode); - registerToServerMessage(SendificatorPacket.class, SendificatorPacket::decode); - registerToServerMessage(TransportalizerPacket.Id.class, TransportalizerPacket.Id::decode); - registerToServerMessage(TransportalizerPacket.DestId.class, TransportalizerPacket.DestId::decode); - registerToServerMessage(AreaEffectPacket.class, AreaEffectPacket::decode); - registerToServerMessage(WirelessRedstoneTransmitterPacket.class, WirelessRedstoneTransmitterPacket::decode); - registerToServerMessage(StatStorerPacket.class, StatStorerPacket::decode); - registerToServerMessage(RemoteObserverPacket.class, RemoteObserverPacket::decode); - registerToServerMessage(SummonerPacket.class, SummonerPacket::decode); - registerToServerMessage(StructureCorePacket.class, StructureCorePacket::decode); - registerToServerMessage(EffectTogglePacket.class, EffectTogglePacket::decode); - registerToServerMessage(StoneTabletPacket.class, StoneTabletPacket::decode); - registerToServerMessage(AnthvilPacket.class, AnthvilPacket::decode); - registerToClientMessage(MagicRangedEffectPacket.class, MagicRangedEffectPacket::decode); - registerToClientMessage(MagicAOEEffectPacket.class, MagicAOEEffectPacket::decode); - registerToClientMessage(LotusFlowerPacket.class, LotusFlowerPacket::decode); - registerToClientMessage(ServerCursorPacket.class, ServerCursorPacket::decode); - registerToClientMessage(MusicPlayerPacket.class, MusicPlayerPacket::decode); - registerToClientMessage(GristRejectAnimationPacket.class, GristRejectAnimationPacket::decode); - registerToClientMessage(StopCreativeShockEffectPacket.class, StopCreativeShockEffectPacket::decode); - registerToClientMessage(ClientMovementPacket.class, ClientMovementPacket::decode); - registerToClientMessage(GristToastPacket.class, GristToastPacket::decode); - registerToServerMessage(AtheneumPacket.Scroll.class, AtheneumPacket.Scroll::decode); - registerToClientMessage(AtheneumPacket.Update.class, AtheneumPacket.Update::decode); - registerToClientMessage(EntryEffectPackets.Effect.class, EntryEffectPackets.Effect::decode); - registerToClientMessage(EntryEffectPackets.Clear.class, EntryEffectPackets.Clear::decode); - } - - private static void registerToBothMessage(Class messageType, MessageFunctions.MessageDecoder decoder) - { - registerMessage(messageType, decoder, Optional.empty()); - } - - private static void registerToClientMessage(Class messageType, MessageFunctions.MessageDecoder decoder) - { - registerMessage(messageType, decoder, Optional.of(PlayNetworkDirection.PLAY_TO_CLIENT)); - } - - private static void registerToServerMessage(Class messageType, MessageFunctions.MessageDecoder decoder) - { - registerMessage(messageType, decoder, Optional.of(PlayNetworkDirection.PLAY_TO_SERVER)); - } - - private static int nextIndex; - - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - private static void registerMessage(Class messageType, MessageFunctions.MessageDecoder decoder, - Optional> networkDirection) - { - INSTANCE.registerMessage(nextIndex++, messageType, MSPacket::encode, decoder, MSPacket::consume, networkDirection); - } - - public static void sendToPlayer(MSG message, ServerPlayer player) - { - INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), message); - } - - public static void sendToAll(MSG message) - { - INSTANCE.send(PacketDistributor.ALL.noArg(), message); - } - - public static void sendToNear(MSG message, PacketDistributor.TargetPoint point) - { - INSTANCE.send(PacketDistributor.NEAR.with(() -> point), message); - } - - public static void sendToServer(MSG message) - { - INSTANCE.sendToServer(message); - } - - public static void sendToTracking(MSG message, Entity entity) - { - INSTANCE.send(PacketDistributor.TRACKING_ENTITY.with(() -> entity), message); - } - - public static void sendToTrackingAndSelf(MSG message, Entity entity) - { - INSTANCE.send(PacketDistributor.TRACKING_ENTITY_AND_SELF.with(() -> entity), message); - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/network/MSPayloads.java b/src/main/java/com/mraof/minestuck/network/MSPayloads.java new file mode 100644 index 0000000000..bbdef0b19a --- /dev/null +++ b/src/main/java/com/mraof/minestuck/network/MSPayloads.java @@ -0,0 +1,112 @@ +package com.mraof.minestuck.network; + +import com.mraof.minestuck.Minestuck; +import com.mraof.minestuck.network.computer.*; +import com.mraof.minestuck.network.data.*; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent; + +@Mod.EventBusSubscriber(modid = Minestuck.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class MSPayloads +{ + @SubscribeEvent + private static void regsiter(RegisterPayloadHandlerEvent event) + { + event.registrar(Minestuck.MOD_ID) + .versioned("1") + .play(DataCheckerPermissionPacket.ID, DataCheckerPermissionPacket::read, MSPacket.PlayToClient::handler) + .play(EcheladderDataPacket.ID, EcheladderDataPacket::read, MSPacket.PlayToClient::handler) + .play(ColorDataPacket.ID, ColorDataPacket::read, MSPacket.PlayToClient::handler) + .play(ModusDataPacket.ID, ModusDataPacket::read, MSPacket.PlayToClient::handler) + .play(BoondollarDataPacket.ID, BoondollarDataPacket::read, MSPacket.PlayToClient::handler) + .play(ConsortReputationDataPacket.ID, ConsortReputationDataPacket::read, MSPacket.PlayToClient::handler) + .play(GristCachePacket.ID, GristCachePacket::read, MSPacket.PlayToClient::handler) + .play(EditmodeCacheLimitPacket.ID, EditmodeCacheLimitPacket::read, MSPacket.PlayToClient::handler) + .play(TitleDataPacket.ID, TitleDataPacket::read, MSPacket.PlayToClient::handler) + .play(LandTypesDataPacket.ID, LandTypesDataPacket::read, MSPacket.PlayToClient::handler) + + .play(CaptchaDeckPacket.ID, CaptchaDeckPacket::read, MSPacket.PlayToServer::handler) + .play(ColorSelectPacket.ID, ColorSelectPacket::read, MSPacket.PlayToServer::handler) + .play(RGBColorSelectPacket.ID, RGBColorSelectPacket::read, MSPacket.PlayToServer::handler) + .play(TitleSelectPacket.ID, TitleSelectPacket::read, MSPacket.PlayToBoth::handlerBoth) + + .play(DialoguePackets.OpenScreen.ID, DialoguePackets.OpenScreen::read, MSPacket.PlayToClient::handler) + .play(DialoguePackets.CloseScreen.ID, DialoguePackets.CloseScreen::read, MSPacket.PlayToClient::handler) + .play(DialoguePackets.OnCloseScreen.ID, DialoguePackets.OnCloseScreen::read, MSPacket.PlayToServer::handler) + .play(DialoguePackets.TriggerResponse.ID, DialoguePackets.TriggerResponse::read, MSPacket.PlayToServer::handler) + + .play(ConnectToSburbServerPacket.ID, ConnectToSburbServerPacket::read, MSPacket.PlayToServer::handler) + .play(OpenSburbServerPacket.ID, OpenSburbServerPacket::read, MSPacket.PlayToServer::handler) + .play(ResumeSburbConnectionPacket.ID, ResumeSburbConnectionPacket::read, MSPacket.PlayToServer::handler) + .play(CloseSburbConnectionPacket.ID, CloseSburbConnectionPacket::read, MSPacket.PlayToServer::handler) + .play(CloseRemoteSburbConnectionPacket.ID, CloseRemoteSburbConnectionPacket::read, MSPacket.PlayToServer::handler) + .play(ClearMessagePacket.ID, ClearMessagePacket::read, MSPacket.PlayToServer::handler) + + .play(SkaianetInfoPacket.Data.ID, SkaianetInfoPacket.Data::read, MSPacket.PlayToClient::handler) + .play(SkaianetInfoPacket.HasEntered.ID, SkaianetInfoPacket.HasEntered::read, MSPacket.PlayToClient::handler) + .play(SkaianetInfoPacket.Request.ID, SkaianetInfoPacket.Request::read, MSPacket.PlayToServer::handler) + .play(SkaianetInfoPacket.LandChains.ID, SkaianetInfoPacket.LandChains::read, MSPacket.PlayToClient::handler) + + .play(BurnDiskPacket.ID, BurnDiskPacket::read, MSPacket.PlayToServer::handler) + .play(ThemeSelectPacket.ID, ThemeSelectPacket::read, MSPacket.PlayToServer::handler) + .play(DataCheckerPacket.ID, DataCheckerPacket::read, MSPacket.PlayToBoth::handlerBoth) + + .play(MiscContainerPacket.ID, MiscContainerPacket::read, MSPacket.PlayToServer::handler) + + .play(ClientEditPacket.ID, ClientEditPacket::read, MSPacket.PlayToServer::handler) + .play(ServerEditPacket.Activate.ID, ServerEditPacket.Activate::read, MSPacket.PlayToClient::handler) + .play(ServerEditPacket.UpdateDeployList.ID, ServerEditPacket.UpdateDeployList::read, MSPacket.PlayToClient::handler) + .play(ServerEditPacket.Exit.ID, ServerEditPacket.Exit::read, MSPacket.PlayToClient::handler) + + .play(EditmodeDragPacket.Fill.ID, EditmodeDragPacket.Fill::read, MSPacket.PlayToServer::handler) + .play(EditmodeDragPacket.Destroy.ID, EditmodeDragPacket.Destroy::read, MSPacket.PlayToServer::handler) + .play(EditmodeDragPacket.Cursor.ID, EditmodeDragPacket.Cursor::read, MSPacket.PlayToServer::handler) + .play(EditmodeDragPacket.Reset.ID, EditmodeDragPacket.Reset::read, MSPacket.PlayToServer::handler) + + .play(EditmodeLocationsPacket.ID, EditmodeLocationsPacket::read, MSPacket.PlayToClient::handler) + .play(EditmodeInventoryPacket.ID, EditmodeInventoryPacket::read, MSPacket.PlayToBoth::handlerBoth) + .play(EditmodeTeleportPacket.ID, EditmodeTeleportPacket::read, MSPacket.PlayToServer::handler) + + .play(MachinePacket.SetRunning.ID, MachinePacket.SetRunning::read, MSPacket.PlayToServer::handler) + .play(MachinePacket.SetLooping.ID, MachinePacket.SetLooping::read, MSPacket.PlayToServer::handler) + + .play(AlchemiterPacket.ID, AlchemiterPacket::read, MSPacket.PlayToServer::handler) + .play(PunchDesignixPacket.ID, PunchDesignixPacket::read, MSPacket.PlayToServer::handler) + .play(GristWildcardPacket.ID, GristWildcardPacket::read, MSPacket.PlayToServer::handler) + .play(SendificatorPacket.ID, SendificatorPacket::read, MSPacket.PlayToServer::handler) + + .play(TransportalizerPacket.Id.ID, TransportalizerPacket.Id::read, MSPacket.PlayToServer::handler) + .play(TransportalizerPacket.DestId.ID, TransportalizerPacket.DestId::read, MSPacket.PlayToServer::handler) + + .play(AreaEffectPacket.ID, AreaEffectPacket::read, MSPacket.PlayToServer::handler) + .play(WirelessRedstoneTransmitterPacket.ID, WirelessRedstoneTransmitterPacket::read, MSPacket.PlayToServer::handler) + .play(StatStorerPacket.ID, StatStorerPacket::read, MSPacket.PlayToServer::handler) + .play(RemoteObserverPacket.ID, RemoteObserverPacket::read, MSPacket.PlayToServer::handler) + .play(SummonerPacket.ID, SummonerPacket::read, MSPacket.PlayToServer::handler) + .play(StructureCorePacket.ID, StructureCorePacket::read, MSPacket.PlayToServer::handler) + + .play(EffectTogglePacket.ID, EffectTogglePacket::read, MSPacket.PlayToServer::handler) + .play(StoneTabletPacket.ID, StoneTabletPacket::read, MSPacket.PlayToServer::handler) + .play(AnthvilPacket.ID, AnthvilPacket::read, MSPacket.PlayToServer::handler) + + .play(MagicRangedEffectPacket.ID, MagicRangedEffectPacket::read, MSPacket.PlayToClient::handler) + .play(MagicAOEEffectPacket.ID, MagicAOEEffectPacket::read, MSPacket.PlayToClient::handler) + + .play(LotusFlowerPacket.ID, LotusFlowerPacket::read, MSPacket.PlayToClient::handler) + .play(ServerCursorPacket.ID, ServerCursorPacket::read, MSPacket.PlayToClient::handler) + .play(MusicPlayerPacket.ID, MusicPlayerPacket::read, MSPacket.PlayToClient::handler) + .play(GristRejectAnimationPacket.ID, GristRejectAnimationPacket::read, MSPacket.PlayToClient::handler) + + .play(StopCreativeShockEffectPacket.ID, StopCreativeShockEffectPacket::read, MSPacket.PlayToClient::handler) + .play(ClientMovementPacket.ID, ClientMovementPacket::read, MSPacket.PlayToClient::handler) + .play(GristToastPacket.ID, GristToastPacket::read, MSPacket.PlayToClient::handler) + + .play(AtheneumPacket.Scroll.ID, AtheneumPacket.Scroll::read, MSPacket.PlayToServer::handler) + .play(AtheneumPacket.Update.ID, AtheneumPacket.Update::read, MSPacket.PlayToClient::handler) + + .play(EntryEffectPackets.Effect.ID, EntryEffectPackets.Effect::read, MSPacket.PlayToClient::handler) + .play(EntryEffectPackets.Clear.ID, EntryEffectPackets.Clear::read, MSPacket.PlayToClient::handler) + ; + } +} diff --git a/src/main/java/com/mraof/minestuck/network/MachinePacket.java b/src/main/java/com/mraof/minestuck/network/MachinePacket.java index 1efb73d953..2b22921dc6 100644 --- a/src/main/java/com/mraof/minestuck/network/MachinePacket.java +++ b/src/main/java/com/mraof/minestuck/network/MachinePacket.java @@ -1,20 +1,30 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.inventory.MachineContainerMenu; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public final class MachinePacket { public record SetRunning(boolean shouldRun) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("machine/set_running"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(shouldRun); } - public static SetRunning decode(FriendlyByteBuf buffer) + public static SetRunning read(FriendlyByteBuf buffer) { return new SetRunning(buffer.readBoolean()); } @@ -32,13 +42,21 @@ public void execute(ServerPlayer player) public record SetLooping(boolean shouldLoop) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("machine/set_looping"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(this.shouldLoop); } - public static SetLooping decode(FriendlyByteBuf buffer) + public static SetLooping read(FriendlyByteBuf buffer) { return new SetLooping(buffer.readBoolean()); } diff --git a/src/main/java/com/mraof/minestuck/network/MagicAOEEffectPacket.java b/src/main/java/com/mraof/minestuck/network/MagicAOEEffectPacket.java index 352f4ce4e1..161b01de85 100644 --- a/src/main/java/com/mraof/minestuck/network/MagicAOEEffectPacket.java +++ b/src/main/java/com/mraof/minestuck/network/MagicAOEEffectPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.util.MagicEffect; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; public class MagicAOEEffectPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("magic_aoe_effect"); + private final MagicEffect.AOEType type; private final Vec3 minAOEBound, maxAOEBound; @@ -18,7 +22,13 @@ public MagicAOEEffectPacket(MagicEffect.AOEType type, Vec3 minAOEBound, Vec3 max } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(type.toInt()); buffer.writeDouble(minAOEBound.x); @@ -29,7 +39,7 @@ public void encode(FriendlyByteBuf buffer) buffer.writeDouble(maxAOEBound.z); } - public static MagicAOEEffectPacket decode(FriendlyByteBuf buffer) + public static MagicAOEEffectPacket read(FriendlyByteBuf buffer) { MagicEffect.AOEType type = MagicEffect.AOEType.fromInt(buffer.readInt()); Vec3 minAOEBound = new Vec3(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()); diff --git a/src/main/java/com/mraof/minestuck/network/MagicRangedEffectPacket.java b/src/main/java/com/mraof/minestuck/network/MagicRangedEffectPacket.java index 5a00def314..b750a3fe82 100644 --- a/src/main/java/com/mraof/minestuck/network/MagicRangedEffectPacket.java +++ b/src/main/java/com/mraof/minestuck/network/MagicRangedEffectPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.util.MagicEffect; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; public class MagicRangedEffectPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("magic_ranged_effect"); + private final MagicEffect.RangedType type; private final Vec3 pos, lookVec; private final int length; @@ -22,7 +26,13 @@ public MagicRangedEffectPacket(MagicEffect.RangedType type, Vec3 pos, Vec3 lookV } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(type.toInt()); buffer.writeDouble(pos.x); @@ -35,7 +45,7 @@ public void encode(FriendlyByteBuf buffer) buffer.writeBoolean(collides); } - public static MagicRangedEffectPacket decode(FriendlyByteBuf buffer) + public static MagicRangedEffectPacket read(FriendlyByteBuf buffer) { MagicEffect.RangedType type = MagicEffect.RangedType.fromInt(buffer.readInt()); Vec3 pos = new Vec3(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()); diff --git a/src/main/java/com/mraof/minestuck/network/MiscContainerPacket.java b/src/main/java/com/mraof/minestuck/network/MiscContainerPacket.java index 7b4af182ee..13fb3b6008 100644 --- a/src/main/java/com/mraof/minestuck/network/MiscContainerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/MiscContainerPacket.java @@ -1,11 +1,13 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.gui.playerStats.PlayerStatsScreen; import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.inventory.AtheneumMenu; import com.mraof.minestuck.inventory.EditmodeMenu; import com.mraof.minestuck.inventory.captchalogue.CaptchaDeckMenu; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; import net.neoforged.neoforge.common.NeoForge; @@ -15,6 +17,8 @@ public class MiscContainerPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("misc_container"); + private static final Logger LOGGER = LogManager.getLogger(); private final int index; @@ -27,13 +31,19 @@ public MiscContainerPacket(int index, boolean editmode) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(index); buffer.writeBoolean(editmode); } - public static MiscContainerPacket decode(FriendlyByteBuf buffer) + public static MiscContainerPacket read(FriendlyByteBuf buffer) { int index = buffer.readInt(); boolean editmode = buffer.readBoolean(); diff --git a/src/main/java/com/mraof/minestuck/network/MusicPlayerPacket.java b/src/main/java/com/mraof/minestuck/network/MusicPlayerPacket.java index 2a83d460a5..5302f49dbe 100644 --- a/src/main/java/com/mraof/minestuck/network/MusicPlayerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/MusicPlayerPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.block.EnumCassetteType; import com.mraof.minestuck.client.sounds.PlayerMusicClientHandler; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; public class MusicPlayerPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("music_player"); + private final int entityID; private final EnumCassetteType cassetteType; private final float volume; @@ -37,7 +41,13 @@ public MusicPlayerPacket(int entityID, EnumCassetteType cassetteType, float volu } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(entityID); buffer.writeFloat(volume); @@ -45,7 +55,7 @@ public void encode(FriendlyByteBuf buffer) buffer.writeInt(cassetteType.ordinal()); } - public static MusicPlayerPacket decode(FriendlyByteBuf buffer) + public static MusicPlayerPacket read(FriendlyByteBuf buffer) { int entityID = buffer.readInt(); //readInt spits out the values you gave to the PacketBuffer in encode in that order float volume = buffer.readFloat(); diff --git a/src/main/java/com/mraof/minestuck/network/PunchDesignixPacket.java b/src/main/java/com/mraof/minestuck/network/PunchDesignixPacket.java index 1c1ca0fba2..bc8006ca4a 100644 --- a/src/main/java/com/mraof/minestuck/network/PunchDesignixPacket.java +++ b/src/main/java/com/mraof/minestuck/network/PunchDesignixPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.machine.PunchDesignixBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class PunchDesignixPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("punch_designix"); + private final BlockPos pos; private final String captcha; @@ -17,13 +21,19 @@ public PunchDesignixPacket(BlockPos pos, String captcha) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeUtf(captcha, 8); } - public static PunchDesignixPacket decode(FriendlyByteBuf buffer) + public static PunchDesignixPacket read(FriendlyByteBuf buffer) { BlockPos pos = buffer.readBlockPos(); String captcha = buffer.readUtf(8); diff --git a/src/main/java/com/mraof/minestuck/network/RGBColorSelectPacket.java b/src/main/java/com/mraof/minestuck/network/RGBColorSelectPacket.java index 1d0b8a9276..a3b0780237 100644 --- a/src/main/java/com/mraof/minestuck/network/RGBColorSelectPacket.java +++ b/src/main/java/com/mraof/minestuck/network/RGBColorSelectPacket.java @@ -1,11 +1,15 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.player.PlayerSavedData; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class RGBColorSelectPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("rgb_color_select"); + private final int color; public RGBColorSelectPacket(int color) @@ -14,12 +18,18 @@ public RGBColorSelectPacket(int color) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(color); } - public static RGBColorSelectPacket decode(FriendlyByteBuf buffer) + public static RGBColorSelectPacket read(FriendlyByteBuf buffer) { return new RGBColorSelectPacket(buffer.readInt()); } diff --git a/src/main/java/com/mraof/minestuck/network/RemoteObserverPacket.java b/src/main/java/com/mraof/minestuck/network/RemoteObserverPacket.java index bbe8665933..278c8d79e6 100644 --- a/src/main/java/com/mraof/minestuck/network/RemoteObserverPacket.java +++ b/src/main/java/com/mraof/minestuck/network/RemoteObserverPacket.java @@ -1,8 +1,10 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.redstone.RemoteObserverBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.state.BlockState; @@ -12,6 +14,8 @@ public class RemoteObserverPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("remote_observer"); + private final RemoteObserverBlockEntity.ActiveType activeType; private final BlockPos beBlockPos; private final EntityType entityType; @@ -26,7 +30,13 @@ public RemoteObserverPacket(RemoteObserverBlockEntity.ActiveType activeType, int } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeEnum(activeType); buffer.writeInt(observingRange); @@ -39,7 +49,7 @@ public void encode(FriendlyByteBuf buffer) } - public static RemoteObserverPacket decode(FriendlyByteBuf buffer) + public static RemoteObserverPacket read(FriendlyByteBuf buffer) { RemoteObserverBlockEntity.ActiveType activeType = buffer.readEnum(RemoteObserverBlockEntity.ActiveType.class); int observingRange = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/SendificatorPacket.java b/src/main/java/com/mraof/minestuck/network/SendificatorPacket.java index efa90e868c..6d678f4ac5 100644 --- a/src/main/java/com/mraof/minestuck/network/SendificatorPacket.java +++ b/src/main/java/com/mraof/minestuck/network/SendificatorPacket.java @@ -1,15 +1,19 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.machine.SendificatorBlockEntity; import com.mraof.minestuck.inventory.SendificatorMenu; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.state.BlockState; public class SendificatorPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("sendificator"); + private final BlockPos destinationBlockPos; public SendificatorPacket(BlockPos pos) @@ -18,12 +22,18 @@ public SendificatorPacket(BlockPos pos) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(destinationBlockPos); } - public static SendificatorPacket decode(FriendlyByteBuf buffer) + public static SendificatorPacket read(FriendlyByteBuf buffer) { BlockPos destinationBlockPos = buffer.readBlockPos(); diff --git a/src/main/java/com/mraof/minestuck/network/ServerCursorPacket.java b/src/main/java/com/mraof/minestuck/network/ServerCursorPacket.java index e0a1b89543..8030ae95ad 100644 --- a/src/main/java/com/mraof/minestuck/network/ServerCursorPacket.java +++ b/src/main/java/com/mraof/minestuck/network/ServerCursorPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.entity.ServerCursorEntity; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; public class ServerCursorPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("server_cursor"); + private final int entityID; private final ServerCursorEntity.AnimationType animation; @@ -22,13 +26,19 @@ private ServerCursorPacket(int entityID, ServerCursorEntity.AnimationType animat } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(entityID); buffer.writeInt(animation.ordinal()); } - public static ServerCursorPacket decode(FriendlyByteBuf buffer) + public static ServerCursorPacket read(FriendlyByteBuf buffer) { int entityID = buffer.readInt(); //readInt spits out the values you gave to the PacketBuffer in encode in that order ServerCursorEntity.AnimationType animation = ServerCursorEntity.AnimationType.values()[buffer.readInt()]; diff --git a/src/main/java/com/mraof/minestuck/network/ServerEditPacket.java b/src/main/java/com/mraof/minestuck/network/ServerEditPacket.java index fb8c6211da..0d47dd8779 100644 --- a/src/main/java/com/mraof/minestuck/network/ServerEditPacket.java +++ b/src/main/java/com/mraof/minestuck/network/ServerEditPacket.java @@ -1,9 +1,11 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.computer.editmode.ClientDeployList; import com.mraof.minestuck.computer.editmode.ClientEditmodeData; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import java.util.Objects; @@ -11,11 +13,19 @@ public final class ServerEditPacket { public record Activate() implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("server_edit/activate"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf ignored) + public void write(FriendlyByteBuf ignored) {} - public static Activate decode(FriendlyByteBuf ignored) + public static Activate read(FriendlyByteBuf ignored) { return new Activate(); } @@ -29,13 +39,21 @@ public void execute() public record UpdateDeployList(CompoundTag data) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("server_edit/update_deploy_list"); + @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeNbt(this.data); } - public static UpdateDeployList decode(FriendlyByteBuf buffer) + public static UpdateDeployList read(FriendlyByteBuf buffer) { CompoundTag data = Objects.requireNonNull(buffer.readNbt()); return new UpdateDeployList(data); @@ -50,11 +68,19 @@ public void execute() public record Exit() implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("server_edit/exit"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf ignored) + public void write(FriendlyByteBuf ignored) {} - public static Exit decode(FriendlyByteBuf ignored) + public static Exit read(FriendlyByteBuf ignored) { return new Exit(); } diff --git a/src/main/java/com/mraof/minestuck/network/StatStorerPacket.java b/src/main/java/com/mraof/minestuck/network/StatStorerPacket.java index b846850a7d..3dcbf0a742 100644 --- a/src/main/java/com/mraof/minestuck/network/StatStorerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/StatStorerPacket.java @@ -1,13 +1,17 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.redstone.StatStorerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.block.entity.BlockEntity; public class StatStorerPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("stat_storer"); + private final StatStorerBlockEntity.ActiveType activeType; private final BlockPos beBlockPos; private final int divideValueBy; @@ -20,14 +24,20 @@ public StatStorerPacket(StatStorerBlockEntity.ActiveType activeType, BlockPos be } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeEnum(activeType); buffer.writeBlockPos(beBlockPos); buffer.writeInt(divideValueBy); } - public static StatStorerPacket decode(FriendlyByteBuf buffer) + public static StatStorerPacket read(FriendlyByteBuf buffer) { StatStorerBlockEntity.ActiveType activeType = buffer.readEnum(StatStorerBlockEntity.ActiveType.class); BlockPos beBlockPos = buffer.readBlockPos(); diff --git a/src/main/java/com/mraof/minestuck/network/StoneTabletPacket.java b/src/main/java/com/mraof/minestuck/network/StoneTabletPacket.java index a3cd740862..98b7fb81f0 100644 --- a/src/main/java/com/mraof/minestuck/network/StoneTabletPacket.java +++ b/src/main/java/com/mraof/minestuck/network/StoneTabletPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.item.MSItems; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.item.ItemStack; public class StoneTabletPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("stone_tablet"); + private final String text; private final InteractionHand hand; @@ -18,6 +22,24 @@ public StoneTabletPacket(String text, InteractionHand hand) this.hand = hand; } + @Override + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) + { + buffer.writeUtf(text); + buffer.writeInt(hand.ordinal()); + } + + public static StoneTabletPacket read(FriendlyByteBuf buffer) + { + return new StoneTabletPacket(buffer.readUtf(), InteractionHand.values()[buffer.readInt()]); + } + @Override public void execute(ServerPlayer player) { @@ -31,18 +53,5 @@ public void execute(ServerPlayer player) nbt.putString("text", text); tablet.setTag(nbt); } - - } - - public static StoneTabletPacket decode(FriendlyByteBuf buffer) - { - return new StoneTabletPacket(buffer.readUtf(32767), InteractionHand.values()[buffer.readInt()]); - } - - @Override - public void encode(FriendlyByteBuf buffer) - { - buffer.writeUtf(text); - buffer.writeInt(hand.ordinal()); } } diff --git a/src/main/java/com/mraof/minestuck/network/StopCreativeShockEffectPacket.java b/src/main/java/com/mraof/minestuck/network/StopCreativeShockEffectPacket.java index 19dd66584d..08d9579545 100644 --- a/src/main/java/com/mraof/minestuck/network/StopCreativeShockEffectPacket.java +++ b/src/main/java/com/mraof/minestuck/network/StopCreativeShockEffectPacket.java @@ -1,11 +1,15 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.ClientProxy; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; public class StopCreativeShockEffectPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("stop_creative_shock_effect"); + private final boolean mayBuild; public StopCreativeShockEffectPacket(boolean mayBuildIn) @@ -14,12 +18,18 @@ public StopCreativeShockEffectPacket(boolean mayBuildIn) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(mayBuild); } - public static StopCreativeShockEffectPacket decode(FriendlyByteBuf buffer) + public static StopCreativeShockEffectPacket read(FriendlyByteBuf buffer) { boolean mayBuild = buffer.readBoolean(); diff --git a/src/main/java/com/mraof/minestuck/network/StructureCorePacket.java b/src/main/java/com/mraof/minestuck/network/StructureCorePacket.java index 9428a5946e..61a927def5 100644 --- a/src/main/java/com/mraof/minestuck/network/StructureCorePacket.java +++ b/src/main/java/com/mraof/minestuck/network/StructureCorePacket.java @@ -1,15 +1,19 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.block.redstone.StructureCoreBlock; import com.mraof.minestuck.blockentity.redstone.StructureCoreBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; public class StructureCorePacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("structure_core"); + private final StructureCoreBlockEntity.ActionType actionType; private final int shutdownRange; private final BlockPos beBlockPos; @@ -22,14 +26,20 @@ public StructureCorePacket(StructureCoreBlockEntity.ActionType actionType, int s } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeEnum(actionType); buffer.writeInt(shutdownRange); buffer.writeBlockPos(beBlockPos); } - public static StructureCorePacket decode(FriendlyByteBuf buffer) + public static StructureCorePacket read(FriendlyByteBuf buffer) { StructureCoreBlockEntity.ActionType actionType = buffer.readEnum(StructureCoreBlockEntity.ActionType.class); int summonRange = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/SummonerPacket.java b/src/main/java/com/mraof/minestuck/network/SummonerPacket.java index 487d33b5ea..09cbdaef9e 100644 --- a/src/main/java/com/mraof/minestuck/network/SummonerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/SummonerPacket.java @@ -1,10 +1,12 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.block.redstone.SummonerBlock; import com.mraof.minestuck.blockentity.redstone.SummonerBlockEntity; import com.mraof.minestuck.entity.MSEntityTypes; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.Block; @@ -15,6 +17,8 @@ public class SummonerPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("summoner"); + private final boolean isUntriggerable; private final int summonRange; private final BlockPos beBlockPos; @@ -29,7 +33,13 @@ public SummonerPacket(boolean isUntriggerable, int summonRange, BlockPos beBlock } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(isUntriggerable); buffer.writeInt(summonRange); @@ -42,7 +52,7 @@ public void encode(FriendlyByteBuf buffer) } - public static SummonerPacket decode(FriendlyByteBuf buffer) + public static SummonerPacket read(FriendlyByteBuf buffer) { boolean isUntriggerable = buffer.readBoolean(); int summonRange = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/TitleSelectPacket.java b/src/main/java/com/mraof/minestuck/network/TitleSelectPacket.java index 145cbbbff6..5acbf8877c 100644 --- a/src/main/java/com/mraof/minestuck/network/TitleSelectPacket.java +++ b/src/main/java/com/mraof/minestuck/network/TitleSelectPacket.java @@ -1,13 +1,17 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.gui.MSScreenFactories; import com.mraof.minestuck.player.Title; import com.mraof.minestuck.skaianet.TitleSelectionHook; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class TitleSelectPacket implements MSPacket.PlayToBoth { + public static final ResourceLocation ID = Minestuck.id("title_select"); + private final Title title; public TitleSelectPacket() @@ -21,7 +25,13 @@ public TitleSelectPacket(Title title) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { if(title != null) { @@ -29,7 +39,7 @@ public void encode(FriendlyByteBuf buffer) } } - public static TitleSelectPacket decode(FriendlyByteBuf buffer) + public static TitleSelectPacket read(FriendlyByteBuf buffer) { if(buffer.readableBytes() > 0) { diff --git a/src/main/java/com/mraof/minestuck/network/TransportalizerPacket.java b/src/main/java/com/mraof/minestuck/network/TransportalizerPacket.java index 6b9504d1a1..8f6e9e6966 100644 --- a/src/main/java/com/mraof/minestuck/network/TransportalizerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/TransportalizerPacket.java @@ -1,23 +1,33 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.TransportalizerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.phys.Vec3; public class TransportalizerPacket { - public record Id(BlockPos pos, String id) implements MSPacket.PlayToServer + public record Id(BlockPos pos, String selfId) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("transportalizer/id"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); - buffer.writeUtf(id, 4); + buffer.writeUtf(selfId, 4); } - public static TransportalizerPacket.Id decode(FriendlyByteBuf buffer) + public static TransportalizerPacket.Id read(FriendlyByteBuf buffer) { BlockPos pos = buffer.readBlockPos(); String id = buffer.readUtf(4); @@ -30,22 +40,30 @@ public void execute(ServerPlayer player) { if(player.getCommandSenderWorld().isAreaLoaded(pos, 0) && player.distanceToSqr(Vec3.atCenterOf(pos)) <= 8 * 8 - && id.length() == 4) + && selfId.length() == 4) if(player.level().getBlockEntity(pos) instanceof TransportalizerBlockEntity transportalizer) - transportalizer.trySetId(id, player); + transportalizer.trySetId(selfId, player); } } public record DestId(BlockPos pos, String destId) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("transportalizer/dest_id"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeUtf(destId, 4); } - public static TransportalizerPacket.DestId decode(FriendlyByteBuf buffer) + public static TransportalizerPacket.DestId read(FriendlyByteBuf buffer) { BlockPos pos = buffer.readBlockPos(); String destId = buffer.readUtf(4); diff --git a/src/main/java/com/mraof/minestuck/network/WirelessRedstoneTransmitterPacket.java b/src/main/java/com/mraof/minestuck/network/WirelessRedstoneTransmitterPacket.java index 1c5710b7ba..617def6040 100644 --- a/src/main/java/com/mraof/minestuck/network/WirelessRedstoneTransmitterPacket.java +++ b/src/main/java/com/mraof/minestuck/network/WirelessRedstoneTransmitterPacket.java @@ -1,12 +1,16 @@ package com.mraof.minestuck.network; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.redstone.WirelessRedstoneTransmitterBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class WirelessRedstoneTransmitterPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("wireless_redstone_transmitter"); + private final BlockPos destinationBlockPos; private final BlockPos beBlockPos; @@ -17,13 +21,19 @@ public WirelessRedstoneTransmitterPacket(BlockPos pos, BlockPos beBlockPos) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(destinationBlockPos); buffer.writeBlockPos(beBlockPos); } - public static WirelessRedstoneTransmitterPacket decode(FriendlyByteBuf buffer) + public static WirelessRedstoneTransmitterPacket read(FriendlyByteBuf buffer) { BlockPos destinationBlockPos = buffer.readBlockPos(); BlockPos beBlockPos = buffer.readBlockPos(); diff --git a/src/main/java/com/mraof/minestuck/network/computer/BurnDiskPacket.java b/src/main/java/com/mraof/minestuck/network/computer/BurnDiskPacket.java index 18f11422bd..bf0518dc90 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/BurnDiskPacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/BurnDiskPacket.java @@ -1,13 +1,17 @@ package com.mraof.minestuck.network.computer; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.network.MSPacket; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class BurnDiskPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("burn_disk"); + private final BlockPos bePos; private final int programId; @@ -23,13 +27,19 @@ public static BurnDiskPacket create(ComputerBlockEntity be, int programId) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(bePos); buffer.writeInt(programId); } - public static BurnDiskPacket decode(FriendlyByteBuf buffer) + public static BurnDiskPacket read(FriendlyByteBuf buffer) { BlockPos bePos = buffer.readBlockPos(); int programId = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/computer/ClearMessagePacket.java b/src/main/java/com/mraof/minestuck/network/computer/ClearMessagePacket.java index c22e221c81..fbf3d8c9f9 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/ClearMessagePacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/ClearMessagePacket.java @@ -1,9 +1,11 @@ package com.mraof.minestuck.network.computer; -import com.mraof.minestuck.network.MSPacket; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; +import com.mraof.minestuck.network.MSPacket; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; /** @@ -16,6 +18,8 @@ */ public class ClearMessagePacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("clear_message"); + private final BlockPos pos; private final int program; @@ -26,13 +30,19 @@ public ClearMessagePacket(BlockPos pos, int program) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeInt(program); } - public static ClearMessagePacket decode(FriendlyByteBuf buffer) + public static ClearMessagePacket read(FriendlyByteBuf buffer) { BlockPos computer = buffer.readBlockPos(); int program = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/computer/CloseRemoteSburbConnectionPacket.java b/src/main/java/com/mraof/minestuck/network/computer/CloseRemoteSburbConnectionPacket.java index 5f522e2e25..0ce250736d 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/CloseRemoteSburbConnectionPacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/CloseRemoteSburbConnectionPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network.computer; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.skaianet.ComputerInteractions; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class CloseRemoteSburbConnectionPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("close_remote_sburb_connection"); + private final BlockPos pos; private CloseRemoteSburbConnectionPacket(BlockPos pos) @@ -22,12 +26,18 @@ public static CloseRemoteSburbConnectionPacket asClient(ComputerBlockEntity be) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); } - public static CloseRemoteSburbConnectionPacket decode(FriendlyByteBuf buffer) + public static CloseRemoteSburbConnectionPacket read(FriendlyByteBuf buffer) { BlockPos computer = buffer.readBlockPos(); return new CloseRemoteSburbConnectionPacket(computer); diff --git a/src/main/java/com/mraof/minestuck/network/computer/CloseSburbConnectionPacket.java b/src/main/java/com/mraof/minestuck/network/computer/CloseSburbConnectionPacket.java index e25343bff4..9dea26ed54 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/CloseSburbConnectionPacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/CloseSburbConnectionPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network.computer; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.skaianet.ComputerInteractions; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class CloseSburbConnectionPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("close_sburb_connection"); + private final BlockPos pos; private final boolean isClient; @@ -29,13 +33,19 @@ public static CloseSburbConnectionPacket asServer(ComputerBlockEntity be) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeBoolean(isClient); } - public static CloseSburbConnectionPacket decode(FriendlyByteBuf buffer) + public static CloseSburbConnectionPacket read(FriendlyByteBuf buffer) { BlockPos computer = buffer.readBlockPos(); boolean isClient = buffer.readBoolean(); diff --git a/src/main/java/com/mraof/minestuck/network/computer/ConnectToSburbServerPacket.java b/src/main/java/com/mraof/minestuck/network/computer/ConnectToSburbServerPacket.java index 9cb9dda11b..0fde5d7203 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/ConnectToSburbServerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/ConnectToSburbServerPacket.java @@ -1,15 +1,19 @@ package com.mraof.minestuck.network.computer; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.IdentifierHandler; import com.mraof.minestuck.skaianet.ComputerInteractions; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class ConnectToSburbServerPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("connect_to_sburb_server"); + private final BlockPos pos; private final int serverPlayer; @@ -25,13 +29,19 @@ public static ConnectToSburbServerPacket create(ComputerBlockEntity be, int serv } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeInt(serverPlayer); } - public static ConnectToSburbServerPacket decode(FriendlyByteBuf buffer) + public static ConnectToSburbServerPacket read(FriendlyByteBuf buffer) { BlockPos computer = buffer.readBlockPos(); int server = buffer.readInt(); diff --git a/src/main/java/com/mraof/minestuck/network/computer/OpenSburbServerPacket.java b/src/main/java/com/mraof/minestuck/network/computer/OpenSburbServerPacket.java index 2ae5d618c9..16baab8d28 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/OpenSburbServerPacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/OpenSburbServerPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network.computer; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.skaianet.ComputerInteractions; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class OpenSburbServerPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("open_sburb_server"); + private final BlockPos pos; private OpenSburbServerPacket(BlockPos pos) @@ -22,12 +26,18 @@ public static OpenSburbServerPacket create(ComputerBlockEntity be) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); } - public static OpenSburbServerPacket decode(FriendlyByteBuf buffer) + public static OpenSburbServerPacket read(FriendlyByteBuf buffer) { BlockPos computer = buffer.readBlockPos(); return new OpenSburbServerPacket(computer); diff --git a/src/main/java/com/mraof/minestuck/network/computer/ResumeSburbConnectionPacket.java b/src/main/java/com/mraof/minestuck/network/computer/ResumeSburbConnectionPacket.java index 9dcc907987..09006e7c2a 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/ResumeSburbConnectionPacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/ResumeSburbConnectionPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network.computer; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.skaianet.ComputerInteractions; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; public class ResumeSburbConnectionPacket implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("resume_sburb_connection"); + private final BlockPos pos; private final boolean isClient; @@ -29,13 +33,19 @@ public static ResumeSburbConnectionPacket asServer(ComputerBlockEntity be) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeBoolean(isClient); } - public static ResumeSburbConnectionPacket decode(FriendlyByteBuf buffer) + public static ResumeSburbConnectionPacket read(FriendlyByteBuf buffer) { BlockPos computer = buffer.readBlockPos(); boolean isClient = buffer.readBoolean(); diff --git a/src/main/java/com/mraof/minestuck/network/computer/SkaianetInfoPacket.java b/src/main/java/com/mraof/minestuck/network/computer/SkaianetInfoPacket.java index d91cd060e4..bd70034027 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/SkaianetInfoPacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/SkaianetInfoPacket.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.network.computer; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.IdentifierHandler; import com.mraof.minestuck.skaianet.ComputerInteractions; @@ -9,6 +10,7 @@ import net.minecraft.core.registries.Registries; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.Level; @@ -19,8 +21,16 @@ public final class SkaianetInfoPacket { public record Data(int playerId, ReducedPlayerState playerState, List connections) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("skaianet_info/data"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeInt(playerId); @@ -29,7 +39,7 @@ public void encode(FriendlyByteBuf buffer) buffer.writeCollection(connections, (buffer1, connection) -> connection.write(buffer1)); } - public static Data decode(FriendlyByteBuf buffer) + public static Data read(FriendlyByteBuf buffer) { int playerId = buffer.readInt(); @@ -49,13 +59,21 @@ public void execute() public record HasEntered(boolean hasEntered) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("skaianet_info/has_entered"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(hasEntered); } - public static HasEntered decode(FriendlyByteBuf buffer) + public static HasEntered read(FriendlyByteBuf buffer) { return new HasEntered(buffer.readBoolean()); } @@ -69,13 +87,21 @@ public void execute() public record Request(int playerId) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("skaianet_info/request"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeInt(this.playerId); } - public static Request decode(FriendlyByteBuf buffer) + public static Request read(FriendlyByteBuf buffer) { return new Request(buffer.readInt()); } @@ -89,13 +115,21 @@ public void execute(ServerPlayer player) public record LandChains(List>> landChains) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("skaianet_info/land_chains"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeCollection(landChains, LandChains::writeLandChain); } - public static LandChains decode(FriendlyByteBuf buffer) + public static LandChains read(FriendlyByteBuf buffer) { List>> landChains = buffer.readList(LandChains::readLandChain); diff --git a/src/main/java/com/mraof/minestuck/network/computer/ThemeSelectPacket.java b/src/main/java/com/mraof/minestuck/network/computer/ThemeSelectPacket.java index b4f6c06638..75a2309e4a 100644 --- a/src/main/java/com/mraof/minestuck/network/computer/ThemeSelectPacket.java +++ b/src/main/java/com/mraof/minestuck/network/computer/ThemeSelectPacket.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.network.computer; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.network.MSPacket; import net.minecraft.core.BlockPos; @@ -9,19 +10,27 @@ public record ThemeSelectPacket(BlockPos pos, ResourceLocation themeId) implements MSPacket.PlayToServer { + public static final ResourceLocation ID = Minestuck.id("theme_select"); + public static ThemeSelectPacket create(ComputerBlockEntity be, ResourceLocation themeId) { return new ThemeSelectPacket(be.getBlockPos(), themeId); } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeResourceLocation(themeId); } - public static ThemeSelectPacket decode(FriendlyByteBuf buffer) + public static ThemeSelectPacket read(FriendlyByteBuf buffer) { BlockPos computer = buffer.readBlockPos(); ResourceLocation themeId = buffer.readResourceLocation(); diff --git a/src/main/java/com/mraof/minestuck/network/data/BoondollarDataPacket.java b/src/main/java/com/mraof/minestuck/network/data/BoondollarDataPacket.java index 681c77394d..723e2947f8 100644 --- a/src/main/java/com/mraof/minestuck/network/data/BoondollarDataPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/BoondollarDataPacket.java @@ -1,11 +1,15 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; public class BoondollarDataPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("boondollar_data"); + private final long count; private BoondollarDataPacket(long count) @@ -19,12 +23,18 @@ public static BoondollarDataPacket create(long count) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeLong(count); } - public static BoondollarDataPacket decode(FriendlyByteBuf buffer) + public static BoondollarDataPacket read(FriendlyByteBuf buffer) { long count = buffer.readLong(); return create(count); diff --git a/src/main/java/com/mraof/minestuck/network/data/ColorDataPacket.java b/src/main/java/com/mraof/minestuck/network/data/ColorDataPacket.java index 0155f909d7..058de5ce42 100644 --- a/src/main/java/com/mraof/minestuck/network/data/ColorDataPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/ColorDataPacket.java @@ -1,11 +1,15 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; public class ColorDataPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("color_data"); + private static final int NO_COLOR = -2; //Can be removed if we remove -1 as a default color when colors are made to hexes private final int color; @@ -26,13 +30,19 @@ public static ColorDataPacket data(int color) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { if(color != NO_COLOR) buffer.writeInt(color); } - public static ColorDataPacket decode(FriendlyByteBuf buffer) + public static ColorDataPacket read(FriendlyByteBuf buffer) { int color; if(buffer.readableBytes() > 0) diff --git a/src/main/java/com/mraof/minestuck/network/data/ConsortReputationDataPacket.java b/src/main/java/com/mraof/minestuck/network/data/ConsortReputationDataPacket.java index afbc74f7d1..1f3ec3abee 100644 --- a/src/main/java/com/mraof/minestuck/network/data/ConsortReputationDataPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/ConsortReputationDataPacket.java @@ -1,11 +1,15 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; public class ConsortReputationDataPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("consort_reputation_data"); + private final int count; private ConsortReputationDataPacket(int count) @@ -19,12 +23,18 @@ public static ConsortReputationDataPacket create(int count) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(count); } - public static ConsortReputationDataPacket decode(FriendlyByteBuf buffer) + public static ConsortReputationDataPacket read(FriendlyByteBuf buffer) { int count = buffer.readInt(); return create(count); diff --git a/src/main/java/com/mraof/minestuck/network/data/DataCheckerPermissionPacket.java b/src/main/java/com/mraof/minestuck/network/data/DataCheckerPermissionPacket.java index bf6f8af248..529caaff32 100644 --- a/src/main/java/com/mraof/minestuck/network/data/DataCheckerPermissionPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/DataCheckerPermissionPacket.java @@ -1,11 +1,15 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; public class DataCheckerPermissionPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("data_checker_permission"); + private final boolean available; /** @@ -17,12 +21,18 @@ public DataCheckerPermissionPacket(boolean available) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeBoolean(available); } - public static DataCheckerPermissionPacket decode(FriendlyByteBuf buffer) + public static DataCheckerPermissionPacket read(FriendlyByteBuf buffer) { boolean dataChecker = buffer.readBoolean(); diff --git a/src/main/java/com/mraof/minestuck/network/data/EcheladderDataPacket.java b/src/main/java/com/mraof/minestuck/network/data/EcheladderDataPacket.java index ceac2b1c2c..c67142c010 100644 --- a/src/main/java/com/mraof/minestuck/network/data/EcheladderDataPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/EcheladderDataPacket.java @@ -1,5 +1,6 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.gui.playerStats.EcheladderScreen; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.ClientPlayerData; @@ -7,9 +8,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; public class EcheladderDataPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("echeladder_data"); + private final int rung; private final float progress; private final boolean sendMessage; @@ -32,14 +36,20 @@ public static EcheladderDataPacket init(int rung, float progress) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { buffer.writeInt(rung); buffer.writeFloat(progress); buffer.writeBoolean(sendMessage); } - public static EcheladderDataPacket decode(FriendlyByteBuf buffer) + public static EcheladderDataPacket read(FriendlyByteBuf buffer) { int rung = buffer.readInt(); float progress = buffer.readFloat(); diff --git a/src/main/java/com/mraof/minestuck/network/data/EditmodeCacheLimitPacket.java b/src/main/java/com/mraof/minestuck/network/data/EditmodeCacheLimitPacket.java index 5dc727b002..629604e4a0 100644 --- a/src/main/java/com/mraof/minestuck/network/data/EditmodeCacheLimitPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/EditmodeCacheLimitPacket.java @@ -1,18 +1,28 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; public record EditmodeCacheLimitPacket(long limit) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("editmode_cache_limit"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeLong(this.limit); } - public static EditmodeCacheLimitPacket decode(FriendlyByteBuf buffer) + public static EditmodeCacheLimitPacket read(FriendlyByteBuf buffer) { return new EditmodeCacheLimitPacket(buffer.readLong()); } diff --git a/src/main/java/com/mraof/minestuck/network/data/EditmodeLocationsPacket.java b/src/main/java/com/mraof/minestuck/network/data/EditmodeLocationsPacket.java index 79653e6aaa..02a38015d4 100644 --- a/src/main/java/com/mraof/minestuck/network/data/EditmodeLocationsPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/EditmodeLocationsPacket.java @@ -1,15 +1,17 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.computer.editmode.ClientEditmodeData; import com.mraof.minestuck.computer.editmode.EditData; import com.mraof.minestuck.computer.editmode.EditmodeLocations; import com.mraof.minestuck.network.MSPacket; -import com.mraof.minestuck.network.MSPacketHandler; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.PacketDistributor; import javax.annotation.Nullable; import java.util.Objects; @@ -17,21 +19,29 @@ public record EditmodeLocationsPacket(@Nullable ResourceKey land, EditmodeLocations locations) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("editmode_locations"); + public static void send(EditData data) { - MSPacketHandler.sendToPlayer(new EditmodeLocationsPacket(data.sburbData().getLandDimensionIfEntered(), data.locations()), - data.getEditor()); + PacketDistributor.PLAYER.with(data.getEditor()) + .send(new EditmodeLocationsPacket(data.sburbData().getLandDimensionIfEntered(), data.locations())); + } + + @Override + public ResourceLocation id() + { + return ID; } @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { buffer.writeOptional(Optional.ofNullable(this.land), FriendlyByteBuf::writeResourceKey); buffer.writeNbt(this.locations.write()); } - public static EditmodeLocationsPacket decode(FriendlyByteBuf buffer) + public static EditmodeLocationsPacket read(FriendlyByteBuf buffer) { ResourceKey land = buffer.readOptional(buffer_ -> buffer_.readResourceKey(Registries.DIMENSION)).orElse(null); diff --git a/src/main/java/com/mraof/minestuck/network/data/GristCachePacket.java b/src/main/java/com/mraof/minestuck/network/data/GristCachePacket.java index 87bbd419ce..998ab97f64 100644 --- a/src/main/java/com/mraof/minestuck/network/data/GristCachePacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/GristCachePacket.java @@ -1,21 +1,31 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.api.alchemy.GristSet; import com.mraof.minestuck.api.alchemy.ImmutableGristSet; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; public record GristCachePacket(ImmutableGristSet gristCache, boolean isEditmode) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("grist_cache"); + + @Override + public ResourceLocation id() + { + return ID; + } + @Override - public void encode(FriendlyByteBuf buffer) + public void write(FriendlyByteBuf buffer) { GristSet.write(gristCache, buffer); buffer.writeBoolean(isEditmode); } - public static GristCachePacket decode(FriendlyByteBuf buffer) + public static GristCachePacket read(FriendlyByteBuf buffer) { ImmutableGristSet gristCache = GristSet.read(buffer); boolean isEditmode = buffer.readBoolean(); diff --git a/src/main/java/com/mraof/minestuck/network/data/LandTypesDataPacket.java b/src/main/java/com/mraof/minestuck/network/data/LandTypesDataPacket.java index 6b60767a8a..8f3a60cca5 100644 --- a/src/main/java/com/mraof/minestuck/network/data/LandTypesDataPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/LandTypesDataPacket.java @@ -1,6 +1,7 @@ package com.mraof.minestuck.network.data; import com.google.common.collect.ImmutableMap; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.client.ClientDimensionData; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.world.lands.LandTypePair; @@ -10,12 +11,15 @@ import net.minecraft.core.registries.Registries; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; import java.util.Map; public class LandTypesDataPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("land_types_data"); + private final Map, LandTypePair> types; public LandTypesDataPacket(Map, LandTypePair> types) @@ -24,7 +28,13 @@ public LandTypesDataPacket(Map, LandTypePair> types) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { for (Map.Entry, LandTypePair> entry : types.entrySet()) { @@ -34,7 +44,7 @@ public void encode(FriendlyByteBuf buffer) } } - public static LandTypesDataPacket decode(FriendlyByteBuf buffer) + public static LandTypesDataPacket read(FriendlyByteBuf buffer) { ImmutableMap.Builder, LandTypePair> builder = new ImmutableMap.Builder<>(); diff --git a/src/main/java/com/mraof/minestuck/network/data/ModusDataPacket.java b/src/main/java/com/mraof/minestuck/network/data/ModusDataPacket.java index bb215f03f2..6e265331eb 100644 --- a/src/main/java/com/mraof/minestuck/network/data/ModusDataPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/ModusDataPacket.java @@ -1,56 +1,46 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.inventory.captchalogue.CaptchaDeckHandler; import com.mraof.minestuck.inventory.captchalogue.Modus; import com.mraof.minestuck.network.MSPacket; import com.mraof.minestuck.player.ClientPlayerData; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtIo; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import javax.annotation.Nullable; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; public record ModusDataPacket(@Nullable CompoundTag nbt) implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("modus_data"); + public static ModusDataPacket create(@Nullable Modus modus) { return new ModusDataPacket(CaptchaDeckHandler.writeToNBT(modus)); } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { if(nbt != null) { - try - { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - NbtIo.writeCompressed(nbt, bytes); - buffer.writeBytes(bytes.toByteArray()); - } catch(IOException e) - { - throw new IllegalStateException(e); - } + buffer.writeNbt(nbt); } } - public static ModusDataPacket decode(FriendlyByteBuf buffer) + public static ModusDataPacket read(FriendlyByteBuf buffer) { if(buffer.readableBytes() > 0) { - byte[] bytes = new byte[buffer.readableBytes()]; - buffer.readBytes(bytes); - try - { - CompoundTag nbt = NbtIo.readCompressed(new ByteArrayInputStream(bytes)); - return new ModusDataPacket(nbt); - } catch(IOException e) - { - throw new IllegalStateException(e); - } + CompoundTag nbt = buffer.readNbt(); + return new ModusDataPacket(nbt); } else return new ModusDataPacket(null); } diff --git a/src/main/java/com/mraof/minestuck/network/data/TitleDataPacket.java b/src/main/java/com/mraof/minestuck/network/data/TitleDataPacket.java index 5edab3fea3..b3acbe43cf 100644 --- a/src/main/java/com/mraof/minestuck/network/data/TitleDataPacket.java +++ b/src/main/java/com/mraof/minestuck/network/data/TitleDataPacket.java @@ -1,14 +1,18 @@ package com.mraof.minestuck.network.data; +import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.network.MSPacket; -import com.mraof.minestuck.player.Title; import com.mraof.minestuck.player.ClientPlayerData; +import com.mraof.minestuck.player.Title; import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; import java.util.Objects; public class TitleDataPacket implements MSPacket.PlayToClient { + public static final ResourceLocation ID = Minestuck.id("title_data"); + private final Title title; private TitleDataPacket(Title title) @@ -22,12 +26,18 @@ public static TitleDataPacket create(Title title) } @Override - public void encode(FriendlyByteBuf buffer) + public ResourceLocation id() + { + return ID; + } + + @Override + public void write(FriendlyByteBuf buffer) { title.write(buffer); } - public static TitleDataPacket decode(FriendlyByteBuf buffer) + public static TitleDataPacket read(FriendlyByteBuf buffer) { Title title = Title.read(buffer); diff --git a/src/main/java/com/mraof/minestuck/player/ClientPlayerData.java b/src/main/java/com/mraof/minestuck/player/ClientPlayerData.java index dabd42db0b..7321c81835 100644 --- a/src/main/java/com/mraof/minestuck/player/ClientPlayerData.java +++ b/src/main/java/com/mraof/minestuck/player/ClientPlayerData.java @@ -6,7 +6,6 @@ import com.mraof.minestuck.inventory.captchalogue.CaptchaDeckHandler; import com.mraof.minestuck.inventory.captchalogue.Modus; import com.mraof.minestuck.network.ColorSelectPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.RGBColorSelectPacket; import com.mraof.minestuck.network.data.*; import com.mraof.minestuck.util.ColorHandler; @@ -15,6 +14,7 @@ import net.neoforged.fml.LogicalSide; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -112,7 +112,7 @@ public static int getPlayerColor() public static void selectColor(int colorIndex) { - MSPacketHandler.sendToServer(new ColorSelectPacket(colorIndex)); + PacketDistributor.SERVER.noArg().send(new ColorSelectPacket(colorIndex)); playerColor = ColorHandler.getColor(colorIndex); } @@ -120,7 +120,7 @@ public static void selectColorRGB(int color) { if (color < 0 || color > 256*256*256) return; - MSPacketHandler.sendToServer(new RGBColorSelectPacket(color)); + PacketDistributor.SERVER.noArg().send(new RGBColorSelectPacket(color)); playerColor = color; } diff --git a/src/main/java/com/mraof/minestuck/player/Echeladder.java b/src/main/java/com/mraof/minestuck/player/Echeladder.java index 4ad7fc9e83..1b22a79972 100644 --- a/src/main/java/com/mraof/minestuck/player/Echeladder.java +++ b/src/main/java/com/mraof/minestuck/player/Echeladder.java @@ -5,7 +5,6 @@ import com.mraof.minestuck.advancements.MSCriteriaTriggers; import com.mraof.minestuck.computer.editmode.EditData; import com.mraof.minestuck.computer.editmode.ServerEditHandler; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.data.EcheladderDataPacket; import com.mraof.minestuck.skaianet.SburbPlayerData; import com.mraof.minestuck.util.MSSoundEvents; @@ -24,6 +23,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -134,7 +134,7 @@ public void increaseProgress(int exp) if(rung != prevRung) { updateEcheladderBonuses(player); - MSCriteriaTriggers.ECHELADDER.trigger(player, rung); + MSCriteriaTriggers.ECHELADDER.get().trigger(player, rung); player.level().playSound(null, player.getX(), player.getY(), player.getZ(), MSSoundEvents.EVENT_ECHELADDER_INCREASE.get(), SoundSource.AMBIENT, 1F, 1F); } } @@ -282,13 +282,13 @@ public void setByCommand(int rung, double progress) public void sendInitialPacket(ServerPlayer player) { EcheladderDataPacket packet = EcheladderDataPacket.init(getRung(), MinestuckConfig.SERVER.echeladderProgress.get() ? getProgress() : 0F); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } public void sendDataPacket(ServerPlayer player, boolean sendMessage) { EcheladderDataPacket packet = EcheladderDataPacket.create(getRung(), MinestuckConfig.SERVER.echeladderProgress.get() ? getProgress() : 0F, sendMessage); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } public static String translationKey(int rung) diff --git a/src/main/java/com/mraof/minestuck/player/GristCache.java b/src/main/java/com/mraof/minestuck/player/GristCache.java index 7beb7a05eb..231b9ffcbc 100644 --- a/src/main/java/com/mraof/minestuck/player/GristCache.java +++ b/src/main/java/com/mraof/minestuck/player/GristCache.java @@ -7,7 +7,6 @@ import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.entity.item.GristEntity; import com.mraof.minestuck.network.GristToastPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.data.GristCachePacket; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtOps; @@ -15,6 +14,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -213,7 +213,7 @@ void sendPacket(ServerPlayer player) if(player != null) { GristCachePacket packet = new GristCachePacket(this.getGristSet(), false); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } //Also send to the editing player, if there is any diff --git a/src/main/java/com/mraof/minestuck/player/PlayerData.java b/src/main/java/com/mraof/minestuck/player/PlayerData.java index d818f1597d..bb1bb1031f 100644 --- a/src/main/java/com/mraof/minestuck/player/PlayerData.java +++ b/src/main/java/com/mraof/minestuck/player/PlayerData.java @@ -4,7 +4,6 @@ import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.computer.editmode.EditmodeLocations; import com.mraof.minestuck.inventory.captchalogue.*; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.data.*; import com.mraof.minestuck.skaianet.SburbHandler; import com.mraof.minestuck.util.ColorHandler; @@ -22,6 +21,7 @@ import net.neoforged.fml.LogicalSide; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -192,7 +192,7 @@ public void setModus(@Nullable Modus modus) setGivenModus(); ServerPlayer player = this.getPlayer(); if(player != null) - MSPacketHandler.sendToPlayer(ModusDataPacket.create(modus), player); + PacketDistributor.PLAYER.with(player).send(ModusDataPacket.create(modus)); } } @@ -343,7 +343,7 @@ public void onPlayerLoggedIn(ServerPlayer player) getEcheladder().updateEcheladderBonuses(player); if(getModus() != null) - MSPacketHandler.sendToPlayer(ModusDataPacket.create(getModus()), player); + PacketDistributor.PLAYER.with(player).send(ModusDataPacket.create(getModus())); if(getModus() == null && !hasGivenModus()) tryGiveStartingModus(player); @@ -362,11 +362,11 @@ private void sendColor(ServerPlayer player, boolean firstTime) if(player == null) return; if(firstTime && !player.isSpectator()) - MSPacketHandler.sendToPlayer(ColorDataPacket.selector(), player); + PacketDistributor.PLAYER.with(player).send(ColorDataPacket.selector()); else { ColorDataPacket packet = ColorDataPacket.data(getColor()); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } } @@ -375,7 +375,7 @@ private void sendBoondollars(ServerPlayer player) if(player == null) return; BoondollarDataPacket packet = BoondollarDataPacket.create(getBoondollars()); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } private void sendConsortReputation(ServerPlayer player) @@ -392,7 +392,7 @@ private void sendTitle(ServerPlayer player) if(newTitle == null || player == null) return; TitleDataPacket packet = TitleDataPacket.create(newTitle); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } @Nullable diff --git a/src/main/java/com/mraof/minestuck/skaianet/DataCheckerManager.java b/src/main/java/com/mraof/minestuck/skaianet/DataCheckerManager.java index ebb21ef602..356abd63a4 100644 --- a/src/main/java/com/mraof/minestuck/skaianet/DataCheckerManager.java +++ b/src/main/java/com/mraof/minestuck/skaianet/DataCheckerManager.java @@ -1,7 +1,6 @@ package com.mraof.minestuck.skaianet; import com.mraof.minestuck.network.DataCheckerPacket; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.player.PlayerIdentifier; import com.mraof.minestuck.player.PlayerSavedData; import com.mraof.minestuck.player.Title; @@ -17,6 +16,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,7 +31,7 @@ public static void onDataRequest(ServerPlayer player, int index) if(DataCheckerPermission.hasPermission(player)) { CompoundTag data = createDataTag(player.server, SessionHandler.get(player.server)); - MSPacketHandler.sendToPlayer(DataCheckerPacket.data(index, data), player); + PacketDistributor.PLAYER.with(player).send(DataCheckerPacket.data(index, data)); } } /** diff --git a/src/main/java/com/mraof/minestuck/skaianet/InfoTracker.java b/src/main/java/com/mraof/minestuck/skaianet/InfoTracker.java index 7727b81a45..8db1a1705a 100644 --- a/src/main/java/com/mraof/minestuck/skaianet/InfoTracker.java +++ b/src/main/java/com/mraof/minestuck/skaianet/InfoTracker.java @@ -3,7 +3,6 @@ import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.advancements.MSCriteriaTriggers; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.computer.SkaianetInfoPacket; import com.mraof.minestuck.player.IdentifierHandler; import com.mraof.minestuck.player.PlayerIdentifier; @@ -18,6 +17,7 @@ import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.event.TickEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.network.PacketDistributor; import net.neoforged.neoforge.server.ServerLifecycleHooks; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -82,8 +82,8 @@ private void onPlayerLoggedIn(ServerPlayer player) PlayerIdentifier identifier = IdentifierHandler.encode(player); getSet(identifier).add(identifier); sendConnectionInfo(identifier); - MSPacketHandler.sendToPlayer(createLandChainPacket(), player); - MSPacketHandler.sendToPlayer(new SkaianetInfoPacket.HasEntered(SburbPlayerData.get(player).hasEntered()), player); + PacketDistributor.PLAYER.with(player).send(createLandChainPacket(), + new SkaianetInfoPacket.HasEntered(SburbPlayerData.get(player).hasEntered())); } private Set getSet(PlayerIdentifier identifier) @@ -107,7 +107,7 @@ void requestInfo(ServerPlayer player, PlayerIdentifier p1) LOGGER.warn("[Skaianet] Player {} already got the requested data.", player.getName()); } - MSPacketHandler.sendToPlayer(generateClientInfoPacket(p1), player); + PacketDistributor.PLAYER.with(player).send(generateClientInfoPacket(p1)); } @@ -213,7 +213,7 @@ private void checkAndSend() if(resendLandChains) { - MSPacketHandler.sendToAll(createLandChainPacket()); + PacketDistributor.ALL.noArg().send(createLandChainPacket()); resendLandChains = false; } } @@ -231,10 +231,10 @@ private void sendConnectionInfo(PlayerIdentifier player) if(player.equals(listener)) { if(skaianet.connections.activeConnections().anyMatch(c -> c.hasPlayer(player))) - MSCriteriaTriggers.SBURB_CONNECTION.trigger(playerListener); + MSCriteriaTriggers.SBURB_CONNECTION.get().trigger(playerListener); } - MSPacketHandler.sendToPlayer(packet, playerListener); + PacketDistributor.PLAYER.with(playerListener).send(packet); } } } diff --git a/src/main/java/com/mraof/minestuck/skaianet/SburbHandler.java b/src/main/java/com/mraof/minestuck/skaianet/SburbHandler.java index 11ce1ee084..b35a84d7ce 100644 --- a/src/main/java/com/mraof/minestuck/skaianet/SburbHandler.java +++ b/src/main/java/com/mraof/minestuck/skaianet/SburbHandler.java @@ -179,7 +179,7 @@ public static void onEntry(MinecraftServer server, ServerPlayer player) SessionHandler.get(server).getOrCreateSession(playerData.playerId()).checkIfCompleted(); - MSCriteriaTriggers.CRUXITE_ARTIFACT.trigger(player); + MSCriteriaTriggers.CRUXITE_ARTIFACT.get().trigger(player); EditmodeLocations.onEntry(server, playerData.playerId()); diff --git a/src/main/java/com/mraof/minestuck/skaianet/SburbPlayerData.java b/src/main/java/com/mraof/minestuck/skaianet/SburbPlayerData.java index 8997d808db..bd0b3a04b4 100644 --- a/src/main/java/com/mraof/minestuck/skaianet/SburbPlayerData.java +++ b/src/main/java/com/mraof/minestuck/skaianet/SburbPlayerData.java @@ -5,7 +5,6 @@ import com.mraof.minestuck.computer.editmode.EditData; import com.mraof.minestuck.computer.editmode.ServerEditHandler; import com.mraof.minestuck.item.MSItems; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.computer.SkaianetInfoPacket; import com.mraof.minestuck.player.IdentifierHandler; import com.mraof.minestuck.player.PlayerIdentifier; @@ -19,6 +18,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -178,7 +178,7 @@ private void resendEntryState() { ServerPlayer player = this.playerId.getPlayer(this.mcServer); if(player != null) - MSPacketHandler.sendToPlayer(new SkaianetInfoPacket.HasEntered(this.hasEntered), player); + PacketDistributor.PLAYER.with(player).send(new SkaianetInfoPacket.HasEntered(this.hasEntered)); } public boolean hasGivenItem(DeployEntry item) diff --git a/src/main/java/com/mraof/minestuck/skaianet/TitleSelectionHook.java b/src/main/java/com/mraof/minestuck/skaianet/TitleSelectionHook.java index a92cf4a125..bfcc07f304 100644 --- a/src/main/java/com/mraof/minestuck/skaianet/TitleSelectionHook.java +++ b/src/main/java/com/mraof/minestuck/skaianet/TitleSelectionHook.java @@ -4,7 +4,6 @@ import com.mraof.minestuck.Minestuck; import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.entry.EntryProcess; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.TitleSelectPacket; import com.mraof.minestuck.player.IdentifierHandler; import com.mraof.minestuck.player.PlayerIdentifier; @@ -17,6 +16,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.event.server.ServerStoppedEvent; +import net.neoforged.neoforge.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -52,7 +52,7 @@ public static boolean performEntryCheck(ServerPlayer player, BlockPos savedPos) playersInTitleSelection.put(player, new Pair<>(new Vec3(player.getX(), player.getY(), player.getZ()), savedPos)); TitleSelectPacket packet = new TitleSelectPacket(); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); return false; } diff --git a/src/main/java/com/mraof/minestuck/skaianet/client/SkaiaClient.java b/src/main/java/com/mraof/minestuck/skaianet/client/SkaiaClient.java index 1996bd7332..87bc9f145d 100644 --- a/src/main/java/com/mraof/minestuck/skaianet/client/SkaiaClient.java +++ b/src/main/java/com/mraof/minestuck/skaianet/client/SkaiaClient.java @@ -4,7 +4,6 @@ import com.mraof.minestuck.blockentity.ComputerBlockEntity; import com.mraof.minestuck.client.gui.ComputerScreen; import com.mraof.minestuck.client.gui.MSScreenFactories; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.computer.SkaianetInfoPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; @@ -14,6 +13,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.ArrayList; import java.util.HashMap; @@ -54,7 +54,7 @@ public static boolean requestData(ComputerBlockEntity computer) boolean b = playerStateMap.get(computer.ownerId) != null; if(!b) { - MSPacketHandler.sendToServer(new SkaianetInfoPacket.Request(computer.ownerId)); + PacketDistributor.SERVER.noArg().send(new SkaianetInfoPacket.Request(computer.ownerId)); be = computer; } return b; diff --git a/src/main/java/com/mraof/minestuck/util/BoondollarPricing.java b/src/main/java/com/mraof/minestuck/util/BoondollarPricing.java index cccc350dd2..b7472cef9b 100644 --- a/src/main/java/com/mraof/minestuck/util/BoondollarPricing.java +++ b/src/main/java/com/mraof/minestuck/util/BoondollarPricing.java @@ -35,6 +35,7 @@ public boolean appliesTo(ItemStack stack) return ingredient.test(stack); } + //todo replace serializer with codec public static class Serializer implements JsonDeserializer, JsonSerializer { @Override @@ -49,7 +50,7 @@ public BoondollarPricing deserialize(JsonElement jsonElement, Type type, JsonDes public JsonElement serialize(BoondollarPricing pricing, Type type, JsonSerializationContext context) { JsonObject json = new JsonObject(); - json.add("ingredient", pricing.ingredient.toJson(false)); + json.add("ingredient", Ingredient.CODEC_NONEMPTY.encodeStart(JsonOps.INSTANCE, pricing.ingredient).getOrThrow(false, LOGGER::error)); json.add("range", IntProvider.CODEC.encodeStart(JsonOps.INSTANCE, pricing.priceRange).getOrThrow(false, LOGGER::error)); return json; } diff --git a/src/main/java/com/mraof/minestuck/util/DataCheckerPermission.java b/src/main/java/com/mraof/minestuck/util/DataCheckerPermission.java index 8cb9bb6b4e..e0b5a1e9bc 100644 --- a/src/main/java/com/mraof/minestuck/util/DataCheckerPermission.java +++ b/src/main/java/com/mraof/minestuck/util/DataCheckerPermission.java @@ -4,7 +4,6 @@ import com.mraof.minestuck.MinestuckConfig; import com.mraof.minestuck.computer.editmode.EditData; import com.mraof.minestuck.computer.editmode.ServerEditHandler; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.data.DataCheckerPermissionPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -16,6 +15,7 @@ import net.neoforged.neoforge.event.TickEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.event.server.ServerStoppedEvent; +import net.neoforged.neoforge.network.PacketDistributor; import java.util.HashSet; import java.util.Set; @@ -68,7 +68,7 @@ private static void sendPacket(ServerPlayer player) dataCheckerPermission.add(player.getGameProfile().getId()); else dataCheckerPermission.remove(player.getGameProfile().getId()); packet = new DataCheckerPermissionPacket(permission); - MSPacketHandler.sendToPlayer(packet, player); + PacketDistributor.PLAYER.with(player).send(packet); } public static boolean hasPermission(ServerPlayer player) diff --git a/src/main/java/com/mraof/minestuck/util/MSCapabilities.java b/src/main/java/com/mraof/minestuck/util/MSCapabilities.java index 8acc78b6cd..7302a99933 100644 --- a/src/main/java/com/mraof/minestuck/util/MSCapabilities.java +++ b/src/main/java/com/mraof/minestuck/util/MSCapabilities.java @@ -1,87 +1,49 @@ package com.mraof.minestuck.util; import com.mraof.minestuck.Minestuck; -import com.mraof.minestuck.computer.editmode.EditToolsCapabilityProvider; -import com.mraof.minestuck.computer.editmode.IEditTools; +import com.mraof.minestuck.blockentity.MSBlockEntityTypes; +import com.mraof.minestuck.blockentity.machine.*; +import com.mraof.minestuck.computer.editmode.EditTools; import com.mraof.minestuck.entity.dialogue.DialogueComponent; import com.mraof.minestuck.fluid.MSFluidType; -import com.mraof.minestuck.inventory.musicplayer.IMusicPlaying; -import com.mraof.minestuck.inventory.musicplayer.MusicPlayingCapabilityProvider; -import net.minecraft.core.Direction; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; +import com.mraof.minestuck.inventory.musicplayer.MusicPlaying; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; -import net.neoforged.neoforge.common.capabilities.*; -import net.neoforged.neoforge.common.util.LazyOptional; -import net.neoforged.neoforge.event.AttachCapabilitiesEvent; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import net.neoforged.neoforge.attachment.AttachmentType; +import net.neoforged.neoforge.capabilities.Capabilities; +import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; +import net.neoforged.neoforge.items.ItemStackHandler; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.registries.NeoForgeRegistries; -@Mod.EventBusSubscriber(modid = Minestuck.MOD_ID) +import java.util.function.Supplier; + +@Mod.EventBusSubscriber(modid = Minestuck.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class MSCapabilities { - public static final Capability MUSIC_PLAYING_CAPABILITY = CapabilityManager.get(new CapabilityToken<>() - { - }); - - public static final Capability EDIT_TOOLS_CAPABILITY = CapabilityManager.get(new CapabilityToken<>() - { - }); - - public static final Capability LAST_FLUID_TICK = CapabilityManager.get(new CapabilityToken<>(){}); + public static final DeferredRegister> ATTACHMENT_REGISTER = DeferredRegister.create(NeoForgeRegistries.Keys.ATTACHMENT_TYPES, Minestuck.MOD_ID); - public static final Capability CURRENT_DIALOGUE = CapabilityManager.get(new CapabilityToken<>() - { - }); - - public static void register(RegisterCapabilitiesEvent event) - { - event.register(IMusicPlaying.class); - event.register(IEditTools.class); - event.register(MSFluidType.LastFluidTickData.class); - event.register(DialogueComponent.CurrentDialogue.class); - } + public static final Supplier> MUSIC_PLAYER_INVENTORY_ATTACHMENT = ATTACHMENT_REGISTER.register("music_player_inventory", + () -> AttachmentType.serializable(() -> new ItemStackHandler(1)).build()); + public static final Supplier> MUSIC_PLAYING_ATTACHMENT = ATTACHMENT_REGISTER.register("music_playing", + () -> AttachmentType.builder(MusicPlaying::new).build()); + public static final Supplier> EDIT_TOOLS_ATTACHMENT = ATTACHMENT_REGISTER.register("edit_tools", + () -> AttachmentType.builder(EditTools::new).build()); + public static final Supplier> LAST_FLUID_TICK_ATTACHMENT = ATTACHMENT_REGISTER.register("last_fluid_tick", + () -> AttachmentType.builder(MSFluidType.LastFluidTickData::new).build()); + public static final Supplier> CURRENT_DIALOGUE_ATTACHMENT = ATTACHMENT_REGISTER.register("current_dialogue", + () -> AttachmentType.builder(DialogueComponent.CurrentDialogue::new).build()); - /** - * Attaches a provider of the music playing and edit tools capability to any player - * - * @see MusicPlayingCapabilityProvider - * @see EditToolsCapabilityProvider - */ @SubscribeEvent - public static void entityAttachCapabilitiesEvent(AttachCapabilitiesEvent event) + public static void registerCapabilities(RegisterCapabilitiesEvent event) { - if(event.getObject() instanceof Player) - { - event.addCapability(Minestuck.id("musicplaying"), - new MusicPlayingCapabilityProvider()); - event.addCapability(Minestuck.id("edit_tools"), - new EditToolsCapabilityProvider()); - event.addCapability(Minestuck.id("current_dialogue"), - new ICapabilityProvider() - { - private final LazyOptional lazyOptional = LazyOptional.of(DialogueComponent.CurrentDialogue::new); - - @Override - public @NotNull LazyOptional getCapability(@NotNull Capability cap, @Nullable Direction side) - { - return CURRENT_DIALOGUE.orEmpty(cap, lazyOptional); - } - }); - } - - event.addCapability(Minestuck.id("last_fluid_tick"), - new ICapabilityProvider() - { - private final LazyOptional lazyOptional = LazyOptional.of(() -> this.data); - private final MSFluidType.LastFluidTickData data = new MSFluidType.LastFluidTickData(); - - @Override - public @NotNull LazyOptional getCapability(@NotNull Capability cap, @Nullable Direction side) - { - return LAST_FLUID_TICK.orEmpty(cap, lazyOptional); - } - }); + event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MSBlockEntityTypes.MINI_CRUXTRUDER.get(), MiniCruxtruderBlockEntity::getItemHandler); + event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MSBlockEntityTypes.MINI_TOTEM_LATHE.get(), MiniTotemLatheBlockEntity::getItemHandler); + event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MSBlockEntityTypes.MINI_ALCHEMITER.get(), MiniAlchemiterBlockEntity::getItemHandler); + event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MSBlockEntityTypes.MINI_PUNCH_DESIGNIX.get(), MiniPunchDesignixBlockEntity::getItemHandler); + event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MSBlockEntityTypes.SENDIFICATOR.get(), SendificatorBlockEntity::getItemHandler); + event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MSBlockEntityTypes.GRIST_WIDGET.get(), GristWidgetBlockEntity::getItemHandler); + event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MSBlockEntityTypes.URANIUM_COOKER.get(), UraniumCookerBlockEntity::getItemHandler); + event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MSBlockEntityTypes.ANTHVIL.get(), AnthvilBlockEntity::getItemHandler); } } diff --git a/src/main/java/com/mraof/minestuck/util/WorldEventUtil.java b/src/main/java/com/mraof/minestuck/util/WorldEventUtil.java index 7c9d54999c..4072cf60b3 100644 --- a/src/main/java/com/mraof/minestuck/util/WorldEventUtil.java +++ b/src/main/java/com/mraof/minestuck/util/WorldEventUtil.java @@ -13,7 +13,7 @@ public static void dispenserEffect(LevelAccessor level, BlockPos pos, Direction if(success) { int i = direction.getStepX() + 1 + (direction.getStepZ() + 1) * 3; - level.levelEvent(LevelEvent.PARTICLES_SHOOT, pos, i); + level.levelEvent(LevelEvent.PARTICLES_SHOOT_SMOKE, pos, i); } } } \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/DynamicDimensions.java b/src/main/java/com/mraof/minestuck/world/DynamicDimensions.java index 9d436db1e9..a3f704399f 100644 --- a/src/main/java/com/mraof/minestuck/world/DynamicDimensions.java +++ b/src/main/java/com/mraof/minestuck/world/DynamicDimensions.java @@ -5,7 +5,7 @@ import com.mraof.minestuck.world.gen.LandChunkGenerator; import com.mraof.minestuck.world.lands.LandTypeExtensions; import com.mraof.minestuck.world.lands.LandTypePair; -import commoble.infiniverse.api.InfiniverseAPI; +import net.commoble.infiniverse.api.InfiniverseAPI; import net.minecraft.core.Holder; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/mraof/minestuck/world/MSDimensions.java b/src/main/java/com/mraof/minestuck/world/MSDimensions.java index 5f2249ad83..83eb1bd095 100644 --- a/src/main/java/com/mraof/minestuck/world/MSDimensions.java +++ b/src/main/java/com/mraof/minestuck/world/MSDimensions.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableMap; import com.mraof.minestuck.Minestuck; -import com.mraof.minestuck.network.MSPacketHandler; import com.mraof.minestuck.network.data.LandTypesDataPacket; import com.mraof.minestuck.world.lands.LandTypePair; import net.minecraft.core.registries.Registries; @@ -11,6 +10,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.PacketDistributor; public class MSDimensions { @@ -38,12 +38,12 @@ public static boolean isInMedium(MinecraftServer server, ResourceKey dime public static void sendLandTypesToAll(MinecraftServer server) { - MSPacketHandler.sendToAll(createLandTypesPacket(server)); + PacketDistributor.ALL.noArg().send(createLandTypesPacket(server)); } public static void sendDimensionData(ServerPlayer player) { - MSPacketHandler.sendToPlayer(createLandTypesPacket(player.getServer()), player); + PacketDistributor.PLAYER.with(player).send(createLandTypesPacket(player.getServer())); } private static LandTypesDataPacket createLandTypesPacket(MinecraftServer server) diff --git a/src/main/java/com/mraof/minestuck/world/gen/CustomizableNoiseChunkGenerator.java b/src/main/java/com/mraof/minestuck/world/gen/CustomizableNoiseChunkGenerator.java index 777764914f..fe85e773ce 100644 --- a/src/main/java/com/mraof/minestuck/world/gen/CustomizableNoiseChunkGenerator.java +++ b/src/main/java/com/mraof/minestuck/world/gen/CustomizableNoiseChunkGenerator.java @@ -35,11 +35,11 @@ public CustomizableNoiseChunkGenerator(BiomeSource biomeSource, Function, BiomeGenerationSettings> settingsGetter) { - ObfuscationReflectionHelper.setPrivateValue(ChunkGenerator.class, this, settingsGetter, "f_223021_"); + ObfuscationReflectionHelper.setPrivateValue(ChunkGenerator.class, this, settingsGetter, "generationSettingsGetter"); @SuppressWarnings("deprecation") Supplier> featuresSupplier = Suppliers.memoize(() -> FeatureSorter.buildFeaturesPerStep( List.copyOf(this.getBiomeSource().possibleBiomes()), biome -> getBiomeGenerationSettings(biome).features(), true)); - ObfuscationReflectionHelper.setPrivateValue(ChunkGenerator.class, this, featuresSupplier, "f_223020_"); + ObfuscationReflectionHelper.setPrivateValue(ChunkGenerator.class, this, featuresSupplier, "featuresPerStep"); } } diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/OasisFeature.java b/src/main/java/com/mraof/minestuck/world/gen/feature/OasisFeature.java index ff771a9159..61fb24672a 100644 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/OasisFeature.java +++ b/src/main/java/com/mraof/minestuck/world/gen/feature/OasisFeature.java @@ -100,7 +100,7 @@ else if (!blocks[index] && hasBlock1(blocks, x, y, z, false)) BlockPos surfacePos = level.getHeightmapPos(Heightmap.Types.WORLD_SURFACE, pos.offset(x - 8, 0, z - 8)); setBlock(level, surfacePos.below(), Blocks.GRASS_BLOCK.defaultBlockState()); if (rand.nextInt(5) == 0) - setBlock(level, surfacePos, Blocks.GRASS.defaultBlockState()); + setBlock(level, surfacePos, Blocks.SHORT_GRASS.defaultBlockState()); if (hasBlock1(blocks, x, 3, z, true)) { blockCount++; diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/EndTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/EndTree.java deleted file mode 100644 index a00e8f7b1b..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/EndTree.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -public class EndTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource rand, boolean hasFlowers) - { - return MSCFeatures.END_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/FrostTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/FrostTree.java deleted file mode 100644 index 245709cdfa..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/FrostTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class FrostTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.FROST_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/RainbowTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/RainbowTree.java deleted file mode 100644 index 04dc534c8e..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/RainbowTree.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -public class RainbowTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.RAINBOW_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/ShadewoodTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/ShadewoodTree.java deleted file mode 100644 index deee049bab..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/ShadewoodTree.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -public class ShadewoodTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource rand, boolean hasFlowers) - { - //TODO theres an issue with structure nbt defined variants that prevent them from generating correctly when grown from saplings - return rand.nextInt(20) == 0 ? MSCFeatures.SCARRED_SHADEWOOD_TREE : MSCFeatures.SHADEWOOD_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/BloodAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/BloodAspectTree.java deleted file mode 100644 index 30d7919dfa..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/BloodAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class BloodAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.BLOOD_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/BreathAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/BreathAspectTree.java deleted file mode 100644 index e3de750faf..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/BreathAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class BreathAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.BREATH_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/DoomAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/DoomAspectTree.java deleted file mode 100644 index 4609062515..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/DoomAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class DoomAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.DOOM_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/HeartAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/HeartAspectTree.java deleted file mode 100644 index e006139e2a..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/HeartAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class HeartAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.HEART_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/HopeAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/HopeAspectTree.java deleted file mode 100644 index e717f0cd32..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/HopeAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class HopeAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.HOPE_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/LifeAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/LifeAspectTree.java deleted file mode 100644 index 4de47fd52e..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/LifeAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class LifeAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.LIFE_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/LightAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/LightAspectTree.java deleted file mode 100644 index c2ff796240..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/LightAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class LightAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.LIGHT_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/MindAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/MindAspectTree.java deleted file mode 100644 index 5e7485f28a..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/MindAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class MindAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.MIND_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/RageAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/RageAspectTree.java deleted file mode 100644 index 42cb7be9a3..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/RageAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class RageAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.RAGE_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/SpaceAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/SpaceAspectTree.java deleted file mode 100644 index 8d9057caa6..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/SpaceAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class SpaceAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.SPACE_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/TimeAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/TimeAspectTree.java deleted file mode 100644 index eae2930ba9..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/TimeAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class TimeAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.TIME_TREE; - } -} \ No newline at end of file diff --git a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/VoidAspectTree.java b/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/VoidAspectTree.java deleted file mode 100644 index 0bf3a9bfcc..0000000000 --- a/src/main/java/com/mraof/minestuck/world/gen/feature/tree/aspect/VoidAspectTree.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mraof.minestuck.world.gen.feature.tree.aspect; - -import com.mraof.minestuck.world.gen.feature.MSCFeatures; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.grower.AbstractTreeGrower; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -import javax.annotation.Nullable; - -public class VoidAspectTree extends AbstractTreeGrower -{ - @Nullable - @Override - protected ResourceKey> getConfiguredFeature(RandomSource randomIn, boolean hasFlowers) - { - return MSCFeatures.VOID_TREE; - } -} \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index bf3a129e0d..84d25f45af 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -52,9 +52,9 @@ Adds Homestuck to your Minecraft! # the modid of the dependency modId="neoforge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified - mandatory=true #mandatory + type="required" # The version range of the dependency - versionRange="[20.2,)" #mandatory + versionRange="[20.4,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -62,22 +62,22 @@ Adds Homestuck to your Minecraft! [[dependencies.minestuck]] modId="geckolib" - mandatory=true - versionRange="[4.3,)" + type="required" + versionRange="[4.4,)" ordering="NONE" side="BOTH" -#[[dependencies.minestuck]] -# modId="infiniverse" -# mandatory=true -# versionRange="[1.0,1.1)" -# ordering="NONE" -# side="BOTH" +[[dependencies.minestuck]] + modId="infiniverse" + type="required" + versionRange="[2.0,2.1)" + ordering="NONE" + side="BOTH" # Here's another dependency [[dependencies.minestuck]] modId="minecraft" - mandatory=true - versionRange="[1.20.2]" + type="required" + versionRange="[1.20.4]" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 48edae7f86..4296daeaa2 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Minestuck resources", - "pack_format": 15 + "pack_format": 22 } }