From a9813ca2e1635dcc387247a0ba3ab3aaf6be5eba Mon Sep 17 00:00:00 2001 From: DMgaming <79250932+DMgaming100@users.noreply.github.com> Date: Tue, 1 Oct 2024 18:06:04 +0300 Subject: [PATCH] Renamed "moon cheese block" to "moon cheese wheel" (#362) * Changed all instances of cheese block to cheese wheel --- .../black_candle_moon_cheese_block.json | 10 ----- .../black_candle_moon_cheese_wheel.json | 10 +++++ .../blue_candle_moon_cheese_block.json | 10 ----- .../blue_candle_moon_cheese_wheel.json | 10 +++++ .../brown_candle_moon_cheese_block.json | 10 ----- .../brown_candle_moon_cheese_wheel.json | 10 +++++ .../blockstates/candle_moon_cheese_block.json | 10 ----- .../blockstates/candle_moon_cheese_wheel.json | 10 +++++ .../cyan_candle_moon_cheese_block.json | 10 ----- .../cyan_candle_moon_cheese_wheel.json | 10 +++++ .../gray_candle_moon_cheese_block.json | 10 ----- .../gray_candle_moon_cheese_wheel.json | 10 +++++ .../green_candle_moon_cheese_block.json | 10 ----- .../green_candle_moon_cheese_wheel.json | 10 +++++ ... light_blue_candle_moon_cheese_wheel.json} | 4 +- ... light_gray_candle_moon_cheese_wheel.json} | 4 +- .../lime_candle_moon_cheese_block.json | 10 ----- .../lime_candle_moon_cheese_wheel.json | 10 +++++ .../magenta_candle_moon_cheese_block.json | 10 ----- .../magenta_candle_moon_cheese_wheel.json | 10 +++++ .../blockstates/moon_cheese_block.json | 25 ------------ .../blockstates/moon_cheese_wheel.json | 25 ++++++++++++ .../orange_candle_moon_cheese_block.json | 10 ----- .../orange_candle_moon_cheese_wheel.json | 10 +++++ .../pink_candle_moon_cheese_block.json | 10 ----- .../pink_candle_moon_cheese_wheel.json | 10 +++++ .../purple_candle_moon_cheese_block.json | 10 ----- .../purple_candle_moon_cheese_wheel.json | 10 +++++ .../red_candle_moon_cheese_block.json | 10 ----- .../red_candle_moon_cheese_wheel.json | 10 +++++ .../white_candle_moon_cheese_block.json | 10 ----- .../white_candle_moon_cheese_wheel.json | 10 +++++ .../yellow_candle_moon_cheese_block.json | 10 ----- .../yellow_candle_moon_cheese_wheel.json | 10 +++++ .../assets/galacticraft/lang/en_us.json | 38 +++++++++--------- .../block/black_candle_moon_cheese_block.json | 10 ----- .../black_candle_moon_cheese_block_lit.json | 10 ----- .../block/black_candle_moon_cheese_wheel.json | 10 +++++ .../black_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/blue_candle_moon_cheese_block.json | 10 ----- .../blue_candle_moon_cheese_block_lit.json | 10 ----- .../block/blue_candle_moon_cheese_wheel.json | 10 +++++ .../blue_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/brown_candle_moon_cheese_block.json | 10 ----- .../brown_candle_moon_cheese_block_lit.json | 10 ----- .../block/brown_candle_moon_cheese_wheel.json | 10 +++++ .../brown_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/candle_moon_cheese_block.json | 10 ----- .../block/candle_moon_cheese_block_lit.json | 10 ----- .../block/candle_moon_cheese_wheel.json | 10 +++++ .../block/candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/cyan_candle_moon_cheese_block.json | 10 ----- .../cyan_candle_moon_cheese_block_lit.json | 10 ----- .../block/cyan_candle_moon_cheese_wheel.json | 10 +++++ .../cyan_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/gray_candle_moon_cheese_block.json | 10 ----- .../gray_candle_moon_cheese_block_lit.json | 10 ----- .../block/gray_candle_moon_cheese_wheel.json | 10 +++++ .../gray_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/green_candle_moon_cheese_block.json | 10 ----- .../green_candle_moon_cheese_block_lit.json | 10 ----- .../block/green_candle_moon_cheese_wheel.json | 10 +++++ .../green_candle_moon_cheese_wheel_lit.json | 10 +++++ .../light_blue_candle_moon_cheese_block.json | 10 ----- ...ght_blue_candle_moon_cheese_block_lit.json | 10 ----- .../light_blue_candle_moon_cheese_wheel.json | 10 +++++ ...ght_blue_candle_moon_cheese_wheel_lit.json | 10 +++++ .../light_gray_candle_moon_cheese_block.json | 10 ----- ...ght_gray_candle_moon_cheese_block_lit.json | 10 ----- .../light_gray_candle_moon_cheese_wheel.json | 10 +++++ ...ght_gray_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/lime_candle_moon_cheese_block.json | 10 ----- .../lime_candle_moon_cheese_block_lit.json | 10 ----- .../block/lime_candle_moon_cheese_wheel.json | 10 +++++ .../lime_candle_moon_cheese_wheel_lit.json | 10 +++++ .../magenta_candle_moon_cheese_block.json | 10 ----- .../magenta_candle_moon_cheese_block_lit.json | 10 ----- .../magenta_candle_moon_cheese_wheel.json | 10 +++++ .../magenta_candle_moon_cheese_wheel_lit.json | 10 +++++ .../orange_candle_moon_cheese_block.json | 10 ----- .../orange_candle_moon_cheese_block_lit.json | 10 ----- .../orange_candle_moon_cheese_wheel.json | 10 +++++ .../orange_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/pink_candle_moon_cheese_block.json | 10 ----- .../pink_candle_moon_cheese_block_lit.json | 10 ----- .../block/pink_candle_moon_cheese_wheel.json | 10 +++++ .../pink_candle_moon_cheese_wheel_lit.json | 10 +++++ .../purple_candle_moon_cheese_block.json | 10 ----- .../purple_candle_moon_cheese_block_lit.json | 10 ----- .../purple_candle_moon_cheese_wheel.json | 10 +++++ .../purple_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/red_candle_moon_cheese_block.json | 10 ----- .../red_candle_moon_cheese_block_lit.json | 10 ----- .../block/red_candle_moon_cheese_wheel.json | 10 +++++ .../red_candle_moon_cheese_wheel_lit.json | 10 +++++ .../block/white_candle_moon_cheese_block.json | 10 ----- .../white_candle_moon_cheese_block_lit.json | 10 ----- .../block/white_candle_moon_cheese_wheel.json | 10 +++++ .../white_candle_moon_cheese_wheel_lit.json | 10 +++++ .../yellow_candle_moon_cheese_block.json | 10 ----- .../yellow_candle_moon_cheese_block_lit.json | 10 ----- .../yellow_candle_moon_cheese_wheel.json | 10 +++++ .../yellow_candle_moon_cheese_wheel_lit.json | 10 +++++ ...eese_block.json => moon_cheese_wheel.json} | 2 +- .../recipes/food/cheese_slice.json | 6 +-- ...eese_block.json => moon_cheese_wheel.json} | 4 +- ...on => black_candle_moon_cheese_wheel.json} | 0 ...son => blue_candle_moon_cheese_wheel.json} | 0 ...on => brown_candle_moon_cheese_wheel.json} | 0 ...ock.json => candle_moon_cheese_wheel.json} | 0 ...son => cyan_candle_moon_cheese_wheel.json} | 0 ...son => gray_candle_moon_cheese_wheel.json} | 0 ...on => green_candle_moon_cheese_wheel.json} | 0 ... light_blue_candle_moon_cheese_wheel.json} | 0 ... light_gray_candle_moon_cheese_wheel.json} | 0 ...son => lime_candle_moon_cheese_wheel.json} | 0 ... => magenta_candle_moon_cheese_wheel.json} | 0 ...eese_block.json => moon_cheese_wheel.json} | 0 ...n => orange_candle_moon_cheese_wheel.json} | 0 ...son => pink_candle_moon_cheese_wheel.json} | 0 ...n => purple_candle_moon_cheese_wheel.json} | 0 ...json => red_candle_moon_cheese_wheel.json} | 0 ...on => white_candle_moon_cheese_wheel.json} | 0 ...n => yellow_candle_moon_cheese_wheel.json} | 0 .../galacticraft/recipe/cheese_slice.json | 2 +- ...eese_block.json => moon_cheese_wheel.json} | 2 +- .../data/galacticraft/recipe/orion_drive.json | 2 +- .../minecraft/tags/block/candle_cakes.json | 34 ++++++++-------- .../java/dev/galacticraft/mod/Constant.java | 36 ++++++++--------- .../galacticraft/mod/content/GCBlocks.java | 38 +++++++++--------- ...eBlock.java => CandleMoonCheeseWheel.java} | 14 +++---- ...nCheeseBlock.java => MoonCheeseWheel.java} | 6 +-- ...eese_block.json => moon_cheese_wheel.json} | 8 ++-- ...ce1.json => moon_cheese_wheel_slice1.json} | 10 ++--- ...ce2.json => moon_cheese_wheel_slice2.json} | 10 ++--- ...ce3.json => moon_cheese_wheel_slice3.json} | 10 ++--- ...ce4.json => moon_cheese_wheel_slice4.json} | 10 ++--- ...ce5.json => moon_cheese_wheel_slice5.json} | 10 ++--- ...ce6.json => moon_cheese_wheel_slice6.json} | 10 ++--- ...ottom.png => moon_cheese_wheel_bottom.png} | Bin ..._inner.png => moon_cheese_wheel_inner.png} | Bin ...ck_side.png => moon_cheese_wheel_side.png} | Bin ...lock_top.png => moon_cheese_wheel_top.png} | Bin ...cheese_block.png => moon_cheese_wheel.png} | Bin 144 files changed, 645 insertions(+), 645 deletions(-) delete mode 100644 src/main/generated/assets/galacticraft/blockstates/black_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/black_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/blue_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/blue_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/brown_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/brown_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/cyan_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/cyan_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/gray_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/gray_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/green_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/green_candle_moon_cheese_wheel.json rename src/main/generated/assets/galacticraft/blockstates/{light_blue_candle_moon_cheese_block.json => light_blue_candle_moon_cheese_wheel.json} (90%) rename src/main/generated/assets/galacticraft/blockstates/{light_gray_candle_moon_cheese_block.json => light_gray_candle_moon_cheese_wheel.json} (90%) delete mode 100644 src/main/generated/assets/galacticraft/blockstates/lime_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/lime_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/magenta_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/magenta_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/orange_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/orange_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/pink_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/pink_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/purple_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/purple_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/red_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/red_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/white_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/white_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/blockstates/yellow_candle_moon_cheese_block.json create mode 100644 src/main/generated/assets/galacticraft/blockstates/yellow_candle_moon_cheese_wheel.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_wheel_lit.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_block.json delete mode 100644 src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_block_lit.json create mode 100644 src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_wheel.json create mode 100644 src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_wheel_lit.json rename src/main/generated/assets/galacticraft/models/item/{moon_cheese_block.json => moon_cheese_wheel.json} (54%) rename src/main/generated/data/galacticraft/advancement/recipes/food/{moon_cheese_block.json => moon_cheese_wheel.json} (84%) rename src/main/generated/data/galacticraft/loot_table/blocks/{black_candle_moon_cheese_block.json => black_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{blue_candle_moon_cheese_block.json => blue_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{brown_candle_moon_cheese_block.json => brown_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{candle_moon_cheese_block.json => candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{cyan_candle_moon_cheese_block.json => cyan_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{gray_candle_moon_cheese_block.json => gray_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{green_candle_moon_cheese_block.json => green_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{light_blue_candle_moon_cheese_block.json => light_blue_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{light_gray_candle_moon_cheese_block.json => light_gray_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{lime_candle_moon_cheese_block.json => lime_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{magenta_candle_moon_cheese_block.json => magenta_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{moon_cheese_block.json => moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{orange_candle_moon_cheese_block.json => orange_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{pink_candle_moon_cheese_block.json => pink_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{purple_candle_moon_cheese_block.json => purple_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{red_candle_moon_cheese_block.json => red_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{white_candle_moon_cheese_block.json => white_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/loot_table/blocks/{yellow_candle_moon_cheese_block.json => yellow_candle_moon_cheese_wheel.json} (100%) rename src/main/generated/data/galacticraft/recipe/{moon_cheese_block.json => moon_cheese_wheel.json} (86%) rename src/main/java/dev/galacticraft/mod/content/block/special/{CandleMoonCheeseBlock.java => CandleMoonCheeseWheel.java} (94%) rename src/main/java/dev/galacticraft/mod/content/block/special/{MoonCheeseBlock.java => MoonCheeseWheel.java} (95%) rename src/main/resources/assets/galacticraft/models/block/{moon_cheese_block.json => moon_cheese_wheel.json} (66%) rename src/main/resources/assets/galacticraft/models/block/{moon_cheese_block_slice1.json => moon_cheese_wheel_slice1.json} (60%) rename src/main/resources/assets/galacticraft/models/block/{moon_cheese_block_slice2.json => moon_cheese_wheel_slice2.json} (60%) rename src/main/resources/assets/galacticraft/models/block/{moon_cheese_block_slice3.json => moon_cheese_wheel_slice3.json} (60%) rename src/main/resources/assets/galacticraft/models/block/{moon_cheese_block_slice4.json => moon_cheese_wheel_slice4.json} (60%) rename src/main/resources/assets/galacticraft/models/block/{moon_cheese_block_slice5.json => moon_cheese_wheel_slice5.json} (60%) rename src/main/resources/assets/galacticraft/models/block/{moon_cheese_block_slice6.json => moon_cheese_wheel_slice6.json} (60%) rename src/main/resources/assets/galacticraft/textures/block/{moon_cheese_block_bottom.png => moon_cheese_wheel_bottom.png} (100%) rename src/main/resources/assets/galacticraft/textures/block/{moon_cheese_block_inner.png => moon_cheese_wheel_inner.png} (100%) rename src/main/resources/assets/galacticraft/textures/block/{moon_cheese_block_side.png => moon_cheese_wheel_side.png} (100%) rename src/main/resources/assets/galacticraft/textures/block/{moon_cheese_block_top.png => moon_cheese_wheel_top.png} (100%) rename src/main/resources/assets/galacticraft/textures/item/{moon_cheese_block.png => moon_cheese_wheel.png} (100%) diff --git a/src/main/generated/assets/galacticraft/blockstates/black_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/black_candle_moon_cheese_block.json deleted file mode 100644 index 8d95afdfe..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/black_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/black_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/black_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/black_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/black_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..a2d2f9318 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/black_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/black_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/black_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/blue_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/blue_candle_moon_cheese_block.json deleted file mode 100644 index f2248fe25..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/blue_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/blue_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/blue_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/blue_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/blue_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..1270e4cfc --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/blue_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/blue_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/blue_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/brown_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/brown_candle_moon_cheese_block.json deleted file mode 100644 index 2cc4be2b2..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/brown_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/brown_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/brown_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/brown_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/brown_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..ce2b68566 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/brown_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/brown_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/brown_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/candle_moon_cheese_block.json deleted file mode 100644 index 9932df197..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/candle_moon_cheese_wheel.json new file mode 100644 index 000000000..f814899f3 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/cyan_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/cyan_candle_moon_cheese_block.json deleted file mode 100644 index a445d5c7c..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/cyan_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/cyan_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/cyan_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/cyan_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/cyan_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..db50b0c40 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/cyan_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/cyan_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/cyan_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/gray_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/gray_candle_moon_cheese_block.json deleted file mode 100644 index 56b34d67a..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/gray_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/gray_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/gray_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/gray_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/gray_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..183cf0db1 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/gray_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/gray_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/gray_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/green_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/green_candle_moon_cheese_block.json deleted file mode 100644 index ae81a3a1b..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/green_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/green_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/green_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/green_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/green_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..99b68f5f6 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/green_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/green_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/green_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/light_blue_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/light_blue_candle_moon_cheese_wheel.json similarity index 90% rename from src/main/generated/assets/galacticraft/blockstates/light_blue_candle_moon_cheese_block.json rename to src/main/generated/assets/galacticraft/blockstates/light_blue_candle_moon_cheese_wheel.json index dedb13084..dec638a27 100644 --- a/src/main/generated/assets/galacticraft/blockstates/light_blue_candle_moon_cheese_block.json +++ b/src/main/generated/assets/galacticraft/blockstates/light_blue_candle_moon_cheese_wheel.json @@ -1,10 +1,10 @@ { "variants": { "lit=false": { - "model": "galacticraft:block/light_blue_candle_moon_cheese_block" + "model": "galacticraft:block/light_blue_candle_moon_cheese_wheel" }, "lit=true": { - "model": "galacticraft:block/light_blue_candle_moon_cheese_block_lit" + "model": "galacticraft:block/light_blue_candle_moon_cheese_wheel_lit" } } } \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/light_gray_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/light_gray_candle_moon_cheese_wheel.json similarity index 90% rename from src/main/generated/assets/galacticraft/blockstates/light_gray_candle_moon_cheese_block.json rename to src/main/generated/assets/galacticraft/blockstates/light_gray_candle_moon_cheese_wheel.json index ebe11d4c1..6ad867f09 100644 --- a/src/main/generated/assets/galacticraft/blockstates/light_gray_candle_moon_cheese_block.json +++ b/src/main/generated/assets/galacticraft/blockstates/light_gray_candle_moon_cheese_wheel.json @@ -1,10 +1,10 @@ { "variants": { "lit=false": { - "model": "galacticraft:block/light_gray_candle_moon_cheese_block" + "model": "galacticraft:block/light_gray_candle_moon_cheese_wheel" }, "lit=true": { - "model": "galacticraft:block/light_gray_candle_moon_cheese_block_lit" + "model": "galacticraft:block/light_gray_candle_moon_cheese_wheel_lit" } } } \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/lime_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/lime_candle_moon_cheese_block.json deleted file mode 100644 index 72cc64b0b..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/lime_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/lime_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/lime_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/lime_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/lime_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..e304f4a5a --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/lime_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/lime_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/lime_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/magenta_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/magenta_candle_moon_cheese_block.json deleted file mode 100644 index 433cfe934..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/magenta_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/magenta_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/magenta_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/magenta_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/magenta_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..28a657aa2 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/magenta_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/magenta_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/magenta_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/moon_cheese_block.json deleted file mode 100644 index 7690140ec..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/moon_cheese_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "variants": { - "bites=0": { - "model": "galacticraft:block/moon_cheese_block" - }, - "bites=1": { - "model": "galacticraft:block/moon_cheese_block_slice1" - }, - "bites=2": { - "model": "galacticraft:block/moon_cheese_block_slice2" - }, - "bites=3": { - "model": "galacticraft:block/moon_cheese_block_slice3" - }, - "bites=4": { - "model": "galacticraft:block/moon_cheese_block_slice4" - }, - "bites=5": { - "model": "galacticraft:block/moon_cheese_block_slice5" - }, - "bites=6": { - "model": "galacticraft:block/moon_cheese_block_slice6" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/moon_cheese_wheel.json new file mode 100644 index 000000000..5d40b8f32 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/moon_cheese_wheel.json @@ -0,0 +1,25 @@ +{ + "variants": { + "bites=0": { + "model": "galacticraft:block/moon_cheese_wheel" + }, + "bites=1": { + "model": "galacticraft:block/moon_cheese_wheel_slice1" + }, + "bites=2": { + "model": "galacticraft:block/moon_cheese_wheel_slice2" + }, + "bites=3": { + "model": "galacticraft:block/moon_cheese_wheel_slice3" + }, + "bites=4": { + "model": "galacticraft:block/moon_cheese_wheel_slice4" + }, + "bites=5": { + "model": "galacticraft:block/moon_cheese_wheel_slice5" + }, + "bites=6": { + "model": "galacticraft:block/moon_cheese_wheel_slice6" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/orange_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/orange_candle_moon_cheese_block.json deleted file mode 100644 index e09f17b73..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/orange_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/orange_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/orange_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/orange_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/orange_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..7f4a274a0 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/orange_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/orange_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/orange_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/pink_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/pink_candle_moon_cheese_block.json deleted file mode 100644 index 4fc8c25b0..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/pink_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/pink_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/pink_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/pink_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/pink_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..55495ef8d --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/pink_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/pink_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/pink_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/purple_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/purple_candle_moon_cheese_block.json deleted file mode 100644 index f6974b0e9..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/purple_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/purple_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/purple_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/purple_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/purple_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..24dcce3bf --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/purple_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/purple_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/purple_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/red_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/red_candle_moon_cheese_block.json deleted file mode 100644 index 5cb1ce25a..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/red_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/red_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/red_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/red_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/red_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..f9539de0b --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/red_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/red_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/red_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/white_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/white_candle_moon_cheese_block.json deleted file mode 100644 index d0fa6b0fc..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/white_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/white_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/white_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/white_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/white_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..6e5d41fa8 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/white_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/white_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/white_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/yellow_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/blockstates/yellow_candle_moon_cheese_block.json deleted file mode 100644 index 9ed3cac2c..000000000 --- a/src/main/generated/assets/galacticraft/blockstates/yellow_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "lit=false": { - "model": "galacticraft:block/yellow_candle_moon_cheese_block" - }, - "lit=true": { - "model": "galacticraft:block/yellow_candle_moon_cheese_block_lit" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/yellow_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/blockstates/yellow_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..adc365383 --- /dev/null +++ b/src/main/generated/assets/galacticraft/blockstates/yellow_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "variants": { + "lit=false": { + "model": "galacticraft:block/yellow_candle_moon_cheese_wheel" + }, + "lit=true": { + "model": "galacticraft:block/yellow_candle_moon_cheese_wheel_lit" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/lang/en_us.json b/src/main/generated/assets/galacticraft/lang/en_us.json index 7f9a310c6..0dde5a281 100644 --- a/src/main/generated/assets/galacticraft/lang/en_us.json +++ b/src/main/generated/assets/galacticraft/lang/en_us.json @@ -25,15 +25,15 @@ "block.galacticraft.asteroid_rock_block_2": "Asteroid Rock", "block.galacticraft.basic_solar_panel": "Basic Solar Panel", "block.galacticraft.basic_solar_panel.description": "Basic Solar Panels collect energy from the sun, and store it for further use. Collects most energy at mid-day (non-adjustable).", - "block.galacticraft.black_candle_moon_cheese_block": "Block of Cheese with Black Candle", - "block.galacticraft.blue_candle_moon_cheese_block": "Block of Cheese with Blue Candle", + "block.galacticraft.black_candle_moon_cheese_wheel": "Block of Cheese with Black Candle", + "block.galacticraft.blue_candle_moon_cheese_wheel": "Block of Cheese with Blue Candle", "block.galacticraft.boss_spawner": "Boss Spawner", "block.galacticraft.bronze_decoration": "Bronze Decoration", "block.galacticraft.bronze_decoration_slab": "Bronze Decoration Slab", "block.galacticraft.bronze_decoration_stairs": "Bronze Decoration Stairs", "block.galacticraft.bronze_decoration_wall": "Bronze Decoration Wall", - "block.galacticraft.brown_candle_moon_cheese_block": "Block of Cheese with Brown Candle", - "block.galacticraft.candle_moon_cheese_block": "Block of Cheese with Candle", + "block.galacticraft.brown_candle_moon_cheese_wheel": "Block of Cheese with Brown Candle", + "block.galacticraft.candle_moon_cheese_wheel": "Block of Cheese with Candle", "block.galacticraft.cavernous_vines": "Cavernous Vines", "block.galacticraft.cavernous_vines_plant": "Cavernous Vines Plant", "block.galacticraft.chiseled_moon_rock_brick": "Chiseled Moon Rock Brick", @@ -66,7 +66,7 @@ "block.galacticraft.crude_oil": "Crude Oil", "block.galacticraft.cryogenic_chamber": "Cryogenic Chamber", "block.galacticraft.cryogenic_chamber_part": "Cryogenic Chamber Part", - "block.galacticraft.cyan_candle_moon_cheese_block": "Block of Cheese with Cyan Candle", + "block.galacticraft.cyan_candle_moon_cheese_wheel": "Block of Cheese with Cyan Candle", "block.galacticraft.dark_decoration": "Dark Decoration", "block.galacticraft.dark_decoration_slab": "Dark Decoration Slab", "block.galacticraft.dark_decoration_stairs": "Dark Decoration Stairs", @@ -130,8 +130,8 @@ "block.galacticraft.glowstone_lantern": "Glowstone Lantern", "block.galacticraft.glowstone_torch": "Glowstone Torch", "block.galacticraft.grating": "Grating", - "block.galacticraft.gray_candle_moon_cheese_block": "Block of Cheese with Gray Candle", - "block.galacticraft.green_candle_moon_cheese_block": "Block of Cheese with Green Candle", + "block.galacticraft.gray_candle_moon_cheese_wheel": "Block of Cheese with Gray Candle", + "block.galacticraft.green_candle_moon_cheese_wheel": "Block of Cheese with Green Candle", "block.galacticraft.hard_venus_rock": "Hard Venus Rock", "block.galacticraft.heavy_sealable_aluminum_wire": "Heavy Sealable Aluminum Wire", "block.galacticraft.ilmenite_ore": "Ilmenite Ore", @@ -140,9 +140,9 @@ "block.galacticraft.iron_decoration_stairs": "Iron Decoration Stairs", "block.galacticraft.iron_decoration_wall": "Iron Decoration Wall", "block.galacticraft.lead_block": "Block of Lead", - "block.galacticraft.light_blue_candle_moon_cheese_block": "Block of Cheese with Light Blue Candle", - "block.galacticraft.light_gray_candle_moon_cheese_block": "Block of Cheese with Light Gray Candle", - "block.galacticraft.lime_candle_moon_cheese_block": "Block of Cheese with Lime Candle", + "block.galacticraft.light_blue_candle_moon_cheese_wheel": "Block of Cheese with Light Blue Candle", + "block.galacticraft.light_gray_candle_moon_cheese_wheel": "Block of Cheese with Light Gray Candle", + "block.galacticraft.lime_candle_moon_cheese_wheel": "Block of Cheese with Lime Candle", "block.galacticraft.linear_light_panel": "Light Panel (Linear)", "block.galacticraft.lunar_cartography_table": "Lunar Cartography Table", "block.galacticraft.lunar_sapphire_block": "Block of Lunar Sapphire", @@ -152,7 +152,7 @@ "block.galacticraft.lunaslate_stairs": "Lunaslate Stairs", "block.galacticraft.lunaslate_tin_ore": "Lunaslate Tin Ore", "block.galacticraft.lunaslate_wall": "Lunaslate Wall", - "block.galacticraft.magenta_candle_moon_cheese_block": "Block of Cheese with Magenta Candle", + "block.galacticraft.magenta_candle_moon_cheese_wheel": "Block of Cheese with Magenta Candle", "block.galacticraft.mars_cobblestone": "Mars Cobblestone", "block.galacticraft.mars_cobblestone_slab": "Mars Cobblestone Slab", "block.galacticraft.mars_cobblestone_stairs": "Mars Cobblestone Stairs", @@ -176,8 +176,8 @@ "block.galacticraft.moon_basalt_slab": "Moon Basalt Slab", "block.galacticraft.moon_basalt_stairs": "Moon Basalt Stairs", "block.galacticraft.moon_basalt_wall": "Moon Basalt Wall", - "block.galacticraft.moon_cheese_block": "Moon Cheese Wheel", - "block.galacticraft.moon_cheese_block.description": "Cheese Blocks are created from the cheeses of the Moon, place-able and edible.", + "block.galacticraft.moon_cheese_wheel": "Moon Cheese Wheel", + "block.galacticraft.moon_cheese_wheel.description": "Cheese Blocks are created from the cheeses of the Moon, place-able and edible.", "block.galacticraft.moon_copper_ore": "Moon Copper Ore", "block.galacticraft.moon_dirt": "Moon Dirt", "block.galacticraft.moon_dirt_path": "Moon Dirt Path", @@ -197,7 +197,7 @@ "block.galacticraft.olivine_basalt": "Olivine Basalt", "block.galacticraft.olivine_block": "Block of Olivine", "block.galacticraft.olivine_cluster": "Olivine Cluster", - "block.galacticraft.orange_candle_moon_cheese_block": "Block of Cheese with Orange Candle", + "block.galacticraft.orange_candle_moon_cheese_wheel": "Block of Cheese with Orange Candle", "block.galacticraft.oxygen_bubble_distributor": "Bubble Distributor", "block.galacticraft.oxygen_bubble_distributor.description": "Oxygen Bubble Distributor creates a bubble of air around itself. Requires oxygen and electricity.", "block.galacticraft.oxygen_collector": "Oxygen Collector", @@ -208,15 +208,15 @@ "block.galacticraft.oxygen_storage_module": "Oxygen Storage Module", "block.galacticraft.parachest": "Parachest", "block.galacticraft.parachest.description": "Parachests will fall from the sky after landing on certain planets/moons, such as Earth. Contains rocket, fuel, and cargo from previous launch.", - "block.galacticraft.pink_candle_moon_cheese_block": "Block of Cheese with Pink Candle", + "block.galacticraft.pink_candle_moon_cheese_wheel": "Block of Cheese with Pink Candle", "block.galacticraft.player_transport_tube": "Player Transport Tube", "block.galacticraft.polished_moon_rock": "Polished Moon Rock", "block.galacticraft.polished_moon_rock_slab": "Polished Moon Rock Slab", "block.galacticraft.polished_moon_rock_stairs": "Polished Moon Rock Stairs", "block.galacticraft.polished_moon_rock_wall": "Polished Moon Rock Wall", "block.galacticraft.pumice": "Pumice", - "block.galacticraft.purple_candle_moon_cheese_block": "Block of Cheese with Purple Candle", - "block.galacticraft.red_candle_moon_cheese_block": "Block of Cheese with Red Candle", + "block.galacticraft.purple_candle_moon_cheese_wheel": "Block of Cheese with Purple Candle", + "block.galacticraft.red_candle_moon_cheese_wheel": "Block of Cheese with Red Candle", "block.galacticraft.refinery": "Refinery", "block.galacticraft.refinery.description": "Refinery will take an input of oil and energy, and output fuel used for rockets and vehicles.", "block.galacticraft.rich_olivine_basalt": "Rich Olivine Basalt", @@ -254,9 +254,9 @@ "block.galacticraft.vapor_spout": "Vapor Spout", "block.galacticraft.volcanic_rock": "Volcanic Rock", "block.galacticraft.walkway": "Walkway", - "block.galacticraft.white_candle_moon_cheese_block": "Block of Cheese with White Candle", + "block.galacticraft.white_candle_moon_cheese_wheel": "Block of Cheese with White Candle", "block.galacticraft.wire_walkway": "Wire Walkway", - "block.galacticraft.yellow_candle_moon_cheese_block": "Block of Cheese with Yellow Candle", + "block.galacticraft.yellow_candle_moon_cheese_wheel": "Block of Cheese with Yellow Candle", "category.recipe_viewer.circuit_fabricator": "Circuit Fabricating", "category.recipe_viewer.compressing": "Compressing", "chat.galacticraft.bed_fail": "Uh oh, what if the oxygen runs out when I am asleep? I'll need a Cryogenic Chamber to sleep in space!", diff --git a/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_block.json deleted file mode 100644 index a2cde8cdf..000000000 --- a/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/black_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_block_lit.json deleted file mode 100644 index 4c9e9644f..000000000 --- a/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/black_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..eac534abc --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/black_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..714986832 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/black_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/black_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_block.json deleted file mode 100644 index b8126c24b..000000000 --- a/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/blue_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_block_lit.json deleted file mode 100644 index 97f76d53b..000000000 --- a/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/blue_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..2d06ca480 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/blue_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..91f1ffa48 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/blue_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/blue_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_block.json deleted file mode 100644 index 7b8684267..000000000 --- a/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/brown_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_block_lit.json deleted file mode 100644 index cc4c37c81..000000000 --- a/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/brown_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..0729bacb6 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/brown_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..2269c4891 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/brown_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/brown_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_block.json deleted file mode 100644 index ae0436237..000000000 --- a/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_block_lit.json deleted file mode 100644 index 8d35f0fe6..000000000 --- a/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_wheel.json new file mode 100644 index 000000000..22fb9f4a5 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..78ab4848f --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_block.json deleted file mode 100644 index b18f6d5cd..000000000 --- a/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/cyan_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_block_lit.json deleted file mode 100644 index ee4f8043b..000000000 --- a/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/cyan_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..f3638c7d4 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/cyan_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..c3c9a39e7 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/cyan_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/cyan_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_block.json deleted file mode 100644 index 4b3c77a4e..000000000 --- a/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/gray_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_block_lit.json deleted file mode 100644 index 0720bccc0..000000000 --- a/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/gray_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..b12eb85d9 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/gray_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..edbc63ff1 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/gray_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/gray_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_block.json deleted file mode 100644 index 70999ee95..000000000 --- a/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/green_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_block_lit.json deleted file mode 100644 index b7d12be2a..000000000 --- a/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/green_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..5baadddd9 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/green_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..0e76e0fdd --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/green_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/green_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_block.json deleted file mode 100644 index ee6af5e9f..000000000 --- a/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/light_blue_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_block_lit.json deleted file mode 100644 index b109e0cb4..000000000 --- a/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/light_blue_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..3cfbf0091 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/light_blue_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..066133bda --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/light_blue_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/light_blue_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_block.json deleted file mode 100644 index 93a1e6e2d..000000000 --- a/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/light_gray_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_block_lit.json deleted file mode 100644 index 7e33d8239..000000000 --- a/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/light_gray_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..4478fde06 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/light_gray_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..32e279b17 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/light_gray_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/light_gray_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_block.json deleted file mode 100644 index e259a3369..000000000 --- a/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/lime_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_block_lit.json deleted file mode 100644 index 45e3a3411..000000000 --- a/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/lime_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..8cba1e291 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/lime_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..37673bd8a --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/lime_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/lime_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_block.json deleted file mode 100644 index 39b013a51..000000000 --- a/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/magenta_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_block_lit.json deleted file mode 100644 index 0ba9b9fc2..000000000 --- a/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/magenta_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..cab29701e --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/magenta_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..56d26cdbf --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/magenta_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/magenta_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_block.json deleted file mode 100644 index 35e1d7cae..000000000 --- a/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/orange_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_block_lit.json deleted file mode 100644 index 00dc94b4d..000000000 --- a/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/orange_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..1734f129c --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/orange_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..517a60e00 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/orange_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/orange_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_block.json deleted file mode 100644 index e63aab27a..000000000 --- a/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/pink_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_block_lit.json deleted file mode 100644 index eea3d16f3..000000000 --- a/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/pink_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..d9bd3154c --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/pink_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..0dda01a3f --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/pink_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/pink_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_block.json deleted file mode 100644 index 58904016a..000000000 --- a/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/purple_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_block_lit.json deleted file mode 100644 index aaf5ae6b9..000000000 --- a/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/purple_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..f45e000e4 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/purple_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..adb04359c --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/purple_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/purple_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_block.json deleted file mode 100644 index 336f26ace..000000000 --- a/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/red_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_block_lit.json deleted file mode 100644 index 546eb8588..000000000 --- a/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/red_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..c07df8b0e --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/red_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..db8fb995c --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/red_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/red_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_block.json deleted file mode 100644 index 525a25442..000000000 --- a/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/white_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_block_lit.json deleted file mode 100644 index 90291cef2..000000000 --- a/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/white_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..d5e7889ce --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/white_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..228d89c72 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/white_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/white_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_block.json deleted file mode 100644 index 3a2e342f1..000000000 --- a/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/yellow_candle", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_block_lit.json b/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_block_lit.json deleted file mode 100644 index 0565a5caf..000000000 --- a/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_block_lit.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:block/template_cake_with_candle", - "textures": { - "bottom": "galacticraft:block/moon_cheese_block", - "candle": "minecraft:block/yellow_candle_lit", - "particle": "galacticraft:block/moon_cheese_block_side", - "side": "galacticraft:block/moon_cheese_block_side", - "top": "galacticraft:block/moon_cheese_block" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_wheel.json b/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_wheel.json new file mode 100644 index 000000000..68b928ab7 --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_wheel.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/yellow_candle", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_wheel_lit.json b/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_wheel_lit.json new file mode 100644 index 000000000..ee438379a --- /dev/null +++ b/src/main/generated/assets/galacticraft/models/block/yellow_candle_moon_cheese_wheel_lit.json @@ -0,0 +1,10 @@ +{ + "parent": "minecraft:block/template_cake_with_candle", + "textures": { + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "candle": "minecraft:block/yellow_candle_lit", + "particle": "galacticraft:block/moon_cheese_wheel_side", + "side": "galacticraft:block/moon_cheese_wheel_side", + "top": "galacticraft:block/moon_cheese_wheel_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/item/moon_cheese_block.json b/src/main/generated/assets/galacticraft/models/item/moon_cheese_wheel.json similarity index 54% rename from src/main/generated/assets/galacticraft/models/item/moon_cheese_block.json rename to src/main/generated/assets/galacticraft/models/item/moon_cheese_wheel.json index 2b87f8190..8793cfdd5 100644 --- a/src/main/generated/assets/galacticraft/models/item/moon_cheese_block.json +++ b/src/main/generated/assets/galacticraft/models/item/moon_cheese_wheel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "galacticraft:item/moon_cheese_block" + "layer0": "galacticraft:item/moon_cheese_wheel" } } \ No newline at end of file diff --git a/src/main/generated/data/galacticraft/advancement/recipes/food/cheese_slice.json b/src/main/generated/data/galacticraft/advancement/recipes/food/cheese_slice.json index 7087ed3bd..35af7e35c 100644 --- a/src/main/generated/data/galacticraft/advancement/recipes/food/cheese_slice.json +++ b/src/main/generated/data/galacticraft/advancement/recipes/food/cheese_slice.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_moon_cheese_block": { + "has_moon_cheese_wheel": { "conditions": { "items": [ { - "items": "galacticraft:moon_cheese_block" + "items": "galacticraft:moon_cheese_wheel" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_moon_cheese_block" + "has_moon_cheese_wheel" ] ], "rewards": { diff --git a/src/main/generated/data/galacticraft/advancement/recipes/food/moon_cheese_block.json b/src/main/generated/data/galacticraft/advancement/recipes/food/moon_cheese_wheel.json similarity index 84% rename from src/main/generated/data/galacticraft/advancement/recipes/food/moon_cheese_block.json rename to src/main/generated/data/galacticraft/advancement/recipes/food/moon_cheese_wheel.json index 94e4fa534..c4941bbde 100644 --- a/src/main/generated/data/galacticraft/advancement/recipes/food/moon_cheese_block.json +++ b/src/main/generated/data/galacticraft/advancement/recipes/food/moon_cheese_wheel.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "galacticraft:moon_cheese_block" + "recipe": "galacticraft:moon_cheese_wheel" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "galacticraft:moon_cheese_block" + "galacticraft:moon_cheese_wheel" ] } } \ No newline at end of file diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/black_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/black_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/black_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/black_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/blue_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/blue_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/blue_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/blue_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/brown_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/brown_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/brown_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/brown_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/cyan_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/cyan_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/cyan_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/cyan_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/gray_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/gray_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/gray_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/gray_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/green_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/green_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/green_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/green_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/light_blue_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/light_blue_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/light_blue_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/light_blue_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/light_gray_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/light_gray_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/light_gray_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/light_gray_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/lime_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/lime_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/lime_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/lime_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/magenta_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/magenta_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/magenta_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/magenta_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/orange_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/orange_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/orange_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/orange_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/pink_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/pink_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/pink_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/pink_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/purple_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/purple_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/purple_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/purple_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/red_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/red_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/red_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/red_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/white_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/white_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/white_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/white_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/loot_table/blocks/yellow_candle_moon_cheese_block.json b/src/main/generated/data/galacticraft/loot_table/blocks/yellow_candle_moon_cheese_wheel.json similarity index 100% rename from src/main/generated/data/galacticraft/loot_table/blocks/yellow_candle_moon_cheese_block.json rename to src/main/generated/data/galacticraft/loot_table/blocks/yellow_candle_moon_cheese_wheel.json diff --git a/src/main/generated/data/galacticraft/recipe/cheese_slice.json b/src/main/generated/data/galacticraft/recipe/cheese_slice.json index 8c1589afd..721215be1 100644 --- a/src/main/generated/data/galacticraft/recipe/cheese_slice.json +++ b/src/main/generated/data/galacticraft/recipe/cheese_slice.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "item": "galacticraft:moon_cheese_block" + "item": "galacticraft:moon_cheese_wheel" } ], "result": { diff --git a/src/main/generated/data/galacticraft/recipe/moon_cheese_block.json b/src/main/generated/data/galacticraft/recipe/moon_cheese_wheel.json similarity index 86% rename from src/main/generated/data/galacticraft/recipe/moon_cheese_block.json rename to src/main/generated/data/galacticraft/recipe/moon_cheese_wheel.json index 7d5556a07..b671cea7f 100644 --- a/src/main/generated/data/galacticraft/recipe/moon_cheese_block.json +++ b/src/main/generated/data/galacticraft/recipe/moon_cheese_wheel.json @@ -16,6 +16,6 @@ ], "result": { "count": 1, - "id": "galacticraft:moon_cheese_block" + "id": "galacticraft:moon_cheese_wheel" } } \ No newline at end of file diff --git a/src/main/generated/data/galacticraft/recipe/orion_drive.json b/src/main/generated/data/galacticraft/recipe/orion_drive.json index 17e935898..321a1a476 100644 --- a/src/main/generated/data/galacticraft/recipe/orion_drive.json +++ b/src/main/generated/data/galacticraft/recipe/orion_drive.json @@ -12,7 +12,7 @@ "item": "minecraft:diamond_ore" }, "E": { - "item": "galacticraft:moon_cheese_block" + "item": "galacticraft:moon_cheese_wheel" }, "G": { "item": "minecraft:gold_ore" diff --git a/src/main/generated/data/minecraft/tags/block/candle_cakes.json b/src/main/generated/data/minecraft/tags/block/candle_cakes.json index 45284a186..c6816bf2e 100644 --- a/src/main/generated/data/minecraft/tags/block/candle_cakes.json +++ b/src/main/generated/data/minecraft/tags/block/candle_cakes.json @@ -1,21 +1,21 @@ { "values": [ - "galacticraft:candle_moon_cheese_block", - "galacticraft:white_candle_moon_cheese_block", - "galacticraft:orange_candle_moon_cheese_block", - "galacticraft:magenta_candle_moon_cheese_block", - "galacticraft:light_blue_candle_moon_cheese_block", - "galacticraft:yellow_candle_moon_cheese_block", - "galacticraft:lime_candle_moon_cheese_block", - "galacticraft:pink_candle_moon_cheese_block", - "galacticraft:gray_candle_moon_cheese_block", - "galacticraft:light_gray_candle_moon_cheese_block", - "galacticraft:cyan_candle_moon_cheese_block", - "galacticraft:purple_candle_moon_cheese_block", - "galacticraft:blue_candle_moon_cheese_block", - "galacticraft:brown_candle_moon_cheese_block", - "galacticraft:green_candle_moon_cheese_block", - "galacticraft:red_candle_moon_cheese_block", - "galacticraft:black_candle_moon_cheese_block" + "galacticraft:candle_moon_cheese_wheel", + "galacticraft:white_candle_moon_cheese_wheel", + "galacticraft:orange_candle_moon_cheese_wheel", + "galacticraft:magenta_candle_moon_cheese_wheel", + "galacticraft:light_blue_candle_moon_cheese_wheel", + "galacticraft:yellow_candle_moon_cheese_wheel", + "galacticraft:lime_candle_moon_cheese_wheel", + "galacticraft:pink_candle_moon_cheese_wheel", + "galacticraft:gray_candle_moon_cheese_wheel", + "galacticraft:light_gray_candle_moon_cheese_wheel", + "galacticraft:cyan_candle_moon_cheese_wheel", + "galacticraft:purple_candle_moon_cheese_wheel", + "galacticraft:blue_candle_moon_cheese_wheel", + "galacticraft:brown_candle_moon_cheese_wheel", + "galacticraft:green_candle_moon_cheese_wheel", + "galacticraft:red_candle_moon_cheese_wheel", + "galacticraft:black_candle_moon_cheese_wheel" ] } \ No newline at end of file diff --git a/src/main/java/dev/galacticraft/mod/Constant.java b/src/main/java/dev/galacticraft/mod/Constant.java index 5c26a4c69..c4ce6316b 100644 --- a/src/main/java/dev/galacticraft/mod/Constant.java +++ b/src/main/java/dev/galacticraft/mod/Constant.java @@ -218,24 +218,24 @@ interface Block { String BOSS_SPAWNER = "boss_spawner"; // Moon Cheese - String MOON_CHEESE_WHEEL = "moon_cheese_block"; - String CANDLE_MOON_CHEESE_WHEEL = "candle_moon_cheese_block"; - String WHITE_CANDLE_MOON_CHEESE_WHEEL = "white_candle_moon_cheese_block"; - String ORANGE_CANDLE_MOON_CHEESE_WHEEL = "orange_candle_moon_cheese_block"; - String MAGENTA_CANDLE_MOON_CHEESE_WHEEL = "magenta_candle_moon_cheese_block"; - String LIGHT_BLUE_CANDLE_MOON_CHEESE_WHEEL = "light_blue_candle_moon_cheese_block"; - String YELLOW_CANDLE_MOON_CHEESE_WHEEL = "yellow_candle_moon_cheese_block"; - String LIME_CANDLE_MOON_CHEESE_WHEEL = "lime_candle_moon_cheese_block"; - String PINK_CANDLE_MOON_CHEESE_WHEEL = "pink_candle_moon_cheese_block"; - String GRAY_CANDLE_MOON_CHEESE_WHEEL = "gray_candle_moon_cheese_block"; - String LIGHT_GRAY_CANDLE_MOON_CHEESE_WHEEL = "light_gray_candle_moon_cheese_block"; - String CYAN_CANDLE_MOON_CHEESE_WHEEL = "cyan_candle_moon_cheese_block"; - String PURPLE_CANDLE_MOON_CHEESE_WHEEL = "purple_candle_moon_cheese_block"; - String BLUE_CANDLE_MOON_CHEESE_WHEEL = "blue_candle_moon_cheese_block"; - String BROWN_CANDLE_MOON_CHEESE_WHEEL = "brown_candle_moon_cheese_block"; - String GREEN_CANDLE_MOON_CHEESE_WHEEL = "green_candle_moon_cheese_block"; - String RED_CANDLE_MOON_CHEESE_WHEEL = "red_candle_moon_cheese_block"; - String BLACK_CANDLE_MOON_CHEESE_WHEEL = "black_candle_moon_cheese_block"; + String MOON_CHEESE_WHEEL = "moon_cheese_wheel"; + String CANDLE_MOON_CHEESE_WHEEL = "candle_moon_cheese_wheel"; + String WHITE_CANDLE_MOON_CHEESE_WHEEL = "white_candle_moon_cheese_wheel"; + String ORANGE_CANDLE_MOON_CHEESE_WHEEL = "orange_candle_moon_cheese_wheel"; + String MAGENTA_CANDLE_MOON_CHEESE_WHEEL = "magenta_candle_moon_cheese_wheel"; + String LIGHT_BLUE_CANDLE_MOON_CHEESE_WHEEL = "light_blue_candle_moon_cheese_wheel"; + String YELLOW_CANDLE_MOON_CHEESE_WHEEL = "yellow_candle_moon_cheese_wheel"; + String LIME_CANDLE_MOON_CHEESE_WHEEL = "lime_candle_moon_cheese_wheel"; + String PINK_CANDLE_MOON_CHEESE_WHEEL = "pink_candle_moon_cheese_wheel"; + String GRAY_CANDLE_MOON_CHEESE_WHEEL = "gray_candle_moon_cheese_wheel"; + String LIGHT_GRAY_CANDLE_MOON_CHEESE_WHEEL = "light_gray_candle_moon_cheese_wheel"; + String CYAN_CANDLE_MOON_CHEESE_WHEEL = "cyan_candle_moon_cheese_wheel"; + String PURPLE_CANDLE_MOON_CHEESE_WHEEL = "purple_candle_moon_cheese_wheel"; + String BLUE_CANDLE_MOON_CHEESE_WHEEL = "blue_candle_moon_cheese_wheel"; + String BROWN_CANDLE_MOON_CHEESE_WHEEL = "brown_candle_moon_cheese_wheel"; + String GREEN_CANDLE_MOON_CHEESE_WHEEL = "green_candle_moon_cheese_wheel"; + String RED_CANDLE_MOON_CHEESE_WHEEL = "red_candle_moon_cheese_wheel"; + String BLACK_CANDLE_MOON_CHEESE_WHEEL = "black_candle_moon_cheese_wheel"; // Liquids String FUEL = "fuel"; diff --git a/src/main/java/dev/galacticraft/mod/content/GCBlocks.java b/src/main/java/dev/galacticraft/mod/content/GCBlocks.java index 08bffd699..1ad992fad 100644 --- a/src/main/java/dev/galacticraft/mod/content/GCBlocks.java +++ b/src/main/java/dev/galacticraft/mod/content/GCBlocks.java @@ -245,25 +245,25 @@ public class GCBlocks { public static final Block OLIVINE_BASALT = BLOCKS.registerWithItem(Constant.Block.OLIVINE_BASALT, new Block(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT).strength(3.5F, 6.0F))); public static final Block RICH_OLIVINE_BASALT = BLOCKS.registerWithItem(Constant.Block.RICH_OLIVINE_BASALT, new Block(BlockBehaviour.Properties.ofFullCopy(OLIVINE_BASALT))); - // CHEESE BLOCK - public static final Block MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.MOON_CHEESE_WHEEL, new MoonCheeseBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY))); - public static final Block CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.CANDLE, BlockBehaviour.Properties.ofFullCopy(MOON_CHEESE_WHEEL).lightLevel(litBlockEmission(3)))); - public static final Block WHITE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.WHITE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.WHITE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block ORANGE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.ORANGE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.ORANGE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block MAGENTA_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.MAGENTA_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.MAGENTA_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block LIGHT_BLUE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.LIGHT_BLUE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.LIGHT_BLUE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block YELLOW_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.YELLOW_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.YELLOW_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block LIME_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.LIME_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.LIME_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block PINK_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.PINK_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.PINK_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block GRAY_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.GRAY_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.GRAY_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block LIGHT_GRAY_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.LIGHT_GRAY_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.LIGHT_GRAY_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block CYAN_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.CYAN_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.CYAN_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block PURPLE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.PURPLE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.PURPLE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block BLUE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.BLUE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.BLUE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block BROWN_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.BROWN_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.BROWN_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block GREEN_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.GREEN_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.GREEN_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block RED_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.RED_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.RED_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); - public static final Block BLACK_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.BLACK_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseBlock(Blocks.BLACK_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + // CHEESE BLOCKS + public static final Block MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.MOON_CHEESE_WHEEL, new MoonCheeseWheel(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY))); + public static final Block CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.CANDLE, BlockBehaviour.Properties.ofFullCopy(MOON_CHEESE_WHEEL).lightLevel(litBlockEmission(3)))); + public static final Block WHITE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.WHITE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.WHITE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block ORANGE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.ORANGE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.ORANGE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block MAGENTA_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.MAGENTA_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.MAGENTA_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block LIGHT_BLUE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.LIGHT_BLUE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.LIGHT_BLUE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block YELLOW_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.YELLOW_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.YELLOW_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block LIME_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.LIME_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.LIME_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block PINK_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.PINK_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.PINK_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block GRAY_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.GRAY_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.GRAY_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block LIGHT_GRAY_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.LIGHT_GRAY_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.LIGHT_GRAY_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block CYAN_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.CYAN_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.CYAN_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block PURPLE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.PURPLE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.PURPLE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block BLUE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.BLUE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.BLUE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block BROWN_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.BROWN_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.BROWN_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block GREEN_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.GREEN_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.GREEN_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block RED_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.RED_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.RED_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); + public static final Block BLACK_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.BLACK_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.BLACK_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); // COMPACT MINERAL BLOCKS public static final Block SILICON_BLOCK = BLOCKS.register(Constant.Block.SILICON_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); diff --git a/src/main/java/dev/galacticraft/mod/content/block/special/CandleMoonCheeseBlock.java b/src/main/java/dev/galacticraft/mod/content/block/special/CandleMoonCheeseWheel.java similarity index 94% rename from src/main/java/dev/galacticraft/mod/content/block/special/CandleMoonCheeseBlock.java rename to src/main/java/dev/galacticraft/mod/content/block/special/CandleMoonCheeseWheel.java index 04d9c1abc..840dbf43d 100644 --- a/src/main/java/dev/galacticraft/mod/content/block/special/CandleMoonCheeseBlock.java +++ b/src/main/java/dev/galacticraft/mod/content/block/special/CandleMoonCheeseWheel.java @@ -56,21 +56,21 @@ import java.util.Map; -public class CandleMoonCheeseBlock extends AbstractCandleBlock { - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( - Block.CODEC.fieldOf("candle").forGetter(candleMoonCheeseBlock -> candleMoonCheeseBlock.candle), +public class CandleMoonCheeseWheel extends AbstractCandleBlock { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( + Block.CODEC.fieldOf("candle").forGetter(candleMoonCheeseWheel -> candleMoonCheeseWheel.candle), propertiesCodec() - ).apply(instance, CandleMoonCheeseBlock::new)); + ).apply(instance, CandleMoonCheeseWheel::new)); public static final BooleanProperty LIT = AbstractCandleBlock.LIT; protected static final VoxelShape CAKE_SHAPE = Block.box(1.0, 0.0, 1.0, 15.0, 8.0, 15.0); protected static final VoxelShape CANDLE_SHAPE = Block.box(7.0, 8.0, 7.0, 9.0, 14.0, 9.0); protected static final VoxelShape SHAPE = Shapes.or(CAKE_SHAPE, CANDLE_SHAPE); - private static final Map BY_CANDLE = Maps.newHashMap(); + private static final Map BY_CANDLE = Maps.newHashMap(); private static final Iterable PARTICLE_OFFSETS = ImmutableList.of(new Vec3(0.5, 1.0, 0.5)); private final Block candle; - public CandleMoonCheeseBlock(Block block, BlockBehaviour.Properties properties) { + public CandleMoonCheeseWheel(Block block, BlockBehaviour.Properties properties) { super(properties); this.registerDefaultState(this.stateDefinition.any().setValue(LIT, false)); this.candle = block; @@ -107,7 +107,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev @Override protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit) { - var interactionResult = MoonCheeseBlock.eat(level, pos, GCBlocks.MOON_CHEESE_WHEEL.defaultBlockState(), player); + var interactionResult = MoonCheeseWheel.eat(level, pos, GCBlocks.MOON_CHEESE_WHEEL.defaultBlockState(), player); if (interactionResult.consumesAction()) { dropResources(state, level, pos); diff --git a/src/main/java/dev/galacticraft/mod/content/block/special/MoonCheeseBlock.java b/src/main/java/dev/galacticraft/mod/content/block/special/MoonCheeseWheel.java similarity index 95% rename from src/main/java/dev/galacticraft/mod/content/block/special/MoonCheeseBlock.java rename to src/main/java/dev/galacticraft/mod/content/block/special/MoonCheeseWheel.java index ea025d2c5..4db4957eb 100644 --- a/src/main/java/dev/galacticraft/mod/content/block/special/MoonCheeseBlock.java +++ b/src/main/java/dev/galacticraft/mod/content/block/special/MoonCheeseWheel.java @@ -43,8 +43,8 @@ import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; -public class MoonCheeseBlock extends CakeBlock { - public MoonCheeseBlock(BlockBehaviour.Properties properties) { +public class MoonCheeseWheel extends CakeBlock { + public MoonCheeseWheel(BlockBehaviour.Properties properties) { super(properties); } @@ -69,7 +69,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev if (stack.is(ItemTags.CANDLES) && state.getValue(BITES) == 0 && Block.byItem(item) instanceof CandleBlock candleBlock) { stack.consume(1, player); level.playSound(null, pos, SoundEvents.CAKE_ADD_CANDLE, SoundSource.BLOCKS, 1.0F, 1.0F); - level.setBlockAndUpdate(pos, CandleMoonCheeseBlock.byCandle(candleBlock)); + level.setBlockAndUpdate(pos, CandleMoonCheeseWheel.byCandle(candleBlock)); level.gameEvent(player, GameEvent.BLOCK_CHANGE, pos); player.awardStat(Stats.ITEM_USED.get(item)); return ItemInteractionResult.SUCCESS; diff --git a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block.json b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel.json similarity index 66% rename from src/main/resources/assets/galacticraft/models/block/moon_cheese_block.json rename to src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel.json index 99a9e9fb3..98e6e7b41 100644 --- a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block.json +++ b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel.json @@ -1,9 +1,9 @@ { "textures": { - "particle": "galacticraft:block/moon_cheese_block_side", - "bottom": "galacticraft:block/moon_cheese_block_bottom", - "top": "galacticraft:block/moon_cheese_block_top", - "side": "galacticraft:block/moon_cheese_block_side" + "particle": "galacticraft:block/moon_cheese_wheel_side", + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "top": "galacticraft:block/moon_cheese_wheel_top", + "side": "galacticraft:block/moon_cheese_wheel_side" }, "elements": [ { "from": [ 1, 0, 1 ], diff --git a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice1.json b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice1.json similarity index 60% rename from src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice1.json rename to src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice1.json index 673aa7364..f62dd0a0a 100644 --- a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice1.json +++ b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice1.json @@ -1,10 +1,10 @@ { "textures": { - "particle": "galacticraft:block/moon_cheese_block_side", - "bottom": "galacticraft:block/moon_cheese_block_bottom", - "top": "galacticraft:block/moon_cheese_block_top", - "side": "galacticraft:block/moon_cheese_block_side", - "inside": "galacticraft:block/moon_cheese_block_inner" + "particle": "galacticraft:block/moon_cheese_wheel_side", + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "top": "galacticraft:block/moon_cheese_wheel_top", + "side": "galacticraft:block/moon_cheese_wheel_side", + "inside": "galacticraft:block/moon_cheese_wheel_inner" }, "elements": [ { "from": [ 3, 0, 1 ], diff --git a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice2.json b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice2.json similarity index 60% rename from src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice2.json rename to src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice2.json index ec76a4013..b628f7d4a 100644 --- a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice2.json +++ b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice2.json @@ -1,10 +1,10 @@ { "textures": { - "particle": "galacticraft:block/moon_cheese_block_side", - "bottom": "galacticraft:block/moon_cheese_block_bottom", - "top": "galacticraft:block/moon_cheese_block_top", - "side": "galacticraft:block/moon_cheese_block_side", - "inside": "galacticraft:block/moon_cheese_block_inner" + "particle": "galacticraft:block/moon_cheese_wheel_side", + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "top": "galacticraft:block/moon_cheese_wheel_top", + "side": "galacticraft:block/moon_cheese_wheel_side", + "inside": "galacticraft:block/moon_cheese_wheel_inner" }, "elements": [ { "from": [ 5, 0, 1 ], diff --git a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice3.json b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice3.json similarity index 60% rename from src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice3.json rename to src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice3.json index 01147a9ba..56b90e4f0 100644 --- a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice3.json +++ b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice3.json @@ -1,10 +1,10 @@ { "textures": { - "particle": "galacticraft:block/moon_cheese_block_side", - "bottom": "galacticraft:block/moon_cheese_block_bottom", - "top": "galacticraft:block/moon_cheese_block_top", - "side": "galacticraft:block/moon_cheese_block_side", - "inside": "galacticraft:block/moon_cheese_block_inner" + "particle": "galacticraft:block/moon_cheese_wheel_side", + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "top": "galacticraft:block/moon_cheese_wheel_top", + "side": "galacticraft:block/moon_cheese_wheel_side", + "inside": "galacticraft:block/moon_cheese_wheel_inner" }, "elements": [ { "from": [ 7, 0, 1 ], diff --git a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice4.json b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice4.json similarity index 60% rename from src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice4.json rename to src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice4.json index 74d2d7bb3..89f57d1e0 100644 --- a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice4.json +++ b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice4.json @@ -1,10 +1,10 @@ { "textures": { - "particle": "galacticraft:block/moon_cheese_block_side", - "bottom": "galacticraft:block/moon_cheese_block_bottom", - "top": "galacticraft:block/moon_cheese_block_top", - "side": "galacticraft:block/moon_cheese_block_side", - "inside": "galacticraft:block/moon_cheese_block_inner" + "particle": "galacticraft:block/moon_cheese_wheel_side", + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "top": "galacticraft:block/moon_cheese_wheel_top", + "side": "galacticraft:block/moon_cheese_wheel_side", + "inside": "galacticraft:block/moon_cheese_wheel_inner" }, "elements": [ { "from": [ 9, 0, 1 ], diff --git a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice5.json b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice5.json similarity index 60% rename from src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice5.json rename to src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice5.json index 770b25b56..851995860 100644 --- a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice5.json +++ b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice5.json @@ -1,10 +1,10 @@ { "textures": { - "particle": "galacticraft:block/moon_cheese_block_side", - "bottom": "galacticraft:block/moon_cheese_block_bottom", - "top": "galacticraft:block/moon_cheese_block_top", - "side": "galacticraft:block/moon_cheese_block_side", - "inside": "galacticraft:block/moon_cheese_block_inner" + "particle": "galacticraft:block/moon_cheese_wheel_side", + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "top": "galacticraft:block/moon_cheese_wheel_top", + "side": "galacticraft:block/moon_cheese_wheel_side", + "inside": "galacticraft:block/moon_cheese_wheel_inner" }, "elements": [ { "from": [ 11, 0, 1 ], diff --git a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice6.json b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice6.json similarity index 60% rename from src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice6.json rename to src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice6.json index 5607dabcd..8964f3948 100644 --- a/src/main/resources/assets/galacticraft/models/block/moon_cheese_block_slice6.json +++ b/src/main/resources/assets/galacticraft/models/block/moon_cheese_wheel_slice6.json @@ -1,10 +1,10 @@ { "textures": { - "particle": "galacticraft:block/moon_cheese_block_side", - "bottom": "galacticraft:block/moon_cheese_block_bottom", - "top": "galacticraft:block/moon_cheese_block_top", - "side": "galacticraft:block/moon_cheese_block_side", - "inside": "galacticraft:block/moon_cheese_block_inner" + "particle": "galacticraft:block/moon_cheese_wheel_side", + "bottom": "galacticraft:block/moon_cheese_wheel_bottom", + "top": "galacticraft:block/moon_cheese_wheel_top", + "side": "galacticraft:block/moon_cheese_wheel_side", + "inside": "galacticraft:block/moon_cheese_wheel_inner" }, "elements": [ { "from": [ 13, 0, 1 ], diff --git a/src/main/resources/assets/galacticraft/textures/block/moon_cheese_block_bottom.png b/src/main/resources/assets/galacticraft/textures/block/moon_cheese_wheel_bottom.png similarity index 100% rename from src/main/resources/assets/galacticraft/textures/block/moon_cheese_block_bottom.png rename to src/main/resources/assets/galacticraft/textures/block/moon_cheese_wheel_bottom.png diff --git a/src/main/resources/assets/galacticraft/textures/block/moon_cheese_block_inner.png b/src/main/resources/assets/galacticraft/textures/block/moon_cheese_wheel_inner.png similarity index 100% rename from src/main/resources/assets/galacticraft/textures/block/moon_cheese_block_inner.png rename to src/main/resources/assets/galacticraft/textures/block/moon_cheese_wheel_inner.png diff --git a/src/main/resources/assets/galacticraft/textures/block/moon_cheese_block_side.png b/src/main/resources/assets/galacticraft/textures/block/moon_cheese_wheel_side.png similarity index 100% rename from src/main/resources/assets/galacticraft/textures/block/moon_cheese_block_side.png rename to src/main/resources/assets/galacticraft/textures/block/moon_cheese_wheel_side.png diff --git a/src/main/resources/assets/galacticraft/textures/block/moon_cheese_block_top.png b/src/main/resources/assets/galacticraft/textures/block/moon_cheese_wheel_top.png similarity index 100% rename from src/main/resources/assets/galacticraft/textures/block/moon_cheese_block_top.png rename to src/main/resources/assets/galacticraft/textures/block/moon_cheese_wheel_top.png diff --git a/src/main/resources/assets/galacticraft/textures/item/moon_cheese_block.png b/src/main/resources/assets/galacticraft/textures/item/moon_cheese_wheel.png similarity index 100% rename from src/main/resources/assets/galacticraft/textures/item/moon_cheese_block.png rename to src/main/resources/assets/galacticraft/textures/item/moon_cheese_wheel.png