From f00ac39b79612f30c8062a9149906e4230cda544 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 30 Dec 2024 22:32:35 +0100 Subject: [PATCH] Port to 1.21.4 and more datagen - Polymer mode is currently still broken --- build.gradle | 29 +-- gradle.properties | 14 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../0809c40fc61808c03cb356ec122a9518709ab04f | 59 ------- .../1fbe32a694326cbc22446c7b535df1f442a946d8 | 1 - .../7df76d5247a36d2b525b52d21f61ffe0e75fec0a | 26 --- .../ef95184f2e259c8d7b29584bde1d7a9631cc116f | 21 --- .../rocks/blockstates/acacia_stick.json | 58 ++++++ .../rocks/blockstates/andesite_rock.json | 76 ++++++++ .../rocks/blockstates/bamboo_stick.json | 58 ++++++ .../assets/rocks/blockstates/birch_stick.json | 58 ++++++ .../rocks/blockstates/cherry_stick.json | 58 ++++++ .../rocks/blockstates/crimson_stick.json | 58 ++++++ .../rocks/blockstates/dark_oak_stick.json | 58 ++++++ .../rocks/blockstates/diorite_rock.json | 76 ++++++++ .../rocks/blockstates/end_stone_rock.json | 76 ++++++++ .../rocks/blockstates/granite_rock.json | 76 ++++++++ .../assets/rocks/blockstates/gravel_rock.json | 76 ++++++++ .../assets/rocks/blockstates/ice_rock.json | 76 ++++++++ .../rocks/blockstates/jungle_stick.json | 58 ++++++ .../rocks/blockstates/mangrove_stick.json | 58 ++++++ .../rocks/blockstates/netherrack_rock.json | 76 ++++++++ .../assets/rocks/blockstates/oak_stick.json | 58 ++++++ .../rocks/blockstates/pale_oak_stick.json | 58 ++++++ .../rocks/blockstates/red_sand_rock.json | 76 ++++++++ .../assets/rocks/blockstates/rock.json | 76 ++++++++ .../assets/rocks/blockstates/sand_rock.json | 76 ++++++++ .../rocks/blockstates/soul_soil_rock.json | 76 ++++++++ .../rocks/blockstates/spruce_stick.json | 58 ++++++ .../rocks/blockstates/warped_stick.json | 58 ++++++ .../assets/rocks/items/acacia_stick.json | 6 + .../assets/rocks/items/andesite_rock.json | 6 + .../assets/rocks/items/andesite_splitter.json | 6 + .../assets/rocks/items/bamboo_stick.json | 6 + .../assets/rocks/items/birch_stick.json | 6 + .../assets/rocks/items/cherry_stick.json | 6 + .../rocks/items/cobblestone_splitter.json | 6 + .../assets/rocks/items/crimson_stick.json | 6 + .../assets/rocks/items/dark_oak_stick.json | 6 + .../assets/rocks/items/diorite_rock.json | 6 + .../assets/rocks/items/diorite_splitter.json | 6 + .../assets/rocks/items/end_stone_rock.json | 6 + .../rocks/items/end_stone_splitter.json | 6 + .../generated/assets/rocks/items/geyser.json | 6 + .../assets/rocks/items/granite_rock.json | 6 + .../assets/rocks/items/granite_splitter.json | 6 + .../assets/rocks/items/gravel_rock.json | 6 + .../assets/rocks/items/ice_rock.json | 6 + .../assets/rocks/items/ice_splitter.json | 6 + .../assets/rocks/items/jungle_stick.json | 6 + .../assets/rocks/items/mangrove_stick.json | 6 + .../assets/rocks/items/nether_geyser.json | 6 + .../assets/rocks/items/netherrack_rock.json | 6 + .../rocks/items/netherrack_splitter.json | 6 + .../assets/rocks/items/oak_stick.json | 6 + .../assets/rocks/items/pale_oak_stick.json | 6 + .../assets/rocks/items/pinecone.json | 6 + .../assets/rocks/items/red_sand_rock.json | 6 + .../rocks/items/red_sandstone_splitter.json | 6 + .../generated/assets/rocks/items/rock.json | 6 + .../assets/rocks/items/sand_rock.json | 6 + .../rocks/items/sandstone_splitter.json | 6 + .../assets/rocks/items/seashell.json | 6 + .../assets/rocks/items/soul_soil_rock.json | 6 + .../rocks/items/soul_soil_splitter.json | 6 + .../assets/rocks/items/spruce_stick.json | 6 + .../assets/rocks/items/starfish.json | 34 ++++ .../assets/rocks/items/warped_stick.json | 6 + .../generated/assets/rocks/lang/de_de.json | 87 +++++++++ .../generated/assets/rocks/lang/en_us.json | 87 +++++++++ .../models/block/acacia_stick_large.json | 6 + .../models/block/acacia_stick_medium.json | 6 + .../models/block/acacia_stick_small.json | 6 + .../models/block/andesite_rock_large.json | 6 + .../models/block/andesite_rock_medium.json | 6 + .../models/block/andesite_rock_small.json | 6 + .../models/block/andesite_rock_tiny.json | 6 + .../models/block/bamboo_stick_large.json | 6 + .../models/block/bamboo_stick_medium.json | 6 + .../models/block/bamboo_stick_small.json | 6 + .../rocks/models/block/birch_stick_large.json | 6 + .../models/block/birch_stick_medium.json | 6 + .../rocks/models/block/birch_stick_small.json | 6 + .../models/block/cherry_stick_large.json | 6 + .../models/block/cherry_stick_medium.json | 6 + .../models/block/cherry_stick_small.json | 6 + .../models/block/crimson_stick_large.json | 6 + .../models/block/crimson_stick_medium.json | 6 + .../models/block/crimson_stick_small.json | 6 + .../models/block/dark_oak_stick_large.json | 6 + .../models/block/dark_oak_stick_medium.json | 6 + .../models/block/dark_oak_stick_small.json | 6 + .../models/block/diorite_rock_large.json | 6 + .../models/block/diorite_rock_medium.json | 6 + .../models/block/diorite_rock_small.json | 6 + .../rocks/models/block/diorite_rock_tiny.json | 6 + .../models/block/end_stone_rock_large.json | 6 + .../models/block/end_stone_rock_medium.json | 6 + .../models/block/end_stone_rock_small.json | 6 + .../models/block/end_stone_rock_tiny.json | 6 + .../models/block/granite_rock_large.json | 6 + .../models/block/granite_rock_medium.json | 6 + .../models/block/granite_rock_small.json | 6 + .../rocks/models/block/granite_rock_tiny.json | 6 + .../rocks/models/block/gravel_rock_large.json | 6 + .../models/block/gravel_rock_medium.json | 6 + .../rocks/models/block/gravel_rock_small.json | 6 + .../rocks/models/block/gravel_rock_tiny.json | 6 + .../rocks/models/block/ice_rock_large.json | 6 + .../rocks/models/block/ice_rock_medium.json | 6 + .../rocks/models/block/ice_rock_small.json | 6 + .../rocks/models/block/ice_rock_tiny.json | 6 + .../models/block/jungle_stick_large.json | 6 + .../models/block/jungle_stick_medium.json | 6 + .../models/block/jungle_stick_small.json | 6 + .../models/block/mangrove_stick_large.json | 6 + .../models/block/mangrove_stick_medium.json | 6 + .../models/block/mangrove_stick_small.json | 6 + .../models/block/netherrack_rock_large.json | 6 + .../models/block/netherrack_rock_medium.json | 6 + .../models/block/netherrack_rock_small.json | 6 + .../models/block/netherrack_rock_tiny.json | 6 + .../rocks/models/block/oak_stick_large.json | 6 + .../rocks/models/block/oak_stick_medium.json | 6 + .../rocks/models/block/oak_stick_small.json | 6 + .../models/block/pale_oak_stick_large.json | 6 + .../models/block/pale_oak_stick_medium.json | 6 + .../models/block/pale_oak_stick_small.json | 6 + .../models/block/red_sand_rock_large.json | 6 + .../models/block/red_sand_rock_medium.json | 6 + .../models/block/red_sand_rock_small.json | 6 + .../models/block/red_sand_rock_tiny.json | 6 + .../assets/rocks/models/block/rock_large.json | 6 + .../rocks/models/block/rock_medium.json | 6 + .../assets/rocks/models/block/rock_small.json | 6 + .../assets/rocks/models/block/rock_tiny.json | 6 + .../rocks/models/block/sand_rock_large.json | 6 + .../rocks/models/block/sand_rock_medium.json | 6 + .../rocks/models/block/sand_rock_small.json | 6 + .../rocks/models/block/sand_rock_tiny.json | 6 + .../models/block/soul_soil_rock_large.json | 6 + .../models/block/soul_soil_rock_medium.json | 6 + .../models/block/soul_soil_rock_small.json | 6 + .../models/block/soul_soil_rock_tiny.json | 6 + .../models/block/spruce_stick_large.json | 6 + .../models/block/spruce_stick_medium.json | 6 + .../models/block/spruce_stick_small.json | 6 + .../models/block/warped_stick_large.json | 6 + .../models/block/warped_stick_medium.json | 6 + .../models/block/warped_stick_small.json | 6 + .../rocks/models/item/acacia_stick.json | 6 + .../rocks/models/item/andesite_rock.json | 6 + .../rocks/models/item/andesite_splitter.json | 6 + .../rocks/models/item/bamboo_stick.json | 6 + .../assets/rocks/models/item/birch_stick.json | 6 + .../rocks/models/item/cherry_stick.json | 6 + .../models/item/cobblestone_splitter.json | 6 + .../rocks/models/item/crimson_stick.json | 6 + .../rocks/models/item/dark_oak_stick.json | 6 + .../rocks/models/item/diorite_rock.json | 6 + .../rocks/models/item/diorite_splitter.json | 6 + .../rocks/models/item/end_stone_rock.json | 6 + .../rocks/models/item/end_stone_splitter.json | 6 + .../rocks/models/item/granite_rock.json | 6 + .../rocks/models/item/granite_splitter.json | 6 + .../assets/rocks/models/item/gravel_rock.json | 6 + .../assets/rocks/models/item/ice_rock.json | 6 + .../rocks/models/item/ice_splitter.json | 6 + .../rocks/models/item/jungle_stick.json | 6 + .../rocks/models/item/mangrove_stick.json | 6 + .../rocks/models/item/netherrack_rock.json | 6 + .../models/item/netherrack_splitter.json | 6 + .../assets/rocks/models/item/oak_stick.json | 6 + .../rocks/models/item/pale_oak_stick.json | 6 + .../rocks/models/item/red_sand_rock.json | 6 + .../models/item/red_sandstone_splitter.json | 6 + .../assets/rocks/models/item/rock.json | 6 + .../assets/rocks/models/item/sand_rock.json | 6 + .../rocks/models/item/sandstone_splitter.json | 6 + .../rocks/models/item/soul_soil_rock.json | 6 + .../rocks/models/item/soul_soil_splitter.json | 6 + .../rocks/models/item/spruce_stick.json | 6 + .../rocks/models/item/warped_stick.json | 6 + .../loot_table/blocks/pale_oak_stick.json | 41 +++++ .../rocks/recipe/andesite_from_splitter.json | 16 +- .../rocks/recipe/diorite_from_splitter.json | 16 +- .../rocks/recipe/end_stone_from_splitter.json | 16 +- .../rocks/recipe/granite_from_splitter.json | 16 +- .../data/rocks/recipe/ice_from_splitter.json | 16 +- .../recipe/netherrack_from_splitter.json | 16 +- .../recipe/red_sandstone_from_splitter.json | 16 +- .../rocks/recipe/sandstone_from_splitter.json | 16 +- .../rocks/recipe/soul_soil_from_splitter.json | 16 +- .../rocks/recipe/stone_from_splitter.json | 16 +- .../motschen/rocks/RocksClient.java | 10 +- .../motschen/rocks/RocksDataGen.java | 15 +- .../motschen/rocks/RocksMain.java | 35 ++-- .../motschen/rocks/block/NetherGeyser.java | 9 +- .../motschen/rocks/block/OverworldGeyser.java | 9 +- .../motschen/rocks/block/Pinecone.java | 20 ++- .../motschen/rocks/block/Rock.java | 19 +- .../motschen/rocks/block/Seashell.java | 20 ++- .../motschen/rocks/block/Starfish.java | 26 +-- .../motschen/rocks/block/Stick.java | 23 ++- .../block/blockentity/BlockEntityInit.java | 5 +- .../blockentity/NetherGeyserBlockEntity.java | 7 +- .../block/polymer/NetherGeyserPolymer.java | 20 ++- .../block/polymer/OverworldGeyserPolymer.java | 19 +- .../rocks/block/polymer/PineconePolymer.java | 19 +- .../rocks/block/polymer/RockPolymer.java | 19 +- .../rocks/block/polymer/SeashellPolymer.java | 19 +- .../rocks/block/polymer/StarfishPolymer.java | 19 +- .../rocks/block/polymer/StickPolymer.java | 19 +- .../model/ItemDisplayNetherGeyserModel.java | 3 +- .../ItemDisplayOverworldGeyserModel.java | 3 +- .../model/ItemDisplayPineconeModel.java | 3 +- .../polymer/model/ItemDisplayRockModel.java | 3 +- .../model/ItemDisplaySeashellModel.java | 7 +- .../model/ItemDisplayStarfishModel.java | 13 +- .../polymer/model/ItemDisplayStickModel.java | 7 +- .../motschen/rocks/config/RocksConfig.java | 2 +- .../motschen/rocks/datagen/Language.java | 166 ++++++++++++++++++ .../rocks/datagen/LanguageHelper.java | 29 +++ .../motschen/rocks/datagen/LootTables.java | 2 +- .../motschen/rocks/datagen/Models.java | 126 +++++++++++++ .../motschen/rocks/datagen/Recipes.java | 33 +++- .../item/polymer/StarfishItemPolymer.java | 31 ++-- .../motschen/rocks/util/ParticleUtil.java | 2 +- .../motschen/rocks/util/RegistryUtil.java | 8 +- .../motschen/rocks/util/RockType.java | 8 + .../motschen/rocks/util/StickType.java | 15 ++ .../motschen/rocks/util/polymer/PolyUtil.java | 29 +-- .../rocks/blockstates/acacia_stick.json | 22 --- .../rocks/blockstates/andesite_rock.json | 28 --- .../rocks/blockstates/bamboo_stick.json | 22 --- .../assets/rocks/blockstates/birch_stick.json | 22 --- .../rocks/blockstates/cherry_stick.json | 22 --- .../rocks/blockstates/crimson_stick.json | 22 --- .../rocks/blockstates/dark_oak_stick.json | 22 --- .../rocks/blockstates/diorite_rock.json | 28 --- .../rocks/blockstates/end_stone_rock.json | 28 --- .../rocks/blockstates/granite_rock.json | 28 --- .../assets/rocks/blockstates/gravel_rock.json | 28 --- .../assets/rocks/blockstates/ice_rock.json | 28 --- .../rocks/blockstates/jungle_stick.json | 22 --- .../rocks/blockstates/mangrove_stick.json | 22 --- .../rocks/blockstates/netherrack_rock.json | 28 --- .../assets/rocks/blockstates/oak_stick.json | 22 --- .../rocks/blockstates/red_sand_rock.json | 28 --- .../assets/rocks/blockstates/rock.json | 28 --- .../assets/rocks/blockstates/sand_rock.json | 28 --- .../rocks/blockstates/soul_soil_rock.json | 28 --- .../rocks/blockstates/spruce_stick.json | 22 --- .../rocks/blockstates/warped_stick.json | 22 --- .../resources/assets/rocks/lang/de_de.json | 58 ------ .../resources/assets/rocks/lang/en_us.json | 64 ------- .../models/block/large_acacia_stick.json | 7 - .../models/block/large_andesite_rock.json | 7 - .../models/block/large_bamboo_stick.json | 7 - .../rocks/models/block/large_birch_stick.json | 7 - .../models/block/large_cherry_stick.json | 7 - .../models/block/large_crimson_stick.json | 7 - .../models/block/large_dark_oak_stick.json | 7 - .../models/block/large_diorite_rock.json | 7 - .../models/block/large_end_stone_rock.json | 7 - .../models/block/large_granite_rock.json | 7 - .../rocks/models/block/large_gravel_rock.json | 7 - .../rocks/models/block/large_ice_rock.json | 7 - .../models/block/large_jungle_stick.json | 7 - .../models/block/large_mangrove_stick.json | 7 - .../models/block/large_netherrack_rock.json | 7 - .../models/block/large_red_sand_rock.json | 7 - .../assets/rocks/models/block/large_rock.json | 2 +- .../rocks/models/block/large_sand_rock.json | 7 - .../models/block/large_soul_soil_rock.json | 7 - .../models/block/large_spruce_stick.json | 7 - ...{large_oak_stick.json => large_stick.json} | 0 .../models/block/large_warped_stick.json | 7 - .../models/block/medium_acacia_stick.json | 7 - .../models/block/medium_andesite_rock.json | 7 - .../models/block/medium_bamboo_stick.json | 7 - .../models/block/medium_birch_stick.json | 7 - .../models/block/medium_cherry_stick.json | 7 - .../models/block/medium_crimson_stick.json | 7 - .../models/block/medium_dark_oak_stick.json | 7 - .../models/block/medium_diorite_rock.json | 7 - .../models/block/medium_end_stone_rock.json | 7 - .../models/block/medium_granite_rock.json | 7 - .../models/block/medium_gravel_rock.json | 7 - .../rocks/models/block/medium_ice_rock.json | 7 - .../models/block/medium_jungle_stick.json | 7 - .../models/block/medium_mangrove_stick.json | 7 - .../models/block/medium_netherrack_rock.json | 7 - .../models/block/medium_red_sand_rock.json | 7 - .../rocks/models/block/medium_rock.json | 2 +- .../rocks/models/block/medium_sand_rock.json | 7 - .../models/block/medium_soul_soil_rock.json | 7 - .../models/block/medium_spruce_stick.json | 7 - ...edium_oak_stick.json => medium_stick.json} | 0 .../models/block/medium_warped_stick.json | 7 - .../models/block/small_acacia_stick.json | 7 - .../models/block/small_andesite_rock.json | 7 - .../models/block/small_bamboo_stick.json | 7 - .../rocks/models/block/small_birch_stick.json | 7 - .../models/block/small_cherry_stick.json | 7 - .../models/block/small_crimson_stick.json | 7 - .../models/block/small_dark_oak_stick.json | 7 - .../models/block/small_diorite_rock.json | 7 - .../models/block/small_end_stone_rock.json | 7 - .../models/block/small_granite_rock.json | 7 - .../rocks/models/block/small_gravel_rock.json | 7 - .../rocks/models/block/small_ice_rock.json | 7 - .../models/block/small_jungle_stick.json | 7 - .../models/block/small_mangrove_stick.json | 7 - .../models/block/small_netherrack_rock.json | 7 - .../models/block/small_red_sand_rock.json | 7 - .../assets/rocks/models/block/small_rock.json | 2 +- .../rocks/models/block/small_sand_rock.json | 7 - .../models/block/small_soul_soil_rock.json | 7 - .../models/block/small_spruce_stick.json | 7 - ...{small_oak_stick.json => small_stick.json} | 0 .../models/block/small_warped_stick.json | 7 - .../models/block/tiny_andesite_rock.json | 7 - .../rocks/models/block/tiny_diorite_rock.json | 7 - .../models/block/tiny_end_stone_rock.json | 7 - .../rocks/models/block/tiny_granite_rock.json | 7 - .../rocks/models/block/tiny_gravel_rock.json | 7 - .../rocks/models/block/tiny_ice_rock.json | 7 - .../models/block/tiny_netherrack_rock.json | 7 - .../models/block/tiny_red_sand_rock.json | 7 - .../assets/rocks/models/block/tiny_rock.json | 2 +- .../rocks/models/block/tiny_sand_rock.json | 7 - .../models/block/tiny_soul_soil_rock.json | 7 - .../rocks/models/item/acacia_stick.json | 7 - .../rocks/models/item/andesite_rock.json | 3 - .../rocks/models/item/andesite_splitter.json | 7 - .../rocks/models/item/bamboo_stick.json | 7 - .../assets/rocks/models/item/birch_stick.json | 7 - .../rocks/models/item/cherry_stick.json | 7 - .../rocks/models/item/crimson_stick.json | 7 - .../rocks/models/item/dark_oak_stick.json | 7 - .../rocks/models/item/diorite_rock.json | 3 - .../rocks/models/item/diorite_splitter.json | 7 - .../rocks/models/item/end_stone_rock.json | 3 - .../rocks/models/item/end_stone_splitter.json | 7 - .../rocks/models/item/granite_rock.json | 3 - .../rocks/models/item/granite_splitter.json | 7 - .../assets/rocks/models/item/gravel_rock.json | 3 - .../assets/rocks/models/item/ice_rock.json | 3 - .../rocks/models/item/ice_splitter.json | 7 - .../rocks/models/item/jungle_stick.json | 7 - .../rocks/models/item/mangrove_stick.json | 7 - .../rocks/models/item/netherrack_rock.json | 3 - .../models/item/netherrack_splitter.json | 7 - .../rocks/models/item/red_sand_rock.json | 3 - .../models/item/red_sandstone_splitter.json | 7 - .../models/item/{rock.json => rock_base.json} | 0 .../assets/rocks/models/item/sand_rock.json | 3 - .../rocks/models/item/sandstone_splitter.json | 7 - .../rocks/models/item/soul_soil_rock.json | 3 - .../rocks/models/item/soul_soil_splitter.json | 7 - ...stone_splitter.json => splitter_base.json} | 2 +- .../rocks/models/item/spruce_stick.json | 7 - .../item/{oak_stick.json => stick_base.json} | 0 .../rocks/models/item/warped_stick.json | 7 - 365 files changed, 3364 insertions(+), 1786 deletions(-) delete mode 100644 src/main/generated/.cache/0809c40fc61808c03cb356ec122a9518709ab04f delete mode 100644 src/main/generated/.cache/1fbe32a694326cbc22446c7b535df1f442a946d8 delete mode 100644 src/main/generated/.cache/7df76d5247a36d2b525b52d21f61ffe0e75fec0a delete mode 100644 src/main/generated/.cache/ef95184f2e259c8d7b29584bde1d7a9631cc116f create mode 100644 src/main/generated/assets/rocks/blockstates/acacia_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/andesite_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/bamboo_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/birch_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/cherry_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/crimson_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/dark_oak_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/diorite_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/end_stone_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/granite_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/gravel_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/ice_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/jungle_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/mangrove_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/netherrack_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/oak_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/pale_oak_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/red_sand_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/sand_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/soul_soil_rock.json create mode 100644 src/main/generated/assets/rocks/blockstates/spruce_stick.json create mode 100644 src/main/generated/assets/rocks/blockstates/warped_stick.json create mode 100644 src/main/generated/assets/rocks/items/acacia_stick.json create mode 100644 src/main/generated/assets/rocks/items/andesite_rock.json create mode 100644 src/main/generated/assets/rocks/items/andesite_splitter.json create mode 100644 src/main/generated/assets/rocks/items/bamboo_stick.json create mode 100644 src/main/generated/assets/rocks/items/birch_stick.json create mode 100644 src/main/generated/assets/rocks/items/cherry_stick.json create mode 100644 src/main/generated/assets/rocks/items/cobblestone_splitter.json create mode 100644 src/main/generated/assets/rocks/items/crimson_stick.json create mode 100644 src/main/generated/assets/rocks/items/dark_oak_stick.json create mode 100644 src/main/generated/assets/rocks/items/diorite_rock.json create mode 100644 src/main/generated/assets/rocks/items/diorite_splitter.json create mode 100644 src/main/generated/assets/rocks/items/end_stone_rock.json create mode 100644 src/main/generated/assets/rocks/items/end_stone_splitter.json create mode 100644 src/main/generated/assets/rocks/items/geyser.json create mode 100644 src/main/generated/assets/rocks/items/granite_rock.json create mode 100644 src/main/generated/assets/rocks/items/granite_splitter.json create mode 100644 src/main/generated/assets/rocks/items/gravel_rock.json create mode 100644 src/main/generated/assets/rocks/items/ice_rock.json create mode 100644 src/main/generated/assets/rocks/items/ice_splitter.json create mode 100644 src/main/generated/assets/rocks/items/jungle_stick.json create mode 100644 src/main/generated/assets/rocks/items/mangrove_stick.json create mode 100644 src/main/generated/assets/rocks/items/nether_geyser.json create mode 100644 src/main/generated/assets/rocks/items/netherrack_rock.json create mode 100644 src/main/generated/assets/rocks/items/netherrack_splitter.json create mode 100644 src/main/generated/assets/rocks/items/oak_stick.json create mode 100644 src/main/generated/assets/rocks/items/pale_oak_stick.json create mode 100644 src/main/generated/assets/rocks/items/pinecone.json create mode 100644 src/main/generated/assets/rocks/items/red_sand_rock.json create mode 100644 src/main/generated/assets/rocks/items/red_sandstone_splitter.json create mode 100644 src/main/generated/assets/rocks/items/rock.json create mode 100644 src/main/generated/assets/rocks/items/sand_rock.json create mode 100644 src/main/generated/assets/rocks/items/sandstone_splitter.json create mode 100644 src/main/generated/assets/rocks/items/seashell.json create mode 100644 src/main/generated/assets/rocks/items/soul_soil_rock.json create mode 100644 src/main/generated/assets/rocks/items/soul_soil_splitter.json create mode 100644 src/main/generated/assets/rocks/items/spruce_stick.json create mode 100644 src/main/generated/assets/rocks/items/starfish.json create mode 100644 src/main/generated/assets/rocks/items/warped_stick.json create mode 100644 src/main/generated/assets/rocks/lang/de_de.json create mode 100644 src/main/generated/assets/rocks/lang/en_us.json create mode 100644 src/main/generated/assets/rocks/models/block/acacia_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/acacia_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/acacia_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/andesite_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/andesite_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/andesite_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/andesite_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/bamboo_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/bamboo_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/bamboo_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/birch_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/birch_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/birch_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/cherry_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/cherry_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/cherry_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/crimson_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/crimson_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/crimson_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/dark_oak_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/dark_oak_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/dark_oak_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/diorite_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/diorite_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/diorite_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/diorite_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/end_stone_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/end_stone_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/end_stone_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/end_stone_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/granite_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/granite_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/granite_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/granite_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/gravel_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/gravel_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/gravel_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/gravel_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/ice_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/ice_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/ice_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/ice_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/jungle_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/jungle_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/jungle_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/mangrove_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/mangrove_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/mangrove_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/netherrack_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/netherrack_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/netherrack_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/netherrack_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/oak_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/oak_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/oak_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/pale_oak_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/pale_oak_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/pale_oak_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/red_sand_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/red_sand_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/red_sand_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/red_sand_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/sand_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/sand_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/sand_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/sand_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/soul_soil_rock_large.json create mode 100644 src/main/generated/assets/rocks/models/block/soul_soil_rock_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/soul_soil_rock_small.json create mode 100644 src/main/generated/assets/rocks/models/block/soul_soil_rock_tiny.json create mode 100644 src/main/generated/assets/rocks/models/block/spruce_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/spruce_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/spruce_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/block/warped_stick_large.json create mode 100644 src/main/generated/assets/rocks/models/block/warped_stick_medium.json create mode 100644 src/main/generated/assets/rocks/models/block/warped_stick_small.json create mode 100644 src/main/generated/assets/rocks/models/item/acacia_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/andesite_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/andesite_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/bamboo_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/birch_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/cherry_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/cobblestone_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/crimson_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/dark_oak_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/diorite_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/diorite_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/end_stone_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/end_stone_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/granite_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/granite_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/gravel_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/ice_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/ice_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/jungle_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/mangrove_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/netherrack_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/netherrack_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/oak_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/pale_oak_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/red_sand_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/red_sandstone_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/rock.json create mode 100644 src/main/generated/assets/rocks/models/item/sand_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/sandstone_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/soul_soil_rock.json create mode 100644 src/main/generated/assets/rocks/models/item/soul_soil_splitter.json create mode 100644 src/main/generated/assets/rocks/models/item/spruce_stick.json create mode 100644 src/main/generated/assets/rocks/models/item/warped_stick.json create mode 100644 src/main/generated/data/rocks/loot_table/blocks/pale_oak_stick.json create mode 100644 src/main/java/eu/midnightdust/motschen/rocks/datagen/Language.java create mode 100644 src/main/java/eu/midnightdust/motschen/rocks/datagen/LanguageHelper.java create mode 100644 src/main/java/eu/midnightdust/motschen/rocks/datagen/Models.java delete mode 100755 src/main/resources/assets/rocks/blockstates/acacia_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/andesite_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/bamboo_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/birch_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/cherry_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/crimson_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/dark_oak_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/diorite_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/end_stone_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/granite_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/gravel_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/ice_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/jungle_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/mangrove_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/netherrack_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/oak_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/red_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/sand_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/soul_soil_rock.json delete mode 100755 src/main/resources/assets/rocks/blockstates/spruce_stick.json delete mode 100755 src/main/resources/assets/rocks/blockstates/warped_stick.json delete mode 100755 src/main/resources/assets/rocks/lang/de_de.json delete mode 100755 src/main/resources/assets/rocks/lang/en_us.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_acacia_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_andesite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_bamboo_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_birch_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_cherry_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_crimson_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_dark_oak_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_diorite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_end_stone_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_granite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_gravel_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_ice_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_jungle_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_mangrove_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_netherrack_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_red_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_soul_soil_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/large_spruce_stick.json rename src/main/resources/assets/rocks/models/block/{large_oak_stick.json => large_stick.json} (100%) delete mode 100755 src/main/resources/assets/rocks/models/block/large_warped_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_acacia_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_andesite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_bamboo_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_birch_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_cherry_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_crimson_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_dark_oak_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_diorite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_end_stone_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_granite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_gravel_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_ice_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_jungle_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_mangrove_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_netherrack_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_red_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_soul_soil_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/medium_spruce_stick.json rename src/main/resources/assets/rocks/models/block/{medium_oak_stick.json => medium_stick.json} (100%) delete mode 100755 src/main/resources/assets/rocks/models/block/medium_warped_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_acacia_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_andesite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_bamboo_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_birch_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_cherry_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_crimson_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_dark_oak_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_diorite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_end_stone_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_granite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_gravel_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_ice_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_jungle_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_mangrove_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_netherrack_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_red_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_soul_soil_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/small_spruce_stick.json rename src/main/resources/assets/rocks/models/block/{small_oak_stick.json => small_stick.json} (100%) delete mode 100755 src/main/resources/assets/rocks/models/block/small_warped_stick.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_andesite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_diorite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_end_stone_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_granite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_gravel_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_ice_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_netherrack_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_red_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/block/tiny_soul_soil_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/acacia_stick.json delete mode 100755 src/main/resources/assets/rocks/models/item/andesite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/andesite_splitter.json delete mode 100755 src/main/resources/assets/rocks/models/item/bamboo_stick.json delete mode 100755 src/main/resources/assets/rocks/models/item/birch_stick.json delete mode 100755 src/main/resources/assets/rocks/models/item/cherry_stick.json delete mode 100755 src/main/resources/assets/rocks/models/item/crimson_stick.json delete mode 100755 src/main/resources/assets/rocks/models/item/dark_oak_stick.json delete mode 100755 src/main/resources/assets/rocks/models/item/diorite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/diorite_splitter.json delete mode 100755 src/main/resources/assets/rocks/models/item/end_stone_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/end_stone_splitter.json delete mode 100755 src/main/resources/assets/rocks/models/item/granite_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/granite_splitter.json delete mode 100755 src/main/resources/assets/rocks/models/item/gravel_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/ice_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/ice_splitter.json delete mode 100755 src/main/resources/assets/rocks/models/item/jungle_stick.json delete mode 100755 src/main/resources/assets/rocks/models/item/mangrove_stick.json delete mode 100755 src/main/resources/assets/rocks/models/item/netherrack_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/netherrack_splitter.json delete mode 100755 src/main/resources/assets/rocks/models/item/red_sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/red_sandstone_splitter.json rename src/main/resources/assets/rocks/models/item/{rock.json => rock_base.json} (100%) delete mode 100755 src/main/resources/assets/rocks/models/item/sand_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/sandstone_splitter.json delete mode 100755 src/main/resources/assets/rocks/models/item/soul_soil_rock.json delete mode 100755 src/main/resources/assets/rocks/models/item/soul_soil_splitter.json rename src/main/resources/assets/rocks/models/item/{cobblestone_splitter.json => splitter_base.json} (98%) delete mode 100755 src/main/resources/assets/rocks/models/item/spruce_stick.json rename src/main/resources/assets/rocks/models/item/{oak_stick.json => stick_base.json} (100%) delete mode 100755 src/main/resources/assets/rocks/models/item/warped_stick.json diff --git a/build.gradle b/build.gradle index c855e08..52e7778 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' id "me.shedaniel.unified-publishing" version "0.1.+" } @@ -13,19 +13,10 @@ group = project.maven_group loom { accessWidenerPath = file("src/main/resources/thisrocks.accesswidener") - runs { - // - // This adds a new gradle task that runs the datagen API: "gradlew runDatagenClient" - // - datagenClient { - inherit client - name "Data Generation" - vmArg "-Dfabric-api.datagen" - vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}" - vmArg "-Dfabric-api.datagen.modid=rocks" - - runDir "build/datagen" - } +} +fabricApi { + configureDataGeneration { + client = true } } @@ -52,6 +43,7 @@ dependencies { modImplementation ("eu.pb4:polymer-core:${polymer_version}") modImplementation ("eu.pb4:polymer-blocks:${polymer_version}") modImplementation ("eu.pb4:polymer-resource-pack:${polymer_version}") + modImplementation ("eu.pb4:polymer-resource-pack-extras:${polymer_version}") modImplementation ("eu.pb4:polymer-virtual-entity:${polymer_version}") modImplementation ("eu.pb4:polymer-autohost:${polymer_version}") modImplementation ("eu.pb4:factorytools:${factorytools_version}") @@ -74,15 +66,6 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 21 } -sourceSets { - main { - resources { - srcDirs += [ - 'src/main/generated' - ] - } - } -} java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/gradle.properties b/gradle.properties index bc9a426..76a19d4 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.21.1 - yarn_mappings=1.21.1+build.3 + minecraft_version=1.21.4 + yarn_mappings=1.21.4+build.4 loader_version=0.16.9 # Mod Properties - mod_version = 1.9.0 + mod_version = 1.9.1 maven_group = eu.midnightdust.motschen archives_base_name = rocks release_type=release @@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx2G # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.110.0+1.21.1 - midnightlib_version=1.6.3-fabric - polymer_version=0.9.14+1.21.1 - factorytools_version=0.3.2+1.21 + fabric_version=0.113.0+1.21.4 + midnightlib_version=1.6.6-fabric + polymer_version=0.11.3+1.21.4 + factorytools_version=0.5.0+1.21.4 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..94113f2 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/generated/.cache/0809c40fc61808c03cb356ec122a9518709ab04f b/src/main/generated/.cache/0809c40fc61808c03cb356ec122a9518709ab04f deleted file mode 100644 index a6ec1cd..0000000 --- a/src/main/generated/.cache/0809c40fc61808c03cb356ec122a9518709ab04f +++ /dev/null @@ -1,59 +0,0 @@ -// 1.21 2024-09-17T00:30:20.766025931 This Rocks!/rocks -d71c0556b644dcaf5737175f7336de62ebdbb167 data/rocks/worldgen/configured_feature/mangrove_stick.json -dcc0d9933482f519f2f7e50417b78be0a515918d data/rocks/worldgen/placed_feature/soul_soil_rock.json -fa2f1ffb8e1754f320b7fa507bebaecccdc48390 data/rocks/worldgen/configured_feature/spruce_stick.json -5e1fcb9f44374870bf1f874936dc55c5c8e1f8c5 data/rocks/worldgen/placed_feature/warped_stick.json -1919d79e82602199e121c571751b5b57081fe710 data/rocks/worldgen/configured_feature/underwater_starfish.json -3ce428f5b9db426363a761d0254c22375a66cc67 data/rocks/worldgen/placed_feature/red_sand_rock.json -9848f6c90ac79ec1021ce737f502f5f919cddc0b data/rocks/worldgen/placed_feature/acacia_stick.json -3bb5af6803e29079a3757ab026bcdedee9a3f4a3 data/rocks/worldgen/placed_feature/crimson_stick.json -7fbc9d652d5a02582c260b4c76d05566339a68a1 data/rocks/worldgen/configured_feature/granite_rock.json -91cdd883e2f96bd18ff43e0451ede59f64045d04 data/rocks/worldgen/placed_feature/rock.json -9a4bf562fe53bfcff21a39bfe6043a48986ab87d data/rocks/worldgen/placed_feature/sand_rock.json -c33151e25a50dcc5a826e65933ab9719ad639d6d data/rocks/worldgen/placed_feature/end_stone_rock.json -dbda0b9c6a571f8d5cbe47fda3cda2f8d08ff9f2 data/rocks/worldgen/configured_feature/bamboo_stick.json -3a37c1f098d280104c74d2ddff197ec9d2225f39 data/rocks/worldgen/configured_feature/diorite_rock.json -ac68decd062ded192b01770ec250d76a55e76177 data/rocks/worldgen/configured_feature/oak_stick.json -2f7cdca56829a8e66ec6bb6cc3fff2f2bdb95b38 data/rocks/worldgen/configured_feature/red_sand_rock.json -93f0ff373f22b3fe818305c03cf3a947dc0016d0 data/rocks/worldgen/placed_feature/gravel_rock.json -66039045c4bce89398ae0466b1c14ca3cd68912a data/rocks/worldgen/configured_feature/warped_stick.json -ae1b4c625b9387c5dfc8c1eb53c1eda353ffa712 data/rocks/worldgen/placed_feature/jungle_stick.json -6454db935e810df3ad97aa625308e827b57e115d data/rocks/worldgen/configured_feature/acacia_stick.json -6b1fa178181fd3ec1138da12e220976bf11f831c data/rocks/worldgen/configured_feature/nether_gravel_rock.json -5e1c33acb6043e8e33561f06650d0973382d6054 data/rocks/worldgen/placed_feature/nether_geyser.json -16e9b2f47ac483b8f672c42a5c36194d14e7f7f7 data/rocks/worldgen/placed_feature/nether_gravel_rock.json -a09aa0e744166ba6c07e640a55dcb6570c34936f data/rocks/worldgen/placed_feature/andesite_rock.json -07245b68ad42948f36707d5b83dc995ded4b3038 data/rocks/worldgen/placed_feature/seashell.json -14b6c52b4bdeb69a427eb741e12f21d965de76ab data/rocks/worldgen/configured_feature/cherry_stick.json -de8a64d00b10892f62b21dd3e034608836b4215b data/rocks/worldgen/configured_feature/netherrack_rock.json -26574f35fb852a572ad10c2882160b4fc280aad8 data/rocks/worldgen/configured_feature/sand_rock.json -6b1fa178181fd3ec1138da12e220976bf11f831c data/rocks/worldgen/configured_feature/gravel_rock.json -4554733520656e979093beaa05d881213ad81415 data/rocks/worldgen/configured_feature/underwater_seashell.json -63deabd85376d70de53571f72e29690d2781d6b6 data/rocks/worldgen/configured_feature/ice_rock.json -a2553fb89e8382c0e04dcf3ded89ffcad51b111b data/rocks/worldgen/configured_feature/andesite_rock.json -8d525964606767ac06f52fb03e331029444d934f data/rocks/worldgen/placed_feature/snowy_geyser.json -91fa443267b7ba1d67d25466457e35cbc2123a12 data/rocks/worldgen/configured_feature/dark_oak_stick.json -9413155a906186256fb8395d7c892833db2390bc data/rocks/worldgen/configured_feature/end_stone_rock.json -8210691068079b5f1652a95b854c1ffd37548a22 data/rocks/worldgen/configured_feature/rock.json -d0179c57f1a557cd656ebcd902bfbb57fd877e16 data/rocks/worldgen/configured_feature/seashell.json -9cb4b04873d315d036c4850b8bf79718aa1919d0 data/rocks/worldgen/configured_feature/jungle_stick.json -2ac994ff2e7818ea340b0c4bd527386e80dbcf52 data/rocks/worldgen/placed_feature/underwater_seashell.json -527e35b402cf6f3ee07e767affe58f75257748ad data/rocks/worldgen/placed_feature/starfish.json -5bc6faa179ca69a8a89cc04910f0288621ce89ea data/rocks/worldgen/configured_feature/nether_geyser.json -eb9d7f31f960d8ec61122d75623acb1e2529b4fa data/rocks/worldgen/placed_feature/cherry_stick.json -e36c8db5ef949c547e917e3543da41cfbe378970 data/rocks/worldgen/placed_feature/bamboo_stick.json -9faf9589496f2b0dea0c6597e0bcacbbdd18b194 data/rocks/worldgen/placed_feature/ice_rock.json -5b90945a0ecc164ea8ae165da3d2c03c74b96cc7 data/rocks/worldgen/placed_feature/birch_stick.json -384c6ad8b5505b2b9900c159f9cf9ff7e0ff7a62 data/rocks/worldgen/placed_feature/netherrack_rock.json -3543cb07163388142629427a44900841e9da1869 data/rocks/worldgen/configured_feature/soul_soil_rock.json -1c3fa5665b6c36abd5aa406793acc1f54d3d0d27 data/rocks/worldgen/placed_feature/spruce_stick.json -40e1b2b9439381c0f12fdc9811bc8462a23c3a57 data/rocks/worldgen/placed_feature/mangrove_stick.json -79d123df2ad9ab7a1a3ae508c62a90e7dceb3aac data/rocks/worldgen/configured_feature/crimson_stick.json -f9b95c245164e443738638e4af012ed92b8180e0 data/rocks/worldgen/configured_feature/starfish.json -8eeab96572a35223ec7be23886da2d5ebaef8c47 data/rocks/worldgen/placed_feature/dark_oak_stick.json -c25b0c3bdb96f8e3469481cb787691807bfc3fa3 data/rocks/worldgen/configured_feature/snowy_geyser.json -735c703ef4e0d25978d492d203e7f9979d601524 data/rocks/worldgen/placed_feature/underwater_starfish.json -23b0fb98fdaafef8c0ff7346149d85c7c597e86a data/rocks/worldgen/configured_feature/birch_stick.json -ebaddc15f52cda4480ae94bd7b3d57b0cbbbbdfb data/rocks/worldgen/placed_feature/oak_stick.json -0d79544af5d224d8067936bbfd447f1c533e27b5 data/rocks/worldgen/placed_feature/granite_rock.json -6565d3f0e44737341c4e9f8fadf927d4fa8c2c3e data/rocks/worldgen/placed_feature/diorite_rock.json diff --git a/src/main/generated/.cache/1fbe32a694326cbc22446c7b535df1f442a946d8 b/src/main/generated/.cache/1fbe32a694326cbc22446c7b535df1f442a946d8 deleted file mode 100644 index 3abf1e8..0000000 --- a/src/main/generated/.cache/1fbe32a694326cbc22446c7b535df1f442a946d8 +++ /dev/null @@ -1 +0,0 @@ -// 1.21 2024-09-17T00:30:20.768022552 This Rocks!/Tags for minecraft:block diff --git a/src/main/generated/.cache/7df76d5247a36d2b525b52d21f61ffe0e75fec0a b/src/main/generated/.cache/7df76d5247a36d2b525b52d21f61ffe0e75fec0a deleted file mode 100644 index baa905f..0000000 --- a/src/main/generated/.cache/7df76d5247a36d2b525b52d21f61ffe0e75fec0a +++ /dev/null @@ -1,26 +0,0 @@ -// 1.21 2024-09-17T00:30:20.768248467 This Rocks!/Block Loot Tables -847f71960b56bcc92eaebfb2f98818477868e56b data/rocks/loot_table/blocks/soul_soil_rock.json -f0908425c618a5483354eba1ead6a611f1fa51fb data/rocks/loot_table/blocks/birch_stick.json -cf62804400411aabc548c741280abde43a3d0d59 data/rocks/loot_table/blocks/mangrove_stick.json -e9d103438e87429bf353ae9f8c72b986cfb03982 data/rocks/loot_table/blocks/oak_stick.json -0b5f09e47b168ea1605353b441cf84423e998781 data/rocks/loot_table/blocks/red_sand_rock.json -1ed5083da79cd8c0e4629b4906efcdfa7fa13f7b data/rocks/loot_table/blocks/starfish.json -a943852527aa61b311a21312312cb67b0e941593 data/rocks/loot_table/blocks/crimson_stick.json -706890e011d7e0f74f575790ea9e50b55085f256 data/rocks/loot_table/blocks/spruce_stick.json -a4daf8fc7c400e7c9a16f4f1392e29d35dcddc5a data/rocks/loot_table/blocks/ice_rock.json -71181493ade8079fbb528115025e4a4d345e29e3 data/rocks/loot_table/blocks/end_stone_rock.json -7c6403bd90213358a18381e79395d986daf21a88 data/rocks/loot_table/blocks/diorite_rock.json -f34d9890e8353b13952972d71085eeff4bcab1eb data/rocks/loot_table/blocks/cherry_stick.json -6628d84cd87044ac74c6170bf1adb4a0ba3e1451 data/rocks/loot_table/blocks/netherrack_rock.json -2793e53c85ec8bad852f656856298d6e00bfdf85 data/rocks/loot_table/blocks/seashell.json -95e50bb507ce330ceff8c04eca287457193015bb data/rocks/loot_table/blocks/acacia_stick.json -852ccbedaeaa82a525f8dc435fb7a30a495f842f data/rocks/loot_table/blocks/bamboo_stick.json -aa89fb0888b5a8abaef4c713c292ec8076298170 data/rocks/loot_table/blocks/gravel_rock.json -57039ec5e50322cbfde63394dd304315fb670dd7 data/rocks/loot_table/blocks/andesite_rock.json -fb92bcdad8ef685be9a0604c0dec357992389bbf data/rocks/loot_table/blocks/dark_oak_stick.json -67d948f5d9305509d2a23e13137a14b26eccf6d7 data/rocks/loot_table/blocks/warped_stick.json -31015a9cbb6ab6790056eb16ecb9aff0ad0a03b1 data/rocks/loot_table/blocks/jungle_stick.json -8cbee37f5a070e21308dc7c0aa9b0beea416b84a data/rocks/loot_table/blocks/sand_rock.json -8224883d1a2ed01334a64216168b1f56c4ed2a90 data/rocks/loot_table/blocks/pinecone.json -283f96ab013b53fe1569127810bdc838f7746c09 data/rocks/loot_table/blocks/granite_rock.json -c37079a8ac71c003bdda9d8e6a9c4b770c8a8bbc data/rocks/loot_table/blocks/rock.json diff --git a/src/main/generated/.cache/ef95184f2e259c8d7b29584bde1d7a9631cc116f b/src/main/generated/.cache/ef95184f2e259c8d7b29584bde1d7a9631cc116f deleted file mode 100644 index 47afc04..0000000 --- a/src/main/generated/.cache/ef95184f2e259c8d7b29584bde1d7a9631cc116f +++ /dev/null @@ -1,21 +0,0 @@ -// 1.21 2024-09-17T00:30:20.768641104 This Rocks!/Recipes -b6c911282f64d7f0e0b3f6108bad4dbb3df515a6 data/rocks/advancement/recipes/building_blocks/stone_from_splitter.json -54e83b6dcb86d6449ac69700336bac9f7b308931 data/rocks/recipe/andesite_from_splitter.json -667857ccb79ec82999a28a0ac364ef3abfb1e940 data/rocks/recipe/ice_from_splitter.json -a7c075826da6d91e9a8dd4c45a62e2584252d35a data/rocks/recipe/granite_from_splitter.json -6fc5a499309ae86487bfcdbf1783751d992d7bdc data/rocks/advancement/recipes/building_blocks/diorite_from_splitter.json -5e51953ff415119c283d0b925b2617e7d5b73b40 data/rocks/recipe/soul_soil_from_splitter.json -82d0010e162387ee929082f502d3a4607d84aa8d data/rocks/advancement/recipes/building_blocks/ice_from_splitter.json -9772534185914e9398078ac9a7fcd05f25ade481 data/rocks/advancement/recipes/building_blocks/soul_soil_from_splitter.json -725624c5ea8833ec71fb9f8adf6efe539835120e data/rocks/advancement/recipes/building_blocks/andesite_from_splitter.json -09e9680aafaaa8e6ef2c08063ecdf88f94d1fea1 data/rocks/recipe/stone_from_splitter.json -1c7de94400d03b90df1468e12bf793c073d2063c data/rocks/recipe/netherrack_from_splitter.json -ec73556fd65c48863750db345532e88ba051a7af data/rocks/advancement/recipes/building_blocks/netherrack_from_splitter.json -5ca53887c2cc9e9b22aedfe362821e29ad0d1bdf data/rocks/advancement/recipes/building_blocks/red_sandstone_from_splitter.json -2979c1cbad1e33cf3eddee36831abab780f11fe4 data/rocks/advancement/recipes/building_blocks/end_stone_from_splitter.json -81d37fc236c6c2aa9b53219d4d2be41e9686f0f4 data/rocks/advancement/recipes/building_blocks/sandstone_from_splitter.json -424226dbb76410282b0abf7cab1123a760cf36fe data/rocks/advancement/recipes/building_blocks/granite_from_splitter.json -e6b4864bd839293dcdf078ebdbb1284a378d0862 data/rocks/recipe/diorite_from_splitter.json -ee5e78fedb2ca204462d67398a668f01cba976b3 data/rocks/recipe/red_sandstone_from_splitter.json -12d6109625cde783570f8337c4e5ace2804731e6 data/rocks/recipe/sandstone_from_splitter.json -d190015248ae4c1bc3fd274e6fbd4cb262300507 data/rocks/recipe/end_stone_from_splitter.json diff --git a/src/main/generated/assets/rocks/blockstates/acacia_stick.json b/src/main/generated/assets/rocks/blockstates/acacia_stick.json new file mode 100644 index 0000000..c5624fe --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/acacia_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/acacia_stick_large", + "y": 0 + }, + { + "model": "rocks:block/acacia_stick_large", + "y": 90 + }, + { + "model": "rocks:block/acacia_stick_large", + "y": 180 + }, + { + "model": "rocks:block/acacia_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/acacia_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/acacia_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/acacia_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/acacia_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/acacia_stick_small", + "y": 0 + }, + { + "model": "rocks:block/acacia_stick_small", + "y": 90 + }, + { + "model": "rocks:block/acacia_stick_small", + "y": 180 + }, + { + "model": "rocks:block/acacia_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/andesite_rock.json b/src/main/generated/assets/rocks/blockstates/andesite_rock.json new file mode 100644 index 0000000..9786e22 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/andesite_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/andesite_rock_large", + "y": 0 + }, + { + "model": "rocks:block/andesite_rock_large", + "y": 90 + }, + { + "model": "rocks:block/andesite_rock_large", + "y": 180 + }, + { + "model": "rocks:block/andesite_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/andesite_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/andesite_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/andesite_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/andesite_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/andesite_rock_small", + "y": 0 + }, + { + "model": "rocks:block/andesite_rock_small", + "y": 90 + }, + { + "model": "rocks:block/andesite_rock_small", + "y": 180 + }, + { + "model": "rocks:block/andesite_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/andesite_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/andesite_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/andesite_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/andesite_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/bamboo_stick.json b/src/main/generated/assets/rocks/blockstates/bamboo_stick.json new file mode 100644 index 0000000..5ed6050 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/bamboo_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/bamboo_stick_large", + "y": 0 + }, + { + "model": "rocks:block/bamboo_stick_large", + "y": 90 + }, + { + "model": "rocks:block/bamboo_stick_large", + "y": 180 + }, + { + "model": "rocks:block/bamboo_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/bamboo_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/bamboo_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/bamboo_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/bamboo_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/bamboo_stick_small", + "y": 0 + }, + { + "model": "rocks:block/bamboo_stick_small", + "y": 90 + }, + { + "model": "rocks:block/bamboo_stick_small", + "y": 180 + }, + { + "model": "rocks:block/bamboo_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/birch_stick.json b/src/main/generated/assets/rocks/blockstates/birch_stick.json new file mode 100644 index 0000000..b6c35fe --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/birch_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/birch_stick_large", + "y": 0 + }, + { + "model": "rocks:block/birch_stick_large", + "y": 90 + }, + { + "model": "rocks:block/birch_stick_large", + "y": 180 + }, + { + "model": "rocks:block/birch_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/birch_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/birch_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/birch_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/birch_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/birch_stick_small", + "y": 0 + }, + { + "model": "rocks:block/birch_stick_small", + "y": 90 + }, + { + "model": "rocks:block/birch_stick_small", + "y": 180 + }, + { + "model": "rocks:block/birch_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/cherry_stick.json b/src/main/generated/assets/rocks/blockstates/cherry_stick.json new file mode 100644 index 0000000..2d3952e --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/cherry_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/cherry_stick_large", + "y": 0 + }, + { + "model": "rocks:block/cherry_stick_large", + "y": 90 + }, + { + "model": "rocks:block/cherry_stick_large", + "y": 180 + }, + { + "model": "rocks:block/cherry_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/cherry_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/cherry_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/cherry_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/cherry_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/cherry_stick_small", + "y": 0 + }, + { + "model": "rocks:block/cherry_stick_small", + "y": 90 + }, + { + "model": "rocks:block/cherry_stick_small", + "y": 180 + }, + { + "model": "rocks:block/cherry_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/crimson_stick.json b/src/main/generated/assets/rocks/blockstates/crimson_stick.json new file mode 100644 index 0000000..e39e53c --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/crimson_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/crimson_stick_large", + "y": 0 + }, + { + "model": "rocks:block/crimson_stick_large", + "y": 90 + }, + { + "model": "rocks:block/crimson_stick_large", + "y": 180 + }, + { + "model": "rocks:block/crimson_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/crimson_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/crimson_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/crimson_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/crimson_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/crimson_stick_small", + "y": 0 + }, + { + "model": "rocks:block/crimson_stick_small", + "y": 90 + }, + { + "model": "rocks:block/crimson_stick_small", + "y": 180 + }, + { + "model": "rocks:block/crimson_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/dark_oak_stick.json b/src/main/generated/assets/rocks/blockstates/dark_oak_stick.json new file mode 100644 index 0000000..83bff06 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/dark_oak_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/dark_oak_stick_large", + "y": 0 + }, + { + "model": "rocks:block/dark_oak_stick_large", + "y": 90 + }, + { + "model": "rocks:block/dark_oak_stick_large", + "y": 180 + }, + { + "model": "rocks:block/dark_oak_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/dark_oak_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/dark_oak_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/dark_oak_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/dark_oak_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/dark_oak_stick_small", + "y": 0 + }, + { + "model": "rocks:block/dark_oak_stick_small", + "y": 90 + }, + { + "model": "rocks:block/dark_oak_stick_small", + "y": 180 + }, + { + "model": "rocks:block/dark_oak_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/diorite_rock.json b/src/main/generated/assets/rocks/blockstates/diorite_rock.json new file mode 100644 index 0000000..d896f59 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/diorite_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/diorite_rock_large", + "y": 0 + }, + { + "model": "rocks:block/diorite_rock_large", + "y": 90 + }, + { + "model": "rocks:block/diorite_rock_large", + "y": 180 + }, + { + "model": "rocks:block/diorite_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/diorite_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/diorite_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/diorite_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/diorite_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/diorite_rock_small", + "y": 0 + }, + { + "model": "rocks:block/diorite_rock_small", + "y": 90 + }, + { + "model": "rocks:block/diorite_rock_small", + "y": 180 + }, + { + "model": "rocks:block/diorite_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/diorite_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/diorite_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/diorite_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/diorite_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/end_stone_rock.json b/src/main/generated/assets/rocks/blockstates/end_stone_rock.json new file mode 100644 index 0000000..9e7c470 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/end_stone_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/end_stone_rock_large", + "y": 0 + }, + { + "model": "rocks:block/end_stone_rock_large", + "y": 90 + }, + { + "model": "rocks:block/end_stone_rock_large", + "y": 180 + }, + { + "model": "rocks:block/end_stone_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/end_stone_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/end_stone_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/end_stone_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/end_stone_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/end_stone_rock_small", + "y": 0 + }, + { + "model": "rocks:block/end_stone_rock_small", + "y": 90 + }, + { + "model": "rocks:block/end_stone_rock_small", + "y": 180 + }, + { + "model": "rocks:block/end_stone_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/end_stone_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/end_stone_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/end_stone_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/end_stone_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/granite_rock.json b/src/main/generated/assets/rocks/blockstates/granite_rock.json new file mode 100644 index 0000000..7688eb4 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/granite_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/granite_rock_large", + "y": 0 + }, + { + "model": "rocks:block/granite_rock_large", + "y": 90 + }, + { + "model": "rocks:block/granite_rock_large", + "y": 180 + }, + { + "model": "rocks:block/granite_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/granite_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/granite_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/granite_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/granite_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/granite_rock_small", + "y": 0 + }, + { + "model": "rocks:block/granite_rock_small", + "y": 90 + }, + { + "model": "rocks:block/granite_rock_small", + "y": 180 + }, + { + "model": "rocks:block/granite_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/granite_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/granite_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/granite_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/granite_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/gravel_rock.json b/src/main/generated/assets/rocks/blockstates/gravel_rock.json new file mode 100644 index 0000000..ee7f507 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/gravel_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/gravel_rock_large", + "y": 0 + }, + { + "model": "rocks:block/gravel_rock_large", + "y": 90 + }, + { + "model": "rocks:block/gravel_rock_large", + "y": 180 + }, + { + "model": "rocks:block/gravel_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/gravel_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/gravel_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/gravel_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/gravel_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/gravel_rock_small", + "y": 0 + }, + { + "model": "rocks:block/gravel_rock_small", + "y": 90 + }, + { + "model": "rocks:block/gravel_rock_small", + "y": 180 + }, + { + "model": "rocks:block/gravel_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/gravel_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/gravel_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/gravel_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/gravel_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/ice_rock.json b/src/main/generated/assets/rocks/blockstates/ice_rock.json new file mode 100644 index 0000000..693d085 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/ice_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/ice_rock_large", + "y": 0 + }, + { + "model": "rocks:block/ice_rock_large", + "y": 90 + }, + { + "model": "rocks:block/ice_rock_large", + "y": 180 + }, + { + "model": "rocks:block/ice_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/ice_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/ice_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/ice_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/ice_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/ice_rock_small", + "y": 0 + }, + { + "model": "rocks:block/ice_rock_small", + "y": 90 + }, + { + "model": "rocks:block/ice_rock_small", + "y": 180 + }, + { + "model": "rocks:block/ice_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/ice_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/ice_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/ice_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/ice_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/jungle_stick.json b/src/main/generated/assets/rocks/blockstates/jungle_stick.json new file mode 100644 index 0000000..3efe339 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/jungle_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/jungle_stick_large", + "y": 0 + }, + { + "model": "rocks:block/jungle_stick_large", + "y": 90 + }, + { + "model": "rocks:block/jungle_stick_large", + "y": 180 + }, + { + "model": "rocks:block/jungle_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/jungle_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/jungle_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/jungle_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/jungle_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/jungle_stick_small", + "y": 0 + }, + { + "model": "rocks:block/jungle_stick_small", + "y": 90 + }, + { + "model": "rocks:block/jungle_stick_small", + "y": 180 + }, + { + "model": "rocks:block/jungle_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/mangrove_stick.json b/src/main/generated/assets/rocks/blockstates/mangrove_stick.json new file mode 100644 index 0000000..172b11a --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/mangrove_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/mangrove_stick_large", + "y": 0 + }, + { + "model": "rocks:block/mangrove_stick_large", + "y": 90 + }, + { + "model": "rocks:block/mangrove_stick_large", + "y": 180 + }, + { + "model": "rocks:block/mangrove_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/mangrove_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/mangrove_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/mangrove_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/mangrove_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/mangrove_stick_small", + "y": 0 + }, + { + "model": "rocks:block/mangrove_stick_small", + "y": 90 + }, + { + "model": "rocks:block/mangrove_stick_small", + "y": 180 + }, + { + "model": "rocks:block/mangrove_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/netherrack_rock.json b/src/main/generated/assets/rocks/blockstates/netherrack_rock.json new file mode 100644 index 0000000..6889ada --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/netherrack_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/netherrack_rock_large", + "y": 0 + }, + { + "model": "rocks:block/netherrack_rock_large", + "y": 90 + }, + { + "model": "rocks:block/netherrack_rock_large", + "y": 180 + }, + { + "model": "rocks:block/netherrack_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/netherrack_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/netherrack_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/netherrack_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/netherrack_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/netherrack_rock_small", + "y": 0 + }, + { + "model": "rocks:block/netherrack_rock_small", + "y": 90 + }, + { + "model": "rocks:block/netherrack_rock_small", + "y": 180 + }, + { + "model": "rocks:block/netherrack_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/netherrack_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/netherrack_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/netherrack_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/netherrack_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/oak_stick.json b/src/main/generated/assets/rocks/blockstates/oak_stick.json new file mode 100644 index 0000000..a796665 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/oak_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/oak_stick_large", + "y": 0 + }, + { + "model": "rocks:block/oak_stick_large", + "y": 90 + }, + { + "model": "rocks:block/oak_stick_large", + "y": 180 + }, + { + "model": "rocks:block/oak_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/oak_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/oak_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/oak_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/oak_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/oak_stick_small", + "y": 0 + }, + { + "model": "rocks:block/oak_stick_small", + "y": 90 + }, + { + "model": "rocks:block/oak_stick_small", + "y": 180 + }, + { + "model": "rocks:block/oak_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/pale_oak_stick.json b/src/main/generated/assets/rocks/blockstates/pale_oak_stick.json new file mode 100644 index 0000000..a905b8b --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/pale_oak_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/pale_oak_stick_large", + "y": 0 + }, + { + "model": "rocks:block/pale_oak_stick_large", + "y": 90 + }, + { + "model": "rocks:block/pale_oak_stick_large", + "y": 180 + }, + { + "model": "rocks:block/pale_oak_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/pale_oak_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/pale_oak_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/pale_oak_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/pale_oak_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/pale_oak_stick_small", + "y": 0 + }, + { + "model": "rocks:block/pale_oak_stick_small", + "y": 90 + }, + { + "model": "rocks:block/pale_oak_stick_small", + "y": 180 + }, + { + "model": "rocks:block/pale_oak_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/red_sand_rock.json b/src/main/generated/assets/rocks/blockstates/red_sand_rock.json new file mode 100644 index 0000000..6056068 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/red_sand_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/red_sand_rock_large", + "y": 0 + }, + { + "model": "rocks:block/red_sand_rock_large", + "y": 90 + }, + { + "model": "rocks:block/red_sand_rock_large", + "y": 180 + }, + { + "model": "rocks:block/red_sand_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/red_sand_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/red_sand_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/red_sand_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/red_sand_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/red_sand_rock_small", + "y": 0 + }, + { + "model": "rocks:block/red_sand_rock_small", + "y": 90 + }, + { + "model": "rocks:block/red_sand_rock_small", + "y": 180 + }, + { + "model": "rocks:block/red_sand_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/red_sand_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/red_sand_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/red_sand_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/red_sand_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/rock.json b/src/main/generated/assets/rocks/blockstates/rock.json new file mode 100644 index 0000000..ee78dae --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/rock_large", + "y": 0 + }, + { + "model": "rocks:block/rock_large", + "y": 90 + }, + { + "model": "rocks:block/rock_large", + "y": 180 + }, + { + "model": "rocks:block/rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/rock_medium", + "y": 0 + }, + { + "model": "rocks:block/rock_medium", + "y": 90 + }, + { + "model": "rocks:block/rock_medium", + "y": 180 + }, + { + "model": "rocks:block/rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/rock_small", + "y": 0 + }, + { + "model": "rocks:block/rock_small", + "y": 90 + }, + { + "model": "rocks:block/rock_small", + "y": 180 + }, + { + "model": "rocks:block/rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/sand_rock.json b/src/main/generated/assets/rocks/blockstates/sand_rock.json new file mode 100644 index 0000000..8878a2d --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/sand_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/sand_rock_large", + "y": 0 + }, + { + "model": "rocks:block/sand_rock_large", + "y": 90 + }, + { + "model": "rocks:block/sand_rock_large", + "y": 180 + }, + { + "model": "rocks:block/sand_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/sand_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/sand_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/sand_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/sand_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/sand_rock_small", + "y": 0 + }, + { + "model": "rocks:block/sand_rock_small", + "y": 90 + }, + { + "model": "rocks:block/sand_rock_small", + "y": 180 + }, + { + "model": "rocks:block/sand_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/sand_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/sand_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/sand_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/sand_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/soul_soil_rock.json b/src/main/generated/assets/rocks/blockstates/soul_soil_rock.json new file mode 100644 index 0000000..367cb24 --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/soul_soil_rock.json @@ -0,0 +1,76 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/soul_soil_rock_large", + "y": 0 + }, + { + "model": "rocks:block/soul_soil_rock_large", + "y": 90 + }, + { + "model": "rocks:block/soul_soil_rock_large", + "y": 180 + }, + { + "model": "rocks:block/soul_soil_rock_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/soul_soil_rock_medium", + "y": 0 + }, + { + "model": "rocks:block/soul_soil_rock_medium", + "y": 90 + }, + { + "model": "rocks:block/soul_soil_rock_medium", + "y": 180 + }, + { + "model": "rocks:block/soul_soil_rock_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/soul_soil_rock_small", + "y": 0 + }, + { + "model": "rocks:block/soul_soil_rock_small", + "y": 90 + }, + { + "model": "rocks:block/soul_soil_rock_small", + "y": 180 + }, + { + "model": "rocks:block/soul_soil_rock_small", + "y": 270 + } + ], + "variation=tiny": [ + { + "model": "rocks:block/soul_soil_rock_tiny", + "y": 0 + }, + { + "model": "rocks:block/soul_soil_rock_tiny", + "y": 90 + }, + { + "model": "rocks:block/soul_soil_rock_tiny", + "y": 180 + }, + { + "model": "rocks:block/soul_soil_rock_tiny", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/spruce_stick.json b/src/main/generated/assets/rocks/blockstates/spruce_stick.json new file mode 100644 index 0000000..079203b --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/spruce_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/spruce_stick_large", + "y": 0 + }, + { + "model": "rocks:block/spruce_stick_large", + "y": 90 + }, + { + "model": "rocks:block/spruce_stick_large", + "y": 180 + }, + { + "model": "rocks:block/spruce_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/spruce_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/spruce_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/spruce_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/spruce_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/spruce_stick_small", + "y": 0 + }, + { + "model": "rocks:block/spruce_stick_small", + "y": 90 + }, + { + "model": "rocks:block/spruce_stick_small", + "y": 180 + }, + { + "model": "rocks:block/spruce_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/blockstates/warped_stick.json b/src/main/generated/assets/rocks/blockstates/warped_stick.json new file mode 100644 index 0000000..2d61f4b --- /dev/null +++ b/src/main/generated/assets/rocks/blockstates/warped_stick.json @@ -0,0 +1,58 @@ +{ + "variants": { + "variation=large": [ + { + "model": "rocks:block/warped_stick_large", + "y": 0 + }, + { + "model": "rocks:block/warped_stick_large", + "y": 90 + }, + { + "model": "rocks:block/warped_stick_large", + "y": 180 + }, + { + "model": "rocks:block/warped_stick_large", + "y": 270 + } + ], + "variation=medium": [ + { + "model": "rocks:block/warped_stick_medium", + "y": 0 + }, + { + "model": "rocks:block/warped_stick_medium", + "y": 90 + }, + { + "model": "rocks:block/warped_stick_medium", + "y": 180 + }, + { + "model": "rocks:block/warped_stick_medium", + "y": 270 + } + ], + "variation=small": [ + { + "model": "rocks:block/warped_stick_small", + "y": 0 + }, + { + "model": "rocks:block/warped_stick_small", + "y": 90 + }, + { + "model": "rocks:block/warped_stick_small", + "y": 180 + }, + { + "model": "rocks:block/warped_stick_small", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/acacia_stick.json b/src/main/generated/assets/rocks/items/acacia_stick.json new file mode 100644 index 0000000..71f75d9 --- /dev/null +++ b/src/main/generated/assets/rocks/items/acacia_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/acacia_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/andesite_rock.json b/src/main/generated/assets/rocks/items/andesite_rock.json new file mode 100644 index 0000000..78d146e --- /dev/null +++ b/src/main/generated/assets/rocks/items/andesite_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/andesite_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/andesite_splitter.json b/src/main/generated/assets/rocks/items/andesite_splitter.json new file mode 100644 index 0000000..573bda0 --- /dev/null +++ b/src/main/generated/assets/rocks/items/andesite_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/andesite_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/bamboo_stick.json b/src/main/generated/assets/rocks/items/bamboo_stick.json new file mode 100644 index 0000000..91de0a7 --- /dev/null +++ b/src/main/generated/assets/rocks/items/bamboo_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/bamboo_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/birch_stick.json b/src/main/generated/assets/rocks/items/birch_stick.json new file mode 100644 index 0000000..948819e --- /dev/null +++ b/src/main/generated/assets/rocks/items/birch_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/birch_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/cherry_stick.json b/src/main/generated/assets/rocks/items/cherry_stick.json new file mode 100644 index 0000000..cca01ad --- /dev/null +++ b/src/main/generated/assets/rocks/items/cherry_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/cherry_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/cobblestone_splitter.json b/src/main/generated/assets/rocks/items/cobblestone_splitter.json new file mode 100644 index 0000000..c3dc39e --- /dev/null +++ b/src/main/generated/assets/rocks/items/cobblestone_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/cobblestone_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/crimson_stick.json b/src/main/generated/assets/rocks/items/crimson_stick.json new file mode 100644 index 0000000..3d1eec3 --- /dev/null +++ b/src/main/generated/assets/rocks/items/crimson_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/crimson_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/dark_oak_stick.json b/src/main/generated/assets/rocks/items/dark_oak_stick.json new file mode 100644 index 0000000..4fdb723 --- /dev/null +++ b/src/main/generated/assets/rocks/items/dark_oak_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/dark_oak_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/diorite_rock.json b/src/main/generated/assets/rocks/items/diorite_rock.json new file mode 100644 index 0000000..b5c55b3 --- /dev/null +++ b/src/main/generated/assets/rocks/items/diorite_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/diorite_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/diorite_splitter.json b/src/main/generated/assets/rocks/items/diorite_splitter.json new file mode 100644 index 0000000..913e9e8 --- /dev/null +++ b/src/main/generated/assets/rocks/items/diorite_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/diorite_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/end_stone_rock.json b/src/main/generated/assets/rocks/items/end_stone_rock.json new file mode 100644 index 0000000..43616de --- /dev/null +++ b/src/main/generated/assets/rocks/items/end_stone_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/end_stone_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/end_stone_splitter.json b/src/main/generated/assets/rocks/items/end_stone_splitter.json new file mode 100644 index 0000000..59de49b --- /dev/null +++ b/src/main/generated/assets/rocks/items/end_stone_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/end_stone_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/geyser.json b/src/main/generated/assets/rocks/items/geyser.json new file mode 100644 index 0000000..bcb3675 --- /dev/null +++ b/src/main/generated/assets/rocks/items/geyser.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/geyser" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/granite_rock.json b/src/main/generated/assets/rocks/items/granite_rock.json new file mode 100644 index 0000000..c0dc187 --- /dev/null +++ b/src/main/generated/assets/rocks/items/granite_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/granite_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/granite_splitter.json b/src/main/generated/assets/rocks/items/granite_splitter.json new file mode 100644 index 0000000..896d716 --- /dev/null +++ b/src/main/generated/assets/rocks/items/granite_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/granite_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/gravel_rock.json b/src/main/generated/assets/rocks/items/gravel_rock.json new file mode 100644 index 0000000..9c363a2 --- /dev/null +++ b/src/main/generated/assets/rocks/items/gravel_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/gravel_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/ice_rock.json b/src/main/generated/assets/rocks/items/ice_rock.json new file mode 100644 index 0000000..9c23c62 --- /dev/null +++ b/src/main/generated/assets/rocks/items/ice_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/ice_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/ice_splitter.json b/src/main/generated/assets/rocks/items/ice_splitter.json new file mode 100644 index 0000000..1853165 --- /dev/null +++ b/src/main/generated/assets/rocks/items/ice_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/ice_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/jungle_stick.json b/src/main/generated/assets/rocks/items/jungle_stick.json new file mode 100644 index 0000000..32a074a --- /dev/null +++ b/src/main/generated/assets/rocks/items/jungle_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/jungle_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/mangrove_stick.json b/src/main/generated/assets/rocks/items/mangrove_stick.json new file mode 100644 index 0000000..f807150 --- /dev/null +++ b/src/main/generated/assets/rocks/items/mangrove_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/mangrove_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/nether_geyser.json b/src/main/generated/assets/rocks/items/nether_geyser.json new file mode 100644 index 0000000..e4f9bc7 --- /dev/null +++ b/src/main/generated/assets/rocks/items/nether_geyser.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/nether_geyser" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/netherrack_rock.json b/src/main/generated/assets/rocks/items/netherrack_rock.json new file mode 100644 index 0000000..a2687a0 --- /dev/null +++ b/src/main/generated/assets/rocks/items/netherrack_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/netherrack_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/netherrack_splitter.json b/src/main/generated/assets/rocks/items/netherrack_splitter.json new file mode 100644 index 0000000..3925e6b --- /dev/null +++ b/src/main/generated/assets/rocks/items/netherrack_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/netherrack_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/oak_stick.json b/src/main/generated/assets/rocks/items/oak_stick.json new file mode 100644 index 0000000..e78f6d2 --- /dev/null +++ b/src/main/generated/assets/rocks/items/oak_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/oak_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/pale_oak_stick.json b/src/main/generated/assets/rocks/items/pale_oak_stick.json new file mode 100644 index 0000000..5e9e215 --- /dev/null +++ b/src/main/generated/assets/rocks/items/pale_oak_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/pale_oak_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/pinecone.json b/src/main/generated/assets/rocks/items/pinecone.json new file mode 100644 index 0000000..01958f9 --- /dev/null +++ b/src/main/generated/assets/rocks/items/pinecone.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/pinecone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/red_sand_rock.json b/src/main/generated/assets/rocks/items/red_sand_rock.json new file mode 100644 index 0000000..cb5aefe --- /dev/null +++ b/src/main/generated/assets/rocks/items/red_sand_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/red_sand_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/red_sandstone_splitter.json b/src/main/generated/assets/rocks/items/red_sandstone_splitter.json new file mode 100644 index 0000000..f888fcf --- /dev/null +++ b/src/main/generated/assets/rocks/items/red_sandstone_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/red_sandstone_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/rock.json b/src/main/generated/assets/rocks/items/rock.json new file mode 100644 index 0000000..254e10c --- /dev/null +++ b/src/main/generated/assets/rocks/items/rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/sand_rock.json b/src/main/generated/assets/rocks/items/sand_rock.json new file mode 100644 index 0000000..7638e28 --- /dev/null +++ b/src/main/generated/assets/rocks/items/sand_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/sand_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/sandstone_splitter.json b/src/main/generated/assets/rocks/items/sandstone_splitter.json new file mode 100644 index 0000000..813f200 --- /dev/null +++ b/src/main/generated/assets/rocks/items/sandstone_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/sandstone_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/seashell.json b/src/main/generated/assets/rocks/items/seashell.json new file mode 100644 index 0000000..0f0efe9 --- /dev/null +++ b/src/main/generated/assets/rocks/items/seashell.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/seashell" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/soul_soil_rock.json b/src/main/generated/assets/rocks/items/soul_soil_rock.json new file mode 100644 index 0000000..4b23602 --- /dev/null +++ b/src/main/generated/assets/rocks/items/soul_soil_rock.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/soul_soil_rock" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/soul_soil_splitter.json b/src/main/generated/assets/rocks/items/soul_soil_splitter.json new file mode 100644 index 0000000..8b491ba --- /dev/null +++ b/src/main/generated/assets/rocks/items/soul_soil_splitter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/soul_soil_splitter" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/spruce_stick.json b/src/main/generated/assets/rocks/items/spruce_stick.json new file mode 100644 index 0000000..75a5331 --- /dev/null +++ b/src/main/generated/assets/rocks/items/spruce_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/spruce_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/starfish.json b/src/main/generated/assets/rocks/items/starfish.json new file mode 100644 index 0000000..9bbb9da --- /dev/null +++ b/src/main/generated/assets/rocks/items/starfish.json @@ -0,0 +1,34 @@ +{ + "model": { + "type": "minecraft:select", + "block_state_property": "variation", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "rocks:block/starfish_red" + }, + "when": "red" + }, + { + "model": { + "type": "minecraft:model", + "model": "rocks:block/starfish_pink" + }, + "when": "pink" + }, + { + "model": { + "type": "minecraft:model", + "model": "rocks:block/starfish_orange" + }, + "when": "orange" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "rocks:item/starfish" + }, + "property": "minecraft:block_state" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/items/warped_stick.json b/src/main/generated/assets/rocks/items/warped_stick.json new file mode 100644 index 0000000..232cce9 --- /dev/null +++ b/src/main/generated/assets/rocks/items/warped_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "rocks:item/warped_stick" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/lang/de_de.json b/src/main/generated/assets/rocks/lang/de_de.json new file mode 100644 index 0000000..976b866 --- /dev/null +++ b/src/main/generated/assets/rocks/lang/de_de.json @@ -0,0 +1,87 @@ +{ + "block.rocks.acacia_stick": "Akazienstock", + "block.rocks.andesite_rock": "Andesitbrocken", + "block.rocks.bamboo_stick": "Bambusstock", + "block.rocks.birch_stick": "Birkenstock", + "block.rocks.cherry_stick": "Kirschstock", + "block.rocks.crimson_stick": "Karmesinstock", + "block.rocks.dark_oak_stick": "Schwarzeichenstock", + "block.rocks.diorite_rock": "Dioritbrocken", + "block.rocks.end_stone_rock": "Endsteinbrocken", + "block.rocks.geyser": "Geysir", + "block.rocks.granite_rock": "Granitbrocken", + "block.rocks.gravel_rock": "Kiesbrocken", + "block.rocks.ice_rock": "Eisbrocken", + "block.rocks.jungle_stick": "Tropenstock", + "block.rocks.mangrove_stick": "Mangrovenstock", + "block.rocks.nether_geyser": "Nether-Geysir", + "block.rocks.netherrack_rock": "Netherrackbrocken", + "block.rocks.oak_stick": "Eichenstock", + "block.rocks.pale_oak_stick": "Blasseichenstock", + "block.rocks.pinecone": "Tannenzapfen", + "block.rocks.red_sand_rock": "Roter Sandsteinbrocken", + "block.rocks.rock": "Steinbrocken", + "block.rocks.sand_rock": "Sandsteinbrocken", + "block.rocks.seashell": "Muschel", + "block.rocks.soul_soil_rock": "Seelenerdebrocken", + "block.rocks.spruce_stick": "Fichtenstock", + "block.rocks.starfish": "Seestern", + "block.rocks.warped_stick": "Wirrstock", + "item.rocks.acacia_stick": "Akazienstock", + "item.rocks.andesite_rock": "Andesitbrocken", + "item.rocks.andesite_splitter": "Andesitsplitter", + "item.rocks.bamboo_stick": "Bambusstock", + "item.rocks.birch_stick": "Birkenstock", + "item.rocks.cherry_stick": "Kirschstock", + "item.rocks.cobblestone_splitter": "Steinsplitter", + "item.rocks.crimson_stick": "Karmesinstock", + "item.rocks.dark_oak_stick": "Schwarzeichenstock", + "item.rocks.diorite_rock": "Dioritbrocken", + "item.rocks.diorite_splitter": "Dioritsplitter", + "item.rocks.end_stone_rock": "Endsteinbrocken", + "item.rocks.end_stone_splitter": "Endsteinsplitter", + "item.rocks.geyser": "Geysir", + "item.rocks.granite_rock": "Granitbrocken", + "item.rocks.granite_splitter": "Granitsplitter", + "item.rocks.gravel_rock": "Kiesbrocken", + "item.rocks.ice_rock": "Eisbrocken", + "item.rocks.ice_splitter": "Eissplitter", + "item.rocks.jungle_stick": "Tropenstock", + "item.rocks.mangrove_stick": "Mangrovenstock", + "item.rocks.nether_geyser": "Nether-Geysir", + "item.rocks.netherrack_rock": "Netherrackbrocken", + "item.rocks.netherrack_splitter": "Netherracksplitter", + "item.rocks.oak_stick": "Eichenstock", + "item.rocks.pale_oak_stick": "Blasseichenstock", + "item.rocks.pinecone": "Tannenzapfen", + "item.rocks.red_sand_rock": "Roter Sandsteinbrocken", + "item.rocks.red_sandstone_splitter": "Roter Sandsteinsplitter", + "item.rocks.rock": "Steinbrocken", + "item.rocks.sand_rock": "Sandsteinbrocken", + "item.rocks.sandstone_splitter": "Sandsteinsplitter", + "item.rocks.seashell": "Muschel", + "item.rocks.soul_soil_rock": "Seelenerdebrocken", + "item.rocks.soul_soil_splitter": "Seelenerdesplitter", + "item.rocks.spruce_stick": "Fichtenstock", + "item.rocks.starfish": "Seestern", + "item.rocks.warped_stick": "Wirrstock", + "itemGroup.rocks.rocks": "This Rocks!", + "rocks.midnightconfig.category.effects": "Effekte", + "rocks.midnightconfig.category.misc": "Sonstiges", + "rocks.midnightconfig.category.rocks": "Brocken", + "rocks.midnightconfig.category.sticks": "Stöcke", + "rocks.midnightconfig.enablePolymerMode": "Aktiviere Polymer-Modus", + "rocks.midnightconfig.enablePolymerMode.tooltip": "Erlaubt der Mod, komplett serverseitig zu funktionieren, wenn Polymer und FactoryTools installiert sind", + "rocks.midnightconfig.geyserLevitation": "Geysir Schwebeeffekt", + "rocks.midnightconfig.misc": "§aMiscellaneous Spawn Count", + "rocks.midnightconfig.needs_restart": "§cStarte das Spiel neu, nachdem du Änderungen vorgenommen hast!", + "rocks.midnightconfig.needs_restart1": "§cStarte das Spiel neu, nachdem du Änderungen vorgenommen hast!", + "rocks.midnightconfig.needs_restart2": "§cStarte das Spiel neu, nachdem du Änderungen vorgenommen hast!", + "rocks.midnightconfig.netherGeyserDamage": "Nether Geysir Schaden", + "rocks.midnightconfig.polymerViewDistance": "Polymer-Sichtweite", + "rocks.midnightconfig.rocks": "§aRock Spawn Count", + "rocks.midnightconfig.sticks": "§aStick Spawn Count", + "rocks.midnightconfig.title": "This Rocks! Config", + "rocks.midnightconfig.underwaterSeashell": "Unterwasser-Muschel", + "rocks.midnightconfig.underwaterStarfish": "Unterwasser-Seestern" +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/lang/en_us.json b/src/main/generated/assets/rocks/lang/en_us.json new file mode 100644 index 0000000..1bbe055 --- /dev/null +++ b/src/main/generated/assets/rocks/lang/en_us.json @@ -0,0 +1,87 @@ +{ + "block.rocks.acacia_stick": "Acacia Stick", + "block.rocks.andesite_rock": "Andesite Rock", + "block.rocks.bamboo_stick": "Bamboo Stick", + "block.rocks.birch_stick": "Birch Stick", + "block.rocks.cherry_stick": "Cherry Stick", + "block.rocks.crimson_stick": "Crimson Stick", + "block.rocks.dark_oak_stick": "Dark Oak Stick", + "block.rocks.diorite_rock": "Diorite Rock", + "block.rocks.end_stone_rock": "End Stone Rock", + "block.rocks.geyser": "Geyser", + "block.rocks.granite_rock": "Granite Rock", + "block.rocks.gravel_rock": "Gravel Rock", + "block.rocks.ice_rock": "Ice Rock", + "block.rocks.jungle_stick": "Jungle Stick", + "block.rocks.mangrove_stick": "Mangrove Stick", + "block.rocks.nether_geyser": "Nether Geyser", + "block.rocks.netherrack_rock": "Netherrack Rock", + "block.rocks.oak_stick": "Oak Stick", + "block.rocks.pale_oak_stick": "Pale Oak Stick", + "block.rocks.pinecone": "Pinecone", + "block.rocks.red_sand_rock": "Red Sandstone Rock", + "block.rocks.rock": "Stone Rock", + "block.rocks.sand_rock": "Sandstone Rock", + "block.rocks.seashell": "Seashell", + "block.rocks.soul_soil_rock": "Soul Soil Rock", + "block.rocks.spruce_stick": "Spruce Stick", + "block.rocks.starfish": "Starfish", + "block.rocks.warped_stick": "Warped Stick", + "item.rocks.acacia_stick": "Acacia Stick", + "item.rocks.andesite_rock": "Andesite Rock", + "item.rocks.andesite_splitter": "Andesite Splitter", + "item.rocks.bamboo_stick": "Bamboo Stick", + "item.rocks.birch_stick": "Birch Stick", + "item.rocks.cherry_stick": "Cherry Stick", + "item.rocks.cobblestone_splitter": "Stone Splitter", + "item.rocks.crimson_stick": "Crimson Stick", + "item.rocks.dark_oak_stick": "Dark Oak Stick", + "item.rocks.diorite_rock": "Diorite Rock", + "item.rocks.diorite_splitter": "Diorite Splitter", + "item.rocks.end_stone_rock": "End Stone Rock", + "item.rocks.end_stone_splitter": "End Stone Splitter", + "item.rocks.geyser": "Geyser", + "item.rocks.granite_rock": "Granite Rock", + "item.rocks.granite_splitter": "Granite Splitter", + "item.rocks.gravel_rock": "Gravel Rock", + "item.rocks.ice_rock": "Ice Rock", + "item.rocks.ice_splitter": "Ice Splitter", + "item.rocks.jungle_stick": "Jungle Stick", + "item.rocks.mangrove_stick": "Mangrove Stick", + "item.rocks.nether_geyser": "Nether Geyser", + "item.rocks.netherrack_rock": "Netherrack Rock", + "item.rocks.netherrack_splitter": "Netherrack Splitter", + "item.rocks.oak_stick": "Oak Stick", + "item.rocks.pale_oak_stick": "Pale Oak Stick", + "item.rocks.pinecone": "Pinecone", + "item.rocks.red_sand_rock": "Red Sandstone Rock", + "item.rocks.red_sandstone_splitter": "Red Sandstone Splitter", + "item.rocks.rock": "Stone Rock", + "item.rocks.sand_rock": "Sandstone Rock", + "item.rocks.sandstone_splitter": "Sandstone Splitter", + "item.rocks.seashell": "Seashell", + "item.rocks.soul_soil_rock": "Soul Soil Rock", + "item.rocks.soul_soil_splitter": "Soul Soil Splitter", + "item.rocks.spruce_stick": "Spruce Stick", + "item.rocks.starfish": "Starfish", + "item.rocks.warped_stick": "Warped Stick", + "itemGroup.rocks.rocks": "This Rocks!", + "rocks.midnightconfig.category.effects": "Effects", + "rocks.midnightconfig.category.misc": "Miscellaneous", + "rocks.midnightconfig.category.rocks": "Rocks", + "rocks.midnightconfig.category.sticks": "Sticks", + "rocks.midnightconfig.enablePolymerMode": "Enable Polymer Mode", + "rocks.midnightconfig.enablePolymerMode.tooltip": "Allows the mod to work fully server-sided when used in combination with Polymer and FactoryTools", + "rocks.midnightconfig.geyserLevitation": "Geyser Levitation", + "rocks.midnightconfig.misc": "§aMiscellaneous Spawn Count", + "rocks.midnightconfig.needs_restart": "§cRestart the game after changing options here!", + "rocks.midnightconfig.needs_restart1": "§cRestart the game after changing options here!", + "rocks.midnightconfig.needs_restart2": "§cRestart the game after changing options here!", + "rocks.midnightconfig.netherGeyserDamage": "Nether Geyser Damage", + "rocks.midnightconfig.polymerViewDistance": "Polymer View Distance", + "rocks.midnightconfig.rocks": "§aRock Spawn Count", + "rocks.midnightconfig.sticks": "§aStick Spawn Count", + "rocks.midnightconfig.title": "This Rocks! Config", + "rocks.midnightconfig.underwaterSeashell": "Underwater Seashell", + "rocks.midnightconfig.underwaterStarfish": "Underwater Starfish" +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/acacia_stick_large.json b/src/main/generated/assets/rocks/models/block/acacia_stick_large.json new file mode 100644 index 0000000..a079674 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/acacia_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/acacia_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/acacia_stick_medium.json b/src/main/generated/assets/rocks/models/block/acacia_stick_medium.json new file mode 100644 index 0000000..7ca062d --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/acacia_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/acacia_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/acacia_stick_small.json b/src/main/generated/assets/rocks/models/block/acacia_stick_small.json new file mode 100644 index 0000000..df85211 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/acacia_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/acacia_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/andesite_rock_large.json b/src/main/generated/assets/rocks/models/block/andesite_rock_large.json new file mode 100644 index 0000000..3dd588f --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/andesite_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/andesite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/andesite_rock_medium.json b/src/main/generated/assets/rocks/models/block/andesite_rock_medium.json new file mode 100644 index 0000000..8239938 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/andesite_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/andesite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/andesite_rock_small.json b/src/main/generated/assets/rocks/models/block/andesite_rock_small.json new file mode 100644 index 0000000..6701757 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/andesite_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/andesite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/andesite_rock_tiny.json b/src/main/generated/assets/rocks/models/block/andesite_rock_tiny.json new file mode 100644 index 0000000..1a4e2c8 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/andesite_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/andesite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/bamboo_stick_large.json b/src/main/generated/assets/rocks/models/block/bamboo_stick_large.json new file mode 100644 index 0000000..cb26bde --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/bamboo_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/bamboo_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/bamboo_stick_medium.json b/src/main/generated/assets/rocks/models/block/bamboo_stick_medium.json new file mode 100644 index 0000000..31d7d8e --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/bamboo_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/bamboo_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/bamboo_stick_small.json b/src/main/generated/assets/rocks/models/block/bamboo_stick_small.json new file mode 100644 index 0000000..dc6db0a --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/bamboo_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/bamboo_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/birch_stick_large.json b/src/main/generated/assets/rocks/models/block/birch_stick_large.json new file mode 100644 index 0000000..b559e13 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/birch_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/birch_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/birch_stick_medium.json b/src/main/generated/assets/rocks/models/block/birch_stick_medium.json new file mode 100644 index 0000000..8b6e039 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/birch_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/birch_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/birch_stick_small.json b/src/main/generated/assets/rocks/models/block/birch_stick_small.json new file mode 100644 index 0000000..e831529 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/birch_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/birch_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/cherry_stick_large.json b/src/main/generated/assets/rocks/models/block/cherry_stick_large.json new file mode 100644 index 0000000..6f17046 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/cherry_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/cherry_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/cherry_stick_medium.json b/src/main/generated/assets/rocks/models/block/cherry_stick_medium.json new file mode 100644 index 0000000..f02b58b --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/cherry_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/cherry_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/cherry_stick_small.json b/src/main/generated/assets/rocks/models/block/cherry_stick_small.json new file mode 100644 index 0000000..8c0314f --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/cherry_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/cherry_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/crimson_stick_large.json b/src/main/generated/assets/rocks/models/block/crimson_stick_large.json new file mode 100644 index 0000000..c71e96f --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/crimson_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/crimson_stem" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/crimson_stick_medium.json b/src/main/generated/assets/rocks/models/block/crimson_stick_medium.json new file mode 100644 index 0000000..964e5ff --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/crimson_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/crimson_stem" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/crimson_stick_small.json b/src/main/generated/assets/rocks/models/block/crimson_stick_small.json new file mode 100644 index 0000000..31a2a3f --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/crimson_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/crimson_stem" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/dark_oak_stick_large.json b/src/main/generated/assets/rocks/models/block/dark_oak_stick_large.json new file mode 100644 index 0000000..35c017b --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/dark_oak_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/dark_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/dark_oak_stick_medium.json b/src/main/generated/assets/rocks/models/block/dark_oak_stick_medium.json new file mode 100644 index 0000000..a5e744e --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/dark_oak_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/dark_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/dark_oak_stick_small.json b/src/main/generated/assets/rocks/models/block/dark_oak_stick_small.json new file mode 100644 index 0000000..b2bebd1 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/dark_oak_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/dark_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/diorite_rock_large.json b/src/main/generated/assets/rocks/models/block/diorite_rock_large.json new file mode 100644 index 0000000..d149104 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/diorite_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/diorite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/diorite_rock_medium.json b/src/main/generated/assets/rocks/models/block/diorite_rock_medium.json new file mode 100644 index 0000000..9bb302e --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/diorite_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/diorite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/diorite_rock_small.json b/src/main/generated/assets/rocks/models/block/diorite_rock_small.json new file mode 100644 index 0000000..a6b1e55 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/diorite_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/diorite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/diorite_rock_tiny.json b/src/main/generated/assets/rocks/models/block/diorite_rock_tiny.json new file mode 100644 index 0000000..b3429e4 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/diorite_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/diorite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/end_stone_rock_large.json b/src/main/generated/assets/rocks/models/block/end_stone_rock_large.json new file mode 100644 index 0000000..5268cb2 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/end_stone_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/end_stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/end_stone_rock_medium.json b/src/main/generated/assets/rocks/models/block/end_stone_rock_medium.json new file mode 100644 index 0000000..90d2387 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/end_stone_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/end_stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/end_stone_rock_small.json b/src/main/generated/assets/rocks/models/block/end_stone_rock_small.json new file mode 100644 index 0000000..b7ac719 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/end_stone_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/end_stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/end_stone_rock_tiny.json b/src/main/generated/assets/rocks/models/block/end_stone_rock_tiny.json new file mode 100644 index 0000000..e8116bf --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/end_stone_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/end_stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/granite_rock_large.json b/src/main/generated/assets/rocks/models/block/granite_rock_large.json new file mode 100644 index 0000000..15604cd --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/granite_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/granite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/granite_rock_medium.json b/src/main/generated/assets/rocks/models/block/granite_rock_medium.json new file mode 100644 index 0000000..0f06860 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/granite_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/granite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/granite_rock_small.json b/src/main/generated/assets/rocks/models/block/granite_rock_small.json new file mode 100644 index 0000000..109c275 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/granite_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/granite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/granite_rock_tiny.json b/src/main/generated/assets/rocks/models/block/granite_rock_tiny.json new file mode 100644 index 0000000..c2f7f1a --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/granite_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/granite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/gravel_rock_large.json b/src/main/generated/assets/rocks/models/block/gravel_rock_large.json new file mode 100644 index 0000000..5714d8e --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/gravel_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/gravel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/gravel_rock_medium.json b/src/main/generated/assets/rocks/models/block/gravel_rock_medium.json new file mode 100644 index 0000000..5bdce15 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/gravel_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/gravel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/gravel_rock_small.json b/src/main/generated/assets/rocks/models/block/gravel_rock_small.json new file mode 100644 index 0000000..c1d4c2c --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/gravel_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/gravel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/gravel_rock_tiny.json b/src/main/generated/assets/rocks/models/block/gravel_rock_tiny.json new file mode 100644 index 0000000..c64d9b9 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/gravel_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/gravel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/ice_rock_large.json b/src/main/generated/assets/rocks/models/block/ice_rock_large.json new file mode 100644 index 0000000..1a713ea --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/ice_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/ice" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/ice_rock_medium.json b/src/main/generated/assets/rocks/models/block/ice_rock_medium.json new file mode 100644 index 0000000..1012df5 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/ice_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/ice" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/ice_rock_small.json b/src/main/generated/assets/rocks/models/block/ice_rock_small.json new file mode 100644 index 0000000..5acece4 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/ice_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/ice" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/ice_rock_tiny.json b/src/main/generated/assets/rocks/models/block/ice_rock_tiny.json new file mode 100644 index 0000000..e5cbba4 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/ice_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/ice" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/jungle_stick_large.json b/src/main/generated/assets/rocks/models/block/jungle_stick_large.json new file mode 100644 index 0000000..e73f0f7 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/jungle_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/jungle_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/jungle_stick_medium.json b/src/main/generated/assets/rocks/models/block/jungle_stick_medium.json new file mode 100644 index 0000000..057fe82 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/jungle_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/jungle_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/jungle_stick_small.json b/src/main/generated/assets/rocks/models/block/jungle_stick_small.json new file mode 100644 index 0000000..a004848 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/jungle_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/jungle_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/mangrove_stick_large.json b/src/main/generated/assets/rocks/models/block/mangrove_stick_large.json new file mode 100644 index 0000000..592885f --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/mangrove_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/mangrove_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/mangrove_stick_medium.json b/src/main/generated/assets/rocks/models/block/mangrove_stick_medium.json new file mode 100644 index 0000000..d06f58d --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/mangrove_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/mangrove_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/mangrove_stick_small.json b/src/main/generated/assets/rocks/models/block/mangrove_stick_small.json new file mode 100644 index 0000000..7ca7899 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/mangrove_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/mangrove_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/netherrack_rock_large.json b/src/main/generated/assets/rocks/models/block/netherrack_rock_large.json new file mode 100644 index 0000000..be489cc --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/netherrack_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/netherrack" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/netherrack_rock_medium.json b/src/main/generated/assets/rocks/models/block/netherrack_rock_medium.json new file mode 100644 index 0000000..cbd0e1e --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/netherrack_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/netherrack" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/netherrack_rock_small.json b/src/main/generated/assets/rocks/models/block/netherrack_rock_small.json new file mode 100644 index 0000000..b16af11 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/netherrack_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/netherrack" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/netherrack_rock_tiny.json b/src/main/generated/assets/rocks/models/block/netherrack_rock_tiny.json new file mode 100644 index 0000000..f98d4ec --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/netherrack_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/netherrack" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/oak_stick_large.json b/src/main/generated/assets/rocks/models/block/oak_stick_large.json new file mode 100644 index 0000000..b33f1fe --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/oak_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/oak_stick_medium.json b/src/main/generated/assets/rocks/models/block/oak_stick_medium.json new file mode 100644 index 0000000..63883a8 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/oak_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/oak_stick_small.json b/src/main/generated/assets/rocks/models/block/oak_stick_small.json new file mode 100644 index 0000000..6b62910 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/oak_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/pale_oak_stick_large.json b/src/main/generated/assets/rocks/models/block/pale_oak_stick_large.json new file mode 100644 index 0000000..de038ee --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/pale_oak_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/pale_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/pale_oak_stick_medium.json b/src/main/generated/assets/rocks/models/block/pale_oak_stick_medium.json new file mode 100644 index 0000000..9580d18 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/pale_oak_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/pale_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/pale_oak_stick_small.json b/src/main/generated/assets/rocks/models/block/pale_oak_stick_small.json new file mode 100644 index 0000000..bf4131d --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/pale_oak_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/pale_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/red_sand_rock_large.json b/src/main/generated/assets/rocks/models/block/red_sand_rock_large.json new file mode 100644 index 0000000..bcdccde --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/red_sand_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/red_sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/red_sand_rock_medium.json b/src/main/generated/assets/rocks/models/block/red_sand_rock_medium.json new file mode 100644 index 0000000..c465a27 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/red_sand_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/red_sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/red_sand_rock_small.json b/src/main/generated/assets/rocks/models/block/red_sand_rock_small.json new file mode 100644 index 0000000..7ee079e --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/red_sand_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/red_sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/red_sand_rock_tiny.json b/src/main/generated/assets/rocks/models/block/red_sand_rock_tiny.json new file mode 100644 index 0000000..51e8b0c --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/red_sand_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/red_sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/rock_large.json b/src/main/generated/assets/rocks/models/block/rock_large.json new file mode 100644 index 0000000..101e35d --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/rock_medium.json b/src/main/generated/assets/rocks/models/block/rock_medium.json new file mode 100644 index 0000000..fca8b18 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/rock_small.json b/src/main/generated/assets/rocks/models/block/rock_small.json new file mode 100644 index 0000000..05c4c1c --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/rock_tiny.json b/src/main/generated/assets/rocks/models/block/rock_tiny.json new file mode 100644 index 0000000..83d77e4 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/sand_rock_large.json b/src/main/generated/assets/rocks/models/block/sand_rock_large.json new file mode 100644 index 0000000..779fad0 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/sand_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/sand_rock_medium.json b/src/main/generated/assets/rocks/models/block/sand_rock_medium.json new file mode 100644 index 0000000..48a32d2 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/sand_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/sand_rock_small.json b/src/main/generated/assets/rocks/models/block/sand_rock_small.json new file mode 100644 index 0000000..9205b6a --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/sand_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/sand_rock_tiny.json b/src/main/generated/assets/rocks/models/block/sand_rock_tiny.json new file mode 100644 index 0000000..6e23dc9 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/sand_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/soul_soil_rock_large.json b/src/main/generated/assets/rocks/models/block/soul_soil_rock_large.json new file mode 100644 index 0000000..a8a1602 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/soul_soil_rock_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_rock", + "textures": { + "0": "minecraft:block/soul_soil" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/soul_soil_rock_medium.json b/src/main/generated/assets/rocks/models/block/soul_soil_rock_medium.json new file mode 100644 index 0000000..05521cc --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/soul_soil_rock_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_rock", + "textures": { + "0": "minecraft:block/soul_soil" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/soul_soil_rock_small.json b/src/main/generated/assets/rocks/models/block/soul_soil_rock_small.json new file mode 100644 index 0000000..12826fd --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/soul_soil_rock_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_rock", + "textures": { + "0": "minecraft:block/soul_soil" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/soul_soil_rock_tiny.json b/src/main/generated/assets/rocks/models/block/soul_soil_rock_tiny.json new file mode 100644 index 0000000..4fa4e68 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/soul_soil_rock_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/tiny_rock", + "textures": { + "0": "minecraft:block/soul_soil" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/spruce_stick_large.json b/src/main/generated/assets/rocks/models/block/spruce_stick_large.json new file mode 100644 index 0000000..b18e93d --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/spruce_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/spruce_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/spruce_stick_medium.json b/src/main/generated/assets/rocks/models/block/spruce_stick_medium.json new file mode 100644 index 0000000..473c282 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/spruce_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/spruce_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/spruce_stick_small.json b/src/main/generated/assets/rocks/models/block/spruce_stick_small.json new file mode 100644 index 0000000..8cce4e6 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/spruce_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/spruce_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/warped_stick_large.json b/src/main/generated/assets/rocks/models/block/warped_stick_large.json new file mode 100644 index 0000000..ecd7d13 --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/warped_stick_large.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/large_stick", + "textures": { + "0": "minecraft:block/warped_stem" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/warped_stick_medium.json b/src/main/generated/assets/rocks/models/block/warped_stick_medium.json new file mode 100644 index 0000000..515df9b --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/warped_stick_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/medium_stick", + "textures": { + "0": "minecraft:block/warped_stem" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/block/warped_stick_small.json b/src/main/generated/assets/rocks/models/block/warped_stick_small.json new file mode 100644 index 0000000..7b7e14c --- /dev/null +++ b/src/main/generated/assets/rocks/models/block/warped_stick_small.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:block/small_stick", + "textures": { + "0": "minecraft:block/warped_stem" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/acacia_stick.json b/src/main/generated/assets/rocks/models/item/acacia_stick.json new file mode 100644 index 0000000..ea84113 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/acacia_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/acacia_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/andesite_rock.json b/src/main/generated/assets/rocks/models/item/andesite_rock.json new file mode 100644 index 0000000..bd200d2 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/andesite_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/andesite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/andesite_splitter.json b/src/main/generated/assets/rocks/models/item/andesite_splitter.json new file mode 100644 index 0000000..d511214 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/andesite_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/andesite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/bamboo_stick.json b/src/main/generated/assets/rocks/models/item/bamboo_stick.json new file mode 100644 index 0000000..aba0ab5 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/bamboo_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/bamboo_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/birch_stick.json b/src/main/generated/assets/rocks/models/item/birch_stick.json new file mode 100644 index 0000000..19b3ea5 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/birch_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/birch_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/cherry_stick.json b/src/main/generated/assets/rocks/models/item/cherry_stick.json new file mode 100644 index 0000000..52d9a90 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/cherry_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/cherry_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/cobblestone_splitter.json b/src/main/generated/assets/rocks/models/item/cobblestone_splitter.json new file mode 100644 index 0000000..a7f4894 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/cobblestone_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/crimson_stick.json b/src/main/generated/assets/rocks/models/item/crimson_stick.json new file mode 100644 index 0000000..1a0ecde --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/crimson_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/crimson_stem" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/dark_oak_stick.json b/src/main/generated/assets/rocks/models/item/dark_oak_stick.json new file mode 100644 index 0000000..e5bdc37 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/dark_oak_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/dark_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/diorite_rock.json b/src/main/generated/assets/rocks/models/item/diorite_rock.json new file mode 100644 index 0000000..6c4bfad --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/diorite_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/diorite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/diorite_splitter.json b/src/main/generated/assets/rocks/models/item/diorite_splitter.json new file mode 100644 index 0000000..51c0d70 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/diorite_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/diorite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/end_stone_rock.json b/src/main/generated/assets/rocks/models/item/end_stone_rock.json new file mode 100644 index 0000000..fb5f677 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/end_stone_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/end_stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/end_stone_splitter.json b/src/main/generated/assets/rocks/models/item/end_stone_splitter.json new file mode 100644 index 0000000..e0578db --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/end_stone_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/end_stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/granite_rock.json b/src/main/generated/assets/rocks/models/item/granite_rock.json new file mode 100644 index 0000000..9acf0a8 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/granite_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/granite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/granite_splitter.json b/src/main/generated/assets/rocks/models/item/granite_splitter.json new file mode 100644 index 0000000..9c52c85 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/granite_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/granite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/gravel_rock.json b/src/main/generated/assets/rocks/models/item/gravel_rock.json new file mode 100644 index 0000000..34974d0 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/gravel_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/gravel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/ice_rock.json b/src/main/generated/assets/rocks/models/item/ice_rock.json new file mode 100644 index 0000000..902f33a --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/ice_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/ice" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/ice_splitter.json b/src/main/generated/assets/rocks/models/item/ice_splitter.json new file mode 100644 index 0000000..0ec3e3a --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/ice_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/ice" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/jungle_stick.json b/src/main/generated/assets/rocks/models/item/jungle_stick.json new file mode 100644 index 0000000..ed43125 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/jungle_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/jungle_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/mangrove_stick.json b/src/main/generated/assets/rocks/models/item/mangrove_stick.json new file mode 100644 index 0000000..c990e33 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/mangrove_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/mangrove_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/netherrack_rock.json b/src/main/generated/assets/rocks/models/item/netherrack_rock.json new file mode 100644 index 0000000..d60322b --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/netherrack_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/netherrack" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/netherrack_splitter.json b/src/main/generated/assets/rocks/models/item/netherrack_splitter.json new file mode 100644 index 0000000..b4b808e --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/netherrack_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/netherrack" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/oak_stick.json b/src/main/generated/assets/rocks/models/item/oak_stick.json new file mode 100644 index 0000000..b97eb11 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/oak_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/pale_oak_stick.json b/src/main/generated/assets/rocks/models/item/pale_oak_stick.json new file mode 100644 index 0000000..b8ba0f8 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/pale_oak_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/pale_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/red_sand_rock.json b/src/main/generated/assets/rocks/models/item/red_sand_rock.json new file mode 100644 index 0000000..dba12a0 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/red_sand_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/red_sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/red_sandstone_splitter.json b/src/main/generated/assets/rocks/models/item/red_sandstone_splitter.json new file mode 100644 index 0000000..d603dae --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/red_sandstone_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/red_sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/rock.json b/src/main/generated/assets/rocks/models/item/rock.json new file mode 100644 index 0000000..52fe02d --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/stone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/sand_rock.json b/src/main/generated/assets/rocks/models/item/sand_rock.json new file mode 100644 index 0000000..13377aa --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/sand_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/sandstone_splitter.json b/src/main/generated/assets/rocks/models/item/sandstone_splitter.json new file mode 100644 index 0000000..2c63c19 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/sandstone_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/sandstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/soul_soil_rock.json b/src/main/generated/assets/rocks/models/item/soul_soil_rock.json new file mode 100644 index 0000000..2e21b65 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/soul_soil_rock.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/rock_base", + "textures": { + "0": "minecraft:block/soul_soil" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/soul_soil_splitter.json b/src/main/generated/assets/rocks/models/item/soul_soil_splitter.json new file mode 100644 index 0000000..da9e3f5 --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/soul_soil_splitter.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/splitter_base", + "textures": { + "0": "minecraft:block/soul_soil" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/spruce_stick.json b/src/main/generated/assets/rocks/models/item/spruce_stick.json new file mode 100644 index 0000000..5bcf40a --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/spruce_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/spruce_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/rocks/models/item/warped_stick.json b/src/main/generated/assets/rocks/models/item/warped_stick.json new file mode 100644 index 0000000..6ba2e2a --- /dev/null +++ b/src/main/generated/assets/rocks/models/item/warped_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "rocks:item/stick_base", + "textures": { + "0": "minecraft:block/warped_stem" + } +} \ No newline at end of file diff --git a/src/main/generated/data/rocks/loot_table/blocks/pale_oak_stick.json b/src/main/generated/data/rocks/loot_table/blocks/pale_oak_stick.json new file mode 100644 index 0000000..6f11351 --- /dev/null +++ b/src/main/generated/data/rocks/loot_table/blocks/pale_oak_stick.json @@ -0,0 +1,41 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "rocks:pale_oak_stick" + }, + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/rocks/recipe/andesite_from_splitter.json b/src/main/generated/data/rocks/recipe/andesite_from_splitter.json index 83dd7df..71736aa 100644 --- a/src/main/generated/data/rocks/recipe/andesite_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/andesite_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:andesite_splitter" - }, - { - "item": "rocks:andesite_splitter" - }, - { - "item": "rocks:andesite_splitter" - }, - { - "item": "rocks:andesite_splitter" - } + "rocks:andesite_splitter", + "rocks:andesite_splitter", + "rocks:andesite_splitter", + "rocks:andesite_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/diorite_from_splitter.json b/src/main/generated/data/rocks/recipe/diorite_from_splitter.json index 0d929bb..5f94cd5 100644 --- a/src/main/generated/data/rocks/recipe/diorite_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/diorite_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:diorite_splitter" - }, - { - "item": "rocks:diorite_splitter" - }, - { - "item": "rocks:diorite_splitter" - }, - { - "item": "rocks:diorite_splitter" - } + "rocks:diorite_splitter", + "rocks:diorite_splitter", + "rocks:diorite_splitter", + "rocks:diorite_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/end_stone_from_splitter.json b/src/main/generated/data/rocks/recipe/end_stone_from_splitter.json index 70e2869..c7e69a7 100644 --- a/src/main/generated/data/rocks/recipe/end_stone_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/end_stone_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:end_stone_splitter" - }, - { - "item": "rocks:end_stone_splitter" - }, - { - "item": "rocks:end_stone_splitter" - }, - { - "item": "rocks:end_stone_splitter" - } + "rocks:end_stone_splitter", + "rocks:end_stone_splitter", + "rocks:end_stone_splitter", + "rocks:end_stone_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/granite_from_splitter.json b/src/main/generated/data/rocks/recipe/granite_from_splitter.json index bb2326b..5274ef2 100644 --- a/src/main/generated/data/rocks/recipe/granite_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/granite_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:granite_splitter" - }, - { - "item": "rocks:granite_splitter" - }, - { - "item": "rocks:granite_splitter" - }, - { - "item": "rocks:granite_splitter" - } + "rocks:granite_splitter", + "rocks:granite_splitter", + "rocks:granite_splitter", + "rocks:granite_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/ice_from_splitter.json b/src/main/generated/data/rocks/recipe/ice_from_splitter.json index 2ff0af6..7a01a15 100644 --- a/src/main/generated/data/rocks/recipe/ice_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/ice_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:ice_splitter" - }, - { - "item": "rocks:ice_splitter" - }, - { - "item": "rocks:ice_splitter" - }, - { - "item": "rocks:ice_splitter" - } + "rocks:ice_splitter", + "rocks:ice_splitter", + "rocks:ice_splitter", + "rocks:ice_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/netherrack_from_splitter.json b/src/main/generated/data/rocks/recipe/netherrack_from_splitter.json index 4e09024..b8b0685 100644 --- a/src/main/generated/data/rocks/recipe/netherrack_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/netherrack_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:netherrack_splitter" - }, - { - "item": "rocks:netherrack_splitter" - }, - { - "item": "rocks:netherrack_splitter" - }, - { - "item": "rocks:netherrack_splitter" - } + "rocks:netherrack_splitter", + "rocks:netherrack_splitter", + "rocks:netherrack_splitter", + "rocks:netherrack_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/red_sandstone_from_splitter.json b/src/main/generated/data/rocks/recipe/red_sandstone_from_splitter.json index 22f689e..4dfe261 100644 --- a/src/main/generated/data/rocks/recipe/red_sandstone_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/red_sandstone_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:red_sandstone_splitter" - }, - { - "item": "rocks:red_sandstone_splitter" - }, - { - "item": "rocks:red_sandstone_splitter" - }, - { - "item": "rocks:red_sandstone_splitter" - } + "rocks:red_sandstone_splitter", + "rocks:red_sandstone_splitter", + "rocks:red_sandstone_splitter", + "rocks:red_sandstone_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/sandstone_from_splitter.json b/src/main/generated/data/rocks/recipe/sandstone_from_splitter.json index 935e73b..3f95f9e 100644 --- a/src/main/generated/data/rocks/recipe/sandstone_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/sandstone_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:sandstone_splitter" - }, - { - "item": "rocks:sandstone_splitter" - }, - { - "item": "rocks:sandstone_splitter" - }, - { - "item": "rocks:sandstone_splitter" - } + "rocks:sandstone_splitter", + "rocks:sandstone_splitter", + "rocks:sandstone_splitter", + "rocks:sandstone_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/soul_soil_from_splitter.json b/src/main/generated/data/rocks/recipe/soul_soil_from_splitter.json index 3f0bf2d..ca50d3b 100644 --- a/src/main/generated/data/rocks/recipe/soul_soil_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/soul_soil_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:soul_soil_splitter" - }, - { - "item": "rocks:soul_soil_splitter" - }, - { - "item": "rocks:soul_soil_splitter" - }, - { - "item": "rocks:soul_soil_splitter" - } + "rocks:soul_soil_splitter", + "rocks:soul_soil_splitter", + "rocks:soul_soil_splitter", + "rocks:soul_soil_splitter" ], "result": { "count": 1, diff --git a/src/main/generated/data/rocks/recipe/stone_from_splitter.json b/src/main/generated/data/rocks/recipe/stone_from_splitter.json index edd8d8d..c7fed2c 100644 --- a/src/main/generated/data/rocks/recipe/stone_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/stone_from_splitter.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "building", "ingredients": [ - { - "item": "rocks:cobblestone_splitter" - }, - { - "item": "rocks:cobblestone_splitter" - }, - { - "item": "rocks:cobblestone_splitter" - }, - { - "item": "rocks:cobblestone_splitter" - } + "rocks:cobblestone_splitter", + "rocks:cobblestone_splitter", + "rocks:cobblestone_splitter", + "rocks:cobblestone_splitter" ], "result": { "count": 1, diff --git a/src/main/java/eu/midnightdust/motschen/rocks/RocksClient.java b/src/main/java/eu/midnightdust/motschen/rocks/RocksClient.java index 9f09e7a..94cc537 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/RocksClient.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/RocksClient.java @@ -4,10 +4,8 @@ import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation; import eu.midnightdust.motschen.rocks.networking.HelloPayload; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.minecraft.client.item.ModelPredicateProviderRegistry; import net.minecraft.component.DataComponentTypes; import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; import java.util.Objects; @@ -18,10 +16,10 @@ public class RocksClient implements ClientModInitializer { public void onInitializeClient() { ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> sender.sendPacket(new HelloPayload())); - for (StarfishVariation variation : StarfishVariation.values()) { - ModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), Identifier.of(variation.toString()), - (stack, world, entity, seed) -> matchesVariation(stack, variation)); - } +// for (StarfishVariation variation : StarfishVariation.values()) { +// ModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), Identifier.of(variation.toString()), +// (stack, world, entity, seed) -> matchesVariation(stack, variation)); +// } } private static Integer matchesVariation(ItemStack stack, StarfishVariation variation) { var blockStateData = stack.getComponents().get(DataComponentTypes.BLOCK_STATE); diff --git a/src/main/java/eu/midnightdust/motschen/rocks/RocksDataGen.java b/src/main/java/eu/midnightdust/motschen/rocks/RocksDataGen.java index f504e4b..6c1e9ce 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/RocksDataGen.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/RocksDataGen.java @@ -1,8 +1,6 @@ package eu.midnightdust.motschen.rocks; -import eu.midnightdust.motschen.rocks.datagen.LootTables; -import eu.midnightdust.motschen.rocks.datagen.Recipes; -import eu.midnightdust.motschen.rocks.datagen.Tags; +import eu.midnightdust.motschen.rocks.datagen.*; import eu.midnightdust.motschen.rocks.world.configured_feature.MiscFeatures; import eu.midnightdust.motschen.rocks.world.configured_feature.NetherFeatures; import eu.midnightdust.motschen.rocks.world.configured_feature.RockFeatures; @@ -25,7 +23,10 @@ public class RocksDataGen implements DataGeneratorEntrypoint { pack.addProvider(LootTables.BlockLootTables::new); pack.addProvider(Tags.Blocks::new); pack.addProvider(Recipes::new); - System.out.println("out"); + pack.addProvider(Language.English::new); + pack.addProvider(Language.German::new); + + pack.addProvider(Models::new); } @Override public String getEffectiveModId() { @@ -34,7 +35,6 @@ public class RocksDataGen implements DataGeneratorEntrypoint { @Override public void buildRegistry(RegistryBuilder registryBuilder) { - System.out.println("building registry"); registryBuilder.addRegistry(RegistryKeys.CONFIGURED_FEATURE, RockFeatures::initConfigured); registryBuilder.addRegistry(RegistryKeys.PLACED_FEATURE, RockFeatures::initPlaced); registryBuilder.addRegistry(RegistryKeys.CONFIGURED_FEATURE, StickFeatures::initConfigured); @@ -52,9 +52,8 @@ public class RocksDataGen implements DataGeneratorEntrypoint { @Override protected void configure(RegistryWrapper.WrapperLookup registries, Entries entries) { - System.out.println("configure"); - entries.addAll(registries.getWrapperOrThrow(RegistryKeys.CONFIGURED_FEATURE)); - entries.addAll(registries.getWrapperOrThrow(RegistryKeys.PLACED_FEATURE)); + entries.addAll(registries.getOrThrow(RegistryKeys.CONFIGURED_FEATURE)); + entries.addAll(registries.getOrThrow(RegistryKeys.PLACED_FEATURE)); } @Override diff --git a/src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java b/src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java index 643945c..19ee139 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java @@ -54,6 +54,12 @@ public class RocksMain implements ModInitializer { public static Map sticksByType = new HashMap<>(); public static Map splittersByType = new HashMap<>(); + public static final Identifier PINECONE = id("pinecone"); + public static final Identifier SEASHELL = id("seashell"); + public static final Identifier STARFISH = id("starfish"); + public static final Identifier GEYSER = id("geyser"); + public static final Identifier NETHER_GEYSER = id("nether_geyser"); + public static Block Pinecone; public static Block Seashell; public static Block Starfish; @@ -66,7 +72,7 @@ public class RocksMain implements ModInitializer { @Override public void onInitialize() { - RocksConfig.init("rocks", RocksConfig.class); + RocksConfig.init(MOD_ID, RocksConfig.class); if (polymerMode) polymerMode = RocksConfig.enablePolymerMode && !PlatformFunctions.isClientEnv(); PayloadTypeRegistry.playC2S().register(HelloPayload.PACKET_ID, HelloPayload.codec); @@ -81,23 +87,24 @@ public class RocksMain implements ModInitializer { if (polymerMode) PolyUtil.init(); for (RockType type : RockType.values()) { - rocksByType.put(type, registerBlockWithItem(id(type.getName()), polymerMode ? newRockPolymer() : new Rock())); - } - for (RockType type : RockType.values()) { + Identifier id = id(type.getName()); + rocksByType.put(type, registerBlockWithItem(id, polymerMode ? newRockPolymer(id) : new Rock(id))); + if (type != RockType.GRAVEL) - splittersByType.put(type, registerItem(id(type.getSplitterName()), simpleItem())); + splittersByType.put(type, registerItem(id(type.getSplitterName()), simpleItem(id(type.getSplitterName())))); } for (WoodType type : WoodType.stream().toList()) { - sticksByType.put(type, registerBlockWithItem(id(type.name()+"_stick"), polymerMode ? newStickPolymer() : new Stick())); + Identifier id = id(type.name()+"_stick"); + sticksByType.put(type, registerBlockWithItem(id, polymerMode ? newStickPolymer(id) : new Stick(id))); } - Pinecone = registerBlockWithItem(Identifier.of(MOD_ID,"pinecone"), polymerMode ? newPineconePolymer() : new Pinecone()); - Seashell = registerBlockWithItem(Identifier.of(MOD_ID,"seashell"), polymerMode ? newSeashellPolymer() : new Seashell()); - Starfish = registerBlockWithItem(Identifier.of(MOD_ID,"starfish"), polymerMode ? newStarfishPolymer() : new Starfish()); + Pinecone = registerBlockWithItem(PINECONE, polymerMode ? newPineconePolymer(PINECONE) : new Pinecone(PINECONE)); + Seashell = registerBlockWithItem(SEASHELL, polymerMode ? newSeashellPolymer(SEASHELL) : new Seashell(SEASHELL)); + Starfish = registerBlockWithItem(STARFISH, polymerMode ? newStarfishPolymer(STARFISH) : new Starfish(STARFISH)); - Geyser = registerBlockWithItem(Identifier.of(MOD_ID,"geyser"), polymerMode ? newOverworldGeyserPolymer() : new OverworldGeyser()); - NetherGeyser = registerBlockWithItem(Identifier.of(MOD_ID,"nether_geyser"), polymerMode ? newNetherGeyserPolymer() : new NetherGeyser()); + Geyser = registerBlockWithItem(GEYSER, polymerMode ? newOverworldGeyserPolymer(GEYSER) : new OverworldGeyser(GEYSER)); + NetherGeyser = registerBlockWithItem(NETHER_GEYSER, polymerMode ? newNetherGeyserPolymer(NETHER_GEYSER) : new NetherGeyser(NETHER_GEYSER)); registerItemGroup(); @@ -117,9 +124,9 @@ public class RocksMain implements ModInitializer { PlatformFunctions.isModLoaded("factorytools"); } - public static Item simpleItem() { - if (polymerMode) return PolyUtil.simplePolymerItem(); - return new Item(new Item.Settings()); + public static Item simpleItem(Identifier id) { + if (polymerMode) return PolyUtil.simplePolymerItem(id); + return new Item(new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, id))); } public static void registerItemGroup() { diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/NetherGeyser.java b/src/main/java/eu/midnightdust/motschen/rocks/block/NetherGeyser.java index 9485de7..101f1bc 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/NetherGeyser.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/NetherGeyser.java @@ -3,15 +3,17 @@ package eu.midnightdust.motschen.rocks.block; import com.mojang.serialization.MapCodec; import eu.midnightdust.motschen.rocks.block.blockentity.BlockEntityInit; import eu.midnightdust.motschen.rocks.block.blockentity.NetherGeyserBlockEntity; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; @@ -27,8 +29,8 @@ public class NetherGeyser extends BlockWithEntity implements BlockEntityProvider private static final VoxelShape SHAPE; public static final BooleanProperty ACTIVE = BooleanProperty.of("active"); - public NetherGeyser() { - super(AbstractBlock.Settings.copy(Blocks.STONE).strength(10).noCollision().dynamicBounds().nonOpaque().sounds(BlockSoundGroup.STONE)); + public NetherGeyser(Identifier blockId) { + super(AbstractBlock.Settings.copy(Blocks.STONE).registryKey(RegistryKey.of(RegistryKeys.BLOCK, blockId)).strength(10).noCollision().dynamicBounds().nonOpaque().sounds(BlockSoundGroup.STONE)); this.setDefaultState(this.stateManager.getDefaultState().with(ACTIVE, false)); } @@ -67,6 +69,7 @@ public class NetherGeyser extends BlockWithEntity implements BlockEntityProvider SHAPE = createCuboidShape(5, 0, 5, 11, 1, 11); } + @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP); } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/OverworldGeyser.java b/src/main/java/eu/midnightdust/motschen/rocks/block/OverworldGeyser.java index 12a72a0..0427304 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/OverworldGeyser.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/OverworldGeyser.java @@ -3,16 +3,18 @@ package eu.midnightdust.motschen.rocks.block; import com.mojang.serialization.MapCodec; import eu.midnightdust.motschen.rocks.block.blockentity.BlockEntityInit; import eu.midnightdust.motschen.rocks.block.blockentity.OverworldGeyserBlockEntity; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; @@ -31,8 +33,8 @@ public class OverworldGeyser extends BlockWithEntity implements BlockEntityProvi public static final BooleanProperty ACTIVE = BooleanProperty.of("active"); public static final BooleanProperty SNOWY = Properties.SNOWY; - public OverworldGeyser() { - super(AbstractBlock.Settings.copy(Blocks.STONE).strength(10).noCollision().dynamicBounds().nonOpaque().sounds(BlockSoundGroup.STONE)); + public OverworldGeyser(Identifier blockId) { + super(AbstractBlock.Settings.copy(Blocks.STONE).registryKey(RegistryKey.of(RegistryKeys.BLOCK, blockId)).strength(10).noCollision().dynamicBounds().nonOpaque().sounds(BlockSoundGroup.STONE)); this.setDefaultState(this.stateManager.getDefaultState().with(ACTIVE, false).with(SNOWY, false)); } @@ -78,6 +80,7 @@ public class OverworldGeyser extends BlockWithEntity implements BlockEntityProvi SNOWY_SHAPE = snowy; } + @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP); } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/Pinecone.java b/src/main/java/eu/midnightdust/motschen/rocks/block/Pinecone.java index 5c772ac..e49f61b 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/Pinecone.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/Pinecone.java @@ -1,22 +1,25 @@ package eu.midnightdust.motschen.rocks.block; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; public class Pinecone extends Block { private static final VoxelShape SHAPE; - public Pinecone() { - super(AbstractBlock.Settings.copy(Blocks.POPPY).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.WOOD)); + public Pinecone(Identifier blockId) { + super(AbstractBlock.Settings.copy(Blocks.POPPY).registryKey(RegistryKey.of(RegistryKeys.BLOCK, blockId)).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.WOOD)); this.setDefaultState(this.stateManager.getDefaultState()); } @@ -31,9 +34,12 @@ public class Pinecone extends Block { public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP); } - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { - return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); + @Override + public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } - protected boolean isTransparent(BlockState state, BlockView world, BlockPos pos) {return true;} + @Override + protected boolean isTransparent(BlockState state) {return true;} + @Override protected boolean canReplace(BlockState state, ItemPlacementContext context) {return true;} } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/Rock.java b/src/main/java/eu/midnightdust/motschen/rocks/block/Rock.java index 30d0873..ffaf098 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/Rock.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/Rock.java @@ -5,19 +5,24 @@ import eu.midnightdust.motschen.rocks.blockstates.RockVariation; import net.minecraft.block.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.Objects; @@ -27,8 +32,8 @@ public class Rock extends Block { private static final VoxelShape SHAPE_LARGE; private static final EnumProperty ROCK_VARIATION = RocksMain.ROCK_VARIATION; - public Rock() { - super(AbstractBlock.Settings.copy(Blocks.POPPY).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.STONE)); + public Rock(Identifier blockId) { + super(AbstractBlock.Settings.copy(Blocks.POPPY).registryKey(RegistryKey.of(RegistryKeys.BLOCK, blockId)).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.STONE)); this.setDefaultState(this.stateManager.getDefaultState().with(ROCK_VARIATION, RockVariation.TINY)); } @@ -59,12 +64,16 @@ public class Rock extends Block { SHAPE_LARGE = createCuboidShape(0, 0, 0, 16, 3, 16); } + @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP); } - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { - return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); + @Override + public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } - protected boolean isTransparent(BlockState state, BlockView world, BlockPos pos) {return true;} + @Override + protected boolean isTransparent(BlockState state) {return true;} + @Override protected boolean canReplace(BlockState state, ItemPlacementContext context) {return true;} } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/Seashell.java b/src/main/java/eu/midnightdust/motschen/rocks/block/Seashell.java index c7d660b..ffd6d49 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/Seashell.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/Seashell.java @@ -1,29 +1,30 @@ package eu.midnightdust.motschen.rocks.block; import eu.midnightdust.motschen.rocks.RocksMain; -import eu.midnightdust.motschen.rocks.blockstates.RockVariation; import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.Objects; @@ -33,8 +34,8 @@ public class Seashell extends Block implements Waterloggable { private static final EnumProperty SEASHELL_VARIATION = RocksMain.SEASHELL_VARIATION; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; - public Seashell() { - super(AbstractBlock.Settings.copy(Blocks.POPPY).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.STONE)); + public Seashell(Identifier blockId) { + super(AbstractBlock.Settings.copy(Blocks.POPPY).registryKey(RegistryKey.of(RegistryKeys.BLOCK, blockId)).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.STONE)); this.setDefaultState(this.stateManager.getDefaultState().with(SEASHELL_VARIATION, SeashellVariation.PINK).with(WATERLOGGED, false)); } @@ -72,11 +73,14 @@ public class Seashell extends Block implements Waterloggable { SHAPE = createCuboidShape(0, 0, 0, 16, 3, 16); } + @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP); } - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { - return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); + @Override + public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } + @Override protected boolean canReplace(BlockState state, ItemPlacementContext context) {return true;} } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/Starfish.java b/src/main/java/eu/midnightdust/motschen/rocks/block/Starfish.java index cbf5c0b..96bcfac 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/Starfish.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/Starfish.java @@ -1,9 +1,7 @@ package eu.midnightdust.motschen.rocks.block; import eu.midnightdust.motschen.rocks.RocksMain; -import eu.midnightdust.motschen.rocks.blockstates.RockVariation; import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.component.ComponentMap; import net.minecraft.component.DataComponentTypes; @@ -13,25 +11,28 @@ import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.Objects; -import static eu.midnightdust.motschen.rocks.RocksMain.STARFISH_VARIATION; +import static eu.midnightdust.motschen.rocks.RocksMain.id; public class Starfish extends Block implements Waterloggable { @@ -39,8 +40,8 @@ public class Starfish extends Block implements Waterloggable { private static final EnumProperty STARFISH_VARIATION = RocksMain.STARFISH_VARIATION; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; - public Starfish() { - super(AbstractBlock.Settings.copy(Blocks.POPPY).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.CORAL)); + public Starfish(Identifier blockId) { + super(AbstractBlock.Settings.copy(Blocks.POPPY).registryKey(RegistryKey.of(RegistryKeys.BLOCK, blockId)).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.CORAL)); this.setDefaultState(this.stateManager.getDefaultState().with(STARFISH_VARIATION, StarfishVariation.RED).with(WATERLOGGED, false)); } @@ -57,9 +58,9 @@ public class Starfish extends Block implements Waterloggable { .with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); } @Override - public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state) { + public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state, boolean includeData) { ItemStack stack = new ItemStack(this); - stack.applyComponentsFrom(ComponentMap.builder().add(DataComponentTypes.BLOCK_STATE, BlockStateComponent.DEFAULT.with(STARFISH_VARIATION, state.get(STARFISH_VARIATION))).build()); + stack.applyComponentsFrom(ComponentMap.builder().add(DataComponentTypes.ITEM_MODEL, id("starfish")).add(DataComponentTypes.BLOCK_STATE, BlockStateComponent.DEFAULT.with(STARFISH_VARIATION, state.get(STARFISH_VARIATION))).build()); return stack; } @@ -83,11 +84,14 @@ public class Starfish extends Block implements Waterloggable { SHAPE = createCuboidShape(0, 0, 0, 16, 1, 16); } + @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP); } - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { - return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); + @Override + public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } + @Override protected boolean canReplace(BlockState state, ItemPlacementContext context) {return true;} } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/Stick.java b/src/main/java/eu/midnightdust/motschen/rocks/block/Stick.java index 997d649..d739cf3 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/Stick.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/Stick.java @@ -1,27 +1,28 @@ package eu.midnightdust.motschen.rocks.block; import eu.midnightdust.motschen.rocks.RocksMain; -import eu.midnightdust.motschen.rocks.blockstates.RockVariation; import eu.midnightdust.motschen.rocks.blockstates.StickVariation; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.Objects; @@ -31,8 +32,8 @@ public class Stick extends Block { private static final EnumProperty STICK_VARIATION = RocksMain.STICK_VARIATION; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; - public Stick() { - super(AbstractBlock.Settings.copy(Blocks.POPPY).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.WOOD)); + public Stick(Identifier blockId) { + super(AbstractBlock.Settings.copy(Blocks.POPPY).registryKey(RegistryKey.of(RegistryKeys.BLOCK, blockId)).nonOpaque().dynamicBounds().sounds(BlockSoundGroup.WOOD)); this.setDefaultState(this.stateManager.getDefaultState().with(STICK_VARIATION, StickVariation.SMALL).with(WATERLOGGED, false)); } @@ -63,12 +64,16 @@ public class Stick extends Block { SHAPE = createCuboidShape(0, 0, 0, 16, 1, 16); } + @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP); } - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { - return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); + @Override + public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, world, tickView, pos, direction, neighborPos, neighborState, random); } - protected boolean isTransparent(BlockState state, BlockView world, BlockPos pos) {return true;} + @Override + protected boolean isTransparent(BlockState state) {return true;} + @Override protected boolean canReplace(BlockState state, ItemPlacementContext context) {return true;} } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/BlockEntityInit.java b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/BlockEntityInit.java index c2ae063..58e875a 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/BlockEntityInit.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/BlockEntityInit.java @@ -2,6 +2,7 @@ package eu.midnightdust.motschen.rocks.block.blockentity; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.util.polymer.PolyUtil; +import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; @@ -14,8 +15,8 @@ public class BlockEntityInit { public static BlockEntityType NETHER_GEYSER_BE; public static void init() { - OVERWORLD_GEYSER_BE = Registry.register(Registries.BLOCK_ENTITY_TYPE, Identifier.of(RocksMain.MOD_ID,"overworld_geyser_blockentity"), BlockEntityType.Builder.create(OverworldGeyserBlockEntity::new, RocksMain.Geyser).build(null)); - NETHER_GEYSER_BE = Registry.register(Registries.BLOCK_ENTITY_TYPE, Identifier.of(RocksMain.MOD_ID,"nether_geyser_blockentity"), BlockEntityType.Builder.create(NetherGeyserBlockEntity::new, RocksMain.NetherGeyser).build(null)); + OVERWORLD_GEYSER_BE = Registry.register(Registries.BLOCK_ENTITY_TYPE, Identifier.of(RocksMain.MOD_ID,"overworld_geyser_blockentity"), FabricBlockEntityTypeBuilder.create(OverworldGeyserBlockEntity::new, RocksMain.Geyser).build()); + NETHER_GEYSER_BE = Registry.register(Registries.BLOCK_ENTITY_TYPE, Identifier.of(RocksMain.MOD_ID,"nether_geyser_blockentity"), FabricBlockEntityTypeBuilder.create(NetherGeyserBlockEntity::new, RocksMain.NetherGeyser).build()); if (polymerMode) PolyUtil.registerBlockEntities(OVERWORLD_GEYSER_BE, NETHER_GEYSER_BE); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java index 73135ef..7cdfc39 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java @@ -9,6 +9,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.particle.ParticleTypes; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -30,10 +31,10 @@ public class NetherGeyserBlockEntity extends BlockEntity { if (player != null) { world.setBlockState(pos, state.with(NetherGeyser.ACTIVE, true)); - if (RocksConfig.netherGeyserDamage) { - player.damage(world.getDamageSources().onFire(), 1); + if (RocksConfig.netherGeyserDamage && world instanceof ServerWorld serverWorld) { + player.damage(serverWorld, world.getDamageSources().onFire(), 1); if (player2 != null) { - player2.damage(world.getDamageSources().onFire(), 4); + player2.damage(serverWorld, world.getDamageSources().onFire(), 4); } } blockEntity.countdown = 1000; diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java index 9cecae2..60ffe7b 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java @@ -11,24 +11,29 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.packettweaker.PacketContext; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; public class NetherGeyserPolymer extends NetherGeyser implements PolymerBlock, PolymerTexturedBlock, BlockWithElementHolder { - @Override + public NetherGeyserPolymer(Identifier blockId) { + super(blockId); + } + public BlockState getPolymerBlockState(BlockState state) { return PolyUtil.SMALL_BLOCK; } @Override - public BlockState getPolymerBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : getPolymerBlockState(state); + public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override - public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : Blocks.NETHERRACK.getDefaultState(); + public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : Blocks.NETHERRACK.getDefaultState(); } @Override @@ -37,7 +42,6 @@ public class NetherGeyserPolymer extends NetherGeyser implements PolymerBlock, P } @Override - public boolean canSyncRawToClient(@Nullable ServerPlayerEntity player) { - return hasModOnClient(player); - } + public boolean canSyncRawToClient(PacketContext context) {return hasModOnClient(context.getPlayer());} + } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java index 70b4376..13d86f7 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java @@ -11,24 +11,29 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.packettweaker.PacketContext; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; public class OverworldGeyserPolymer extends OverworldGeyser implements PolymerBlock, PolymerTexturedBlock, BlockWithElementHolder { - @Override + public OverworldGeyserPolymer(Identifier blockId) { + super(blockId); + } + public BlockState getPolymerBlockState(BlockState state) { return state.get(SNOWY) ? Blocks.SNOW.getDefaultState() : PolyUtil.SMALL_BLOCK; } @Override - public BlockState getPolymerBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : getPolymerBlockState(state); + public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override - public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : Blocks.SNOW.getDefaultState(); + public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : Blocks.SNOW.getDefaultState(); } @Override @@ -37,7 +42,7 @@ public class OverworldGeyserPolymer extends OverworldGeyser implements PolymerBl } @Override - public boolean canSyncRawToClient(@Nullable ServerPlayerEntity player) { - return hasModOnClient(player); + public boolean canSyncRawToClient(PacketContext context) { + return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java index 9faa289..5ee2c6e 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java @@ -13,24 +13,29 @@ import net.minecraft.block.enums.BlockFace; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.state.property.Properties; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.packettweaker.PacketContext; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; public class PineconePolymer extends Pinecone implements PolymerBlock, PolymerTexturedBlock, BlockWithElementHolder { - @Override + public PineconePolymer(Identifier blockId) { + super(blockId); + } + public BlockState getPolymerBlockState(BlockState state) { return PolyUtil.SMALL_BLOCK; } @Override - public BlockState getPolymerBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : getPolymerBlockState(state); + public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override - public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : Blocks.SPRUCE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); + public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : Blocks.SPRUCE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); } @Override @@ -39,7 +44,7 @@ public class PineconePolymer extends Pinecone implements PolymerBlock, PolymerTe } @Override - public boolean canSyncRawToClient(@Nullable ServerPlayerEntity player) { - return hasModOnClient(player); + public boolean canSyncRawToClient(PacketContext context) { + return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java index 882df1a..d2e2c88 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java @@ -13,24 +13,29 @@ import net.minecraft.block.enums.BlockFace; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.state.property.Properties; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.packettweaker.PacketContext; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; public class RockPolymer extends Rock implements PolymerBlock, PolymerTexturedBlock, BlockWithElementHolder { - @Override + public RockPolymer(Identifier blockId) { + super(blockId); + } + public BlockState getPolymerBlockState(BlockState state) { return PolyUtil.SMALL_BLOCK; } @Override - public BlockState getPolymerBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : getPolymerBlockState(state); + public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override - public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : Blocks.STONE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); + public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : Blocks.STONE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); } @Override @@ -39,7 +44,7 @@ public class RockPolymer extends Rock implements PolymerBlock, PolymerTexturedBl } @Override - public boolean canSyncRawToClient(@Nullable ServerPlayerEntity player) { - return hasModOnClient(player); + public boolean canSyncRawToClient(PacketContext context) { + return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java index 33466e7..46908bd 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java @@ -11,25 +11,30 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.packettweaker.PacketContext; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; public class SeashellPolymer extends Seashell implements PolymerBlock, PolymerTexturedBlock, BlockWithElementHolder { - @Override + public SeashellPolymer(Identifier blockId) { + super(blockId); + } + public BlockState getPolymerBlockState(BlockState state) { if (state.get(WATERLOGGED)) return PolyUtil.PASSABLE_WATERLOGGED_BLOCK; else return PolyUtil.SMALL_BLOCK; } @Override - public BlockState getPolymerBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : getPolymerBlockState(state); + public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override - public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : Blocks.WHITE_CANDLE.getDefaultState(); + public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : Blocks.WHITE_CANDLE.getDefaultState(); } @Override @@ -38,7 +43,7 @@ public class SeashellPolymer extends Seashell implements PolymerBlock, PolymerTe } @Override - public boolean canSyncRawToClient(@Nullable ServerPlayerEntity player) { - return hasModOnClient(player); + public boolean canSyncRawToClient(PacketContext context) { + return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java index 4e29d42..a9ccc76 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java @@ -11,25 +11,30 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.packettweaker.PacketContext; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; public class StarfishPolymer extends Starfish implements PolymerBlock, PolymerTexturedBlock, BlockWithElementHolder { - @Override + public StarfishPolymer(Identifier blockId) { + super(blockId); + } + public BlockState getPolymerBlockState(BlockState state) { if (state.get(WATERLOGGED)) return PolyUtil.PASSABLE_WATERLOGGED_BLOCK; else return PolyUtil.SMALL_BLOCK; } @Override - public BlockState getPolymerBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : getPolymerBlockState(state); + public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override - public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : Blocks.SEA_PICKLE.getDefaultState(); + public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : Blocks.SEA_PICKLE.getDefaultState(); } @Override @@ -38,7 +43,7 @@ public class StarfishPolymer extends Starfish implements PolymerBlock, PolymerTe } @Override - public boolean canSyncRawToClient(@Nullable ServerPlayerEntity player) { - return hasModOnClient(player); + public boolean canSyncRawToClient(PacketContext context) { + return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java index 0dbc3d0..4f69265 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java @@ -13,24 +13,29 @@ import net.minecraft.block.enums.BlockFace; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.state.property.Properties; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.packettweaker.PacketContext; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; public class StickPolymer extends Stick implements PolymerBlock, PolymerTexturedBlock, BlockWithElementHolder { - @Override + public StickPolymer(Identifier blockId) { + super(blockId); + } + public BlockState getPolymerBlockState(BlockState state) { return PolyUtil.SMALL_BLOCK; } @Override - public BlockState getPolymerBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : getPolymerBlockState(state); + public BlockState getPolymerBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state); } @Override - public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { - return hasModOnClient(player) ? state : Blocks.OAK_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); + public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) { + return hasModOnClient(context.getPlayer()) ? state : Blocks.OAK_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR); } @Override @@ -39,7 +44,7 @@ public class StickPolymer extends Stick implements PolymerBlock, PolymerTextured } @Override - public boolean canSyncRawToClient(@Nullable ServerPlayerEntity player) { - return hasModOnClient(player); + public boolean canSyncRawToClient(PacketContext context) { + return hasModOnClient(context.getPlayer()); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayNetherGeyserModel.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayNetherGeyserModel.java index ba498a2..f0a4e19 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayNetherGeyserModel.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayNetherGeyserModel.java @@ -3,7 +3,6 @@ package eu.midnightdust.motschen.rocks.block.polymer.model; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.block.NetherGeyser; import eu.midnightdust.motschen.rocks.config.RocksConfig; -import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment; @@ -23,7 +22,7 @@ public class ItemDisplayNetherGeyserModel extends ConditionalBlockModel { public static ItemStack NETHER; public static void initModels() { - NETHER = BaseItemProvider.requestModel(RocksMain.id("block/nether_geyser_off")); + NETHER = ItemDisplayElementUtil.getModel(RocksMain.id("block/nether_geyser_off")); } public ItemDisplayNetherGeyserModel(BlockState state, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayOverworldGeyserModel.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayOverworldGeyserModel.java index e75f2da..978b65e 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayOverworldGeyserModel.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayOverworldGeyserModel.java @@ -3,7 +3,6 @@ package eu.midnightdust.motschen.rocks.block.polymer.model; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.block.OverworldGeyser; import eu.midnightdust.motschen.rocks.config.RocksConfig; -import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment; @@ -24,7 +23,7 @@ public class ItemDisplayOverworldGeyserModel extends ConditionalBlockModel { public static ItemStack OVERWORLD; public static void initModels() { - OVERWORLD = BaseItemProvider.requestModel(RocksMain.id("block/geyser_off")); + OVERWORLD = ItemDisplayElementUtil.getModel(RocksMain.id("block/geyser_off")); } public ItemDisplayOverworldGeyserModel(BlockState state, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayPineconeModel.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayPineconeModel.java index 7061ef5..3e50b76 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayPineconeModel.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayPineconeModel.java @@ -2,7 +2,6 @@ package eu.midnightdust.motschen.rocks.block.polymer.model; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.config.RocksConfig; -import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement; import net.minecraft.block.BlockState; @@ -17,7 +16,7 @@ public class ItemDisplayPineconeModel extends ConditionalBlockModel { private static ItemStack PINECONE_MODEL; public static void initModels() { - PINECONE_MODEL = BaseItemProvider.requestModel(RocksMain.id("block/pinecone")); + PINECONE_MODEL = ItemDisplayElementUtil.getModel(RocksMain.id("block/pinecone")); } public ItemDisplayPineconeModel(BlockState state, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayRockModel.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayRockModel.java index 05d27f1..1dee679 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayRockModel.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayRockModel.java @@ -3,7 +3,6 @@ package eu.midnightdust.motschen.rocks.block.polymer.model; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.config.RocksConfig; import eu.midnightdust.motschen.rocks.util.RockType; -import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment; @@ -25,7 +24,7 @@ public class ItemDisplayRockModel extends ConditionalBlockModel { for (RockType type : RockType.values()) { var stacks = new ItemStack[4]; for (int i = 0; i < 4; i++) { - stacks[i] = BaseItemProvider.requestModel(RocksMain.id("block/"+type.getVariations()[i].getPath())); + stacks[i] = ItemDisplayElementUtil.getModel(RocksMain.id("block/"+type.getVariations()[i].getPath())); } models.put(type, stacks); } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplaySeashellModel.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplaySeashellModel.java index e9b471a..f3d892e 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplaySeashellModel.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplaySeashellModel.java @@ -2,7 +2,6 @@ package eu.midnightdust.motschen.rocks.block.polymer.model; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.config.RocksConfig; -import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment; @@ -20,9 +19,9 @@ public class ItemDisplaySeashellModel extends ConditionalBlockModel { public static ItemStack YELLOW; public static void initModels() { - PINK = BaseItemProvider.requestModel(RocksMain.id("block/seashell_pink")); - WHITE = BaseItemProvider.requestModel(RocksMain.id("block/seashell_white")); - YELLOW = BaseItemProvider.requestModel(RocksMain.id("block/seashell_yellow")); + PINK = ItemDisplayElementUtil.getModel(RocksMain.id("block/seashell_pink")); + WHITE = ItemDisplayElementUtil.getModel(RocksMain.id("block/seashell_white")); + YELLOW = ItemDisplayElementUtil.getModel(RocksMain.id("block/seashell_yellow")); } public ItemDisplaySeashellModel(BlockState state, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java index 007647e..ccb6356 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStarfishModel.java @@ -2,7 +2,6 @@ package eu.midnightdust.motschen.rocks.block.polymer.model; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.config.RocksConfig; -import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment; @@ -29,12 +28,12 @@ public class ItemDisplayStarfishModel extends ConditionalBlockModel { public static ItemStack PINK_FIRST; public static void initModels() { - RED = BaseItemProvider.requestModel(polymerId("block/starfish_red_arm")); - ORANGE = BaseItemProvider.requestModel(polymerId("block/starfish_orange_arm")); - PINK = BaseItemProvider.requestModel(polymerId("block/starfish_pink_arm")); - RED_FIRST = BaseItemProvider.requestModel(polymerId("block/starfish_red_first_arm")); - ORANGE_FIRST = BaseItemProvider.requestModel(polymerId("block/starfish_orange_first_arm")); - PINK_FIRST = BaseItemProvider.requestModel(polymerId("block/starfish_pink_first_arm")); + RED = ItemDisplayElementUtil.getModel(polymerId("block/starfish_red_arm")); + ORANGE = ItemDisplayElementUtil.getModel(polymerId("block/starfish_orange_arm")); + PINK = ItemDisplayElementUtil.getModel(polymerId("block/starfish_pink_arm")); + RED_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_red_first_arm")); + ORANGE_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_orange_first_arm")); + PINK_FIRST = ItemDisplayElementUtil.getModel(polymerId("block/starfish_pink_first_arm")); } public ItemDisplayStarfishModel(BlockState state, BlockPos pos) { diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStickModel.java b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStickModel.java index e5732d6..066cfd3 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStickModel.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/block/polymer/model/ItemDisplayStickModel.java @@ -3,7 +3,6 @@ package eu.midnightdust.motschen.rocks.block.polymer.model; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.config.RocksConfig; import eu.midnightdust.motschen.rocks.util.StickType; -import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment; @@ -25,9 +24,9 @@ public class ItemDisplayStickModel extends ConditionalBlockModel { public static void initModels() { for (WoodType type : WoodType.stream().toList()) { var stacks = new ItemStack[3]; - stacks[0] = BaseItemProvider.requestModel(RocksMain.id("block/small_"+type.name()+"_stick")); - stacks[1] = BaseItemProvider.requestModel(RocksMain.id("block/medium_"+type.name()+"_stick")); - stacks[2] = BaseItemProvider.requestModel(RocksMain.id("block/large_"+type.name()+"_stick")); + stacks[0] = ItemDisplayElementUtil.getModel(RocksMain.id("block/small_"+type.name()+"_stick")); + stacks[1] = ItemDisplayElementUtil.getModel(RocksMain.id("block/medium_"+type.name()+"_stick")); + stacks[2] = ItemDisplayElementUtil.getModel(RocksMain.id("block/large_"+type.name()+"_stick")); models.put(type, stacks); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/config/RocksConfig.java b/src/main/java/eu/midnightdust/motschen/rocks/config/RocksConfig.java index 03321e9..4c691d5 100755 --- a/src/main/java/eu/midnightdust/motschen/rocks/config/RocksConfig.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/config/RocksConfig.java @@ -47,5 +47,5 @@ public class RocksConfig extends MidnightConfig { @Entry(category = effects) public static boolean netherGeyserDamage = true; @Entry(category = effects) public static boolean enablePolymerMode = true; - @Entry(category = effects, min = 0, max = 200, isSlider = true) public static int polymerViewDistance = 100; + @Entry(category = effects, requiredMod = "factorytools", min = 0, max = 200, isSlider = true) public static int polymerViewDistance = 100; } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/datagen/Language.java b/src/main/java/eu/midnightdust/motschen/rocks/datagen/Language.java new file mode 100644 index 0000000..945ecb9 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/rocks/datagen/Language.java @@ -0,0 +1,166 @@ +package eu.midnightdust.motschen.rocks.datagen; + +import eu.midnightdust.motschen.rocks.RocksMain; +import eu.midnightdust.motschen.rocks.util.RockType; +import eu.midnightdust.motschen.rocks.util.StickType; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; +import net.minecraft.block.Block; +import net.minecraft.block.WoodType; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.util.Identifier; + +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +public abstract class Language extends FabricLanguageProvider { + LanguageHelper langHelper; + + protected Language(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + super(dataOutput, registryLookup); + } + + protected Language(FabricDataOutput dataOutput, String languageCode, CompletableFuture registryLookup) { + super(dataOutput, languageCode, registryLookup); + } + + public String getCommonString(String first, String second) { + // To get the pure wood set name, we compare the names of the log and plank blocks and only keep the common part + // Kinda cursed, but hey – it works :) + StringBuilder commonTranslation = new StringBuilder(); + for (String subFirst : first.split(" ")) { + for (String subSecond : second.split(" ")) { + String commonPart = ""; + if (!second.contains(" ")) { // This is often the case in German + for (char c : subFirst.toCharArray()) { + String temp = commonPart + c; + if (subSecond.startsWith(temp)) commonPart = temp; + else break; + } + } + else if (subFirst.equals(subSecond)) commonPart = subSecond; // This is common in English + + if (!commonPart.isEmpty()) { + commonTranslation.append(commonPart).append(" "); + break; + } + } + } + return commonTranslation.substring(0, commonTranslation.length()-1); + } + + protected static void addBlock(TranslationBuilder translationBuilder, Block block, String value) { + translationBuilder.add(block, value); + translationBuilder.add(block.asItem(), value); + } + + protected static void midnightconfig(TranslationBuilder translationBuilder, String key, String value) { + translationBuilder.add("rocks.midnightconfig."+key, value); + } + + public void createRepeatedTranslations(TranslationBuilder translationBuilder, String rockWord, String splitterWord, String stickWord) { + for (RockType type : RockType.values()) { + Block block = Registries.BLOCK.get(RocksMain.id(type.getName())); + String baseTranslation = langHelper.translate(type.getStoneBlock().getTranslationKey()); + addBlock(translationBuilder, block, baseTranslation+rockWord); + + if (type != RockType.GRAVEL) { + Item splitter = Registries.ITEM.get(RocksMain.id(type.getSplitterName())); + translationBuilder.add(splitter, baseTranslation+splitterWord); + } + } + for (WoodType type : WoodType.stream().toList()) { + Block block = Registries.BLOCK.get(RocksMain.id(type.name()+"_stick")); + if (StickType.getBaseBlock(type) instanceof Block logBlock && + Registries.BLOCK.get(Identifier.ofVanilla(type.name()+"_planks")) instanceof Block plankBlock && + Registries.BLOCK.get(Identifier.ofVanilla(type.name()+"_stairs")) instanceof Block stairBlock) { + String logTranslation = langHelper.translate(logBlock.getTranslationKey()); + String plankTranslation = langHelper.translate(plankBlock.getTranslationKey()); + String stairTranslation = langHelper.translate(stairBlock.getTranslationKey()); + + addBlock(translationBuilder, block, getCommonString(getCommonString(logTranslation, plankTranslation), getCommonString(plankTranslation, stairTranslation)) + stickWord); + } + } + } + + public static class English extends Language { + public English(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + super(dataOutput, registryLookup); + langHelper = new LanguageHelper("en_us"); + } + + @Override + public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, TranslationBuilder translationBuilder) { + translationBuilder.add("itemGroup.rocks.rocks","This Rocks!"); + + createRepeatedTranslations(translationBuilder, " Rock", " Splitter", " Stick"); + + addBlock(translationBuilder, RocksMain.Geyser, "Geyser"); + addBlock(translationBuilder, RocksMain.NetherGeyser, "Nether Geyser"); + addBlock(translationBuilder, RocksMain.Starfish, "Starfish"); + addBlock(translationBuilder, RocksMain.Seashell, "Seashell"); + addBlock(translationBuilder, RocksMain.Pinecone, "Pinecone"); + + midnightconfig(translationBuilder, "title", "This Rocks! Config"); + midnightconfig(translationBuilder, "category.rocks", "Rocks"); + midnightconfig(translationBuilder, "category.sticks", "Sticks"); + midnightconfig(translationBuilder, "category.misc", "Miscellaneous"); + midnightconfig(translationBuilder, "category.effects", "Effects"); + + for (String key : Set.of("needs_restart", "needs_restart1", "needs_restart2")) { + midnightconfig(translationBuilder, key, "§cRestart the game after changing options here!"); + } + + midnightconfig(translationBuilder, "underwaterSeashell", "Underwater Seashell"); + midnightconfig(translationBuilder, "underwaterStarfish", "Underwater Starfish"); + + midnightconfig(translationBuilder, "geyserLevitation", "Geyser Levitation"); + midnightconfig(translationBuilder, "netherGeyserDamage", "Nether Geyser Damage"); + midnightconfig(translationBuilder, "enablePolymerMode", "Enable Polymer Mode"); + midnightconfig(translationBuilder, "enablePolymerMode.tooltip", "Allows the mod to work fully server-sided when used in combination with Polymer and FactoryTools"); + midnightconfig(translationBuilder, "polymerViewDistance", "Polymer View Distance"); + } + } + public static class German extends Language { + public German(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + super(dataOutput, "de_de", registryLookup); + langHelper = new LanguageHelper("de_de"); + } + + @Override + public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, TranslationBuilder translationBuilder) { + translationBuilder.add("itemGroup.rocks.rocks","This Rocks!"); + + createRepeatedTranslations(translationBuilder, "brocken", "splitter", "stock"); + + addBlock(translationBuilder, RocksMain.Geyser, "Geysir"); + addBlock(translationBuilder, RocksMain.NetherGeyser, "Nether-Geysir"); + addBlock(translationBuilder, RocksMain.Starfish, "Seestern"); + addBlock(translationBuilder, RocksMain.Seashell, "Muschel"); + addBlock(translationBuilder, RocksMain.Pinecone, "Tannenzapfen"); + + + midnightconfig(translationBuilder, "title", "This Rocks! Config"); + midnightconfig(translationBuilder, "category.rocks", "Brocken"); + midnightconfig(translationBuilder, "category.sticks", "Stöcke"); + midnightconfig(translationBuilder, "category.misc", "Sonstiges"); + midnightconfig(translationBuilder, "category.effects", "Effekte"); + + for (String key : Set.of("needs_restart", "needs_restart1", "needs_restart2")) { + midnightconfig(translationBuilder, key, "§cStarte das Spiel neu, nachdem du Änderungen vorgenommen hast!"); + } + + midnightconfig(translationBuilder, "underwaterSeashell", "Unterwasser-Muschel"); + midnightconfig(translationBuilder, "underwaterStarfish", "Unterwasser-Seestern"); + + midnightconfig(translationBuilder, "geyserLevitation", "Geysir Schwebeeffekt"); + midnightconfig(translationBuilder, "netherGeyserDamage", "Nether Geysir Schaden"); + midnightconfig(translationBuilder, "enablePolymerMode", "Aktiviere Polymer-Modus"); + + midnightconfig(translationBuilder, "enablePolymerMode.tooltip", "Erlaubt der Mod, komplett serverseitig zu funktionieren, wenn Polymer und FactoryTools installiert sind"); + midnightconfig(translationBuilder, "polymerViewDistance", "Polymer-Sichtweite"); + } + } +} diff --git a/src/main/java/eu/midnightdust/motschen/rocks/datagen/LanguageHelper.java b/src/main/java/eu/midnightdust/motschen/rocks/datagen/LanguageHelper.java new file mode 100644 index 0000000..f7e455c --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/rocks/datagen/LanguageHelper.java @@ -0,0 +1,29 @@ +package eu.midnightdust.motschen.rocks.datagen; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import net.minecraft.client.MinecraftClient; +import net.minecraft.resource.ResourceType; +import net.minecraft.util.Identifier; + +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; + +public class LanguageHelper { + JsonObject language; + + public LanguageHelper(String language) { + try { + var langFile = MinecraftClient.getInstance().getDefaultResourcePack().open(ResourceType.CLIENT_RESOURCES, Identifier.ofVanilla(String.format("lang/%s.json", language))); + if (langFile == null) throw new RuntimeException("Unable to load language "+language); + this.language = new Gson().fromJson(new InputStreamReader(langFile.get(), StandardCharsets.UTF_8), JsonObject.class); + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + public String translate(String translationKey) { + return language.get(translationKey).getAsString(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/rocks/datagen/LootTables.java b/src/main/java/eu/midnightdust/motschen/rocks/datagen/LootTables.java index 6b5ac22..64637d7 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/datagen/LootTables.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/datagen/LootTables.java @@ -49,7 +49,7 @@ public class LootTables { addDrop(block, this.dropsWithSilkTouch(block, ItemEntry.builder(alternative))); } public void addSilkTouchOrRareDrop(Block block, Item alternative, float... chances) { - RegistryWrapper.Impl impl = this.registryLookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT); + RegistryWrapper.Impl impl = this.registries.getOrThrow(RegistryKeys.ENCHANTMENT); addDrop(block, this.dropsWithSilkTouch(block, ItemEntry.builder(alternative).conditionally(TableBonusLootCondition.builder(impl.getOrThrow(Enchantments.FORTUNE), chances)))); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/datagen/Models.java b/src/main/java/eu/midnightdust/motschen/rocks/datagen/Models.java new file mode 100644 index 0000000..f9ee743 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/rocks/datagen/Models.java @@ -0,0 +1,126 @@ +package eu.midnightdust.motschen.rocks.datagen; + +import eu.midnightdust.motschen.rocks.RocksMain; +import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation; +import eu.midnightdust.motschen.rocks.util.RockType; +import eu.midnightdust.motschen.rocks.util.StickType; +import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.minecraft.block.Block; +import net.minecraft.block.WoodType; +import net.minecraft.client.data.*; +import net.minecraft.client.render.item.model.ItemModel; +import net.minecraft.client.render.item.model.SelectItemModel; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; + +import java.util.*; + +public class Models extends FabricModelProvider { + public static final TextureKey ZERO_TEXTURE_KEY = TextureKey.of("0"); + public Models(FabricDataOutput output) { + super(output); + } + + public static Identifier getBlockId(String s) { + return RocksMain.id("block/"+s); + } + public static Identifier getItemId(String s) { + return RocksMain.id("item/"+s); + } + public static Model getSimpleParentModel(Identifier parentId, String variant) { + return new Model(Optional.of(parentId), Optional.of(variant), ZERO_TEXTURE_KEY); + } + @Override + public void generateBlockStateModels(BlockStateModelGenerator bsModelGenerator) { + for (RockType type : RockType.values()) { + Block block = Registries.BLOCK.get(RocksMain.id(type.getName())); + RockModel.registerBlockModel(bsModelGenerator, block, type.getStoneBlock()); + } + for (WoodType type : WoodType.stream().toList()) { + Block block = Registries.BLOCK.get(RocksMain.id(type.name()+"_stick")); + StickModel.registerBlockModel(bsModelGenerator, block, StickType.getBaseBlock(type)); + } + } + + @Override + public void generateItemModels(ItemModelGenerator itemModelGenerator) { + for (RockType type : RockType.values()) { + Item item = Registries.ITEM.get(RocksMain.id(type.getName())); + registerParentedItemModel(itemModelGenerator, item, getItemId("rock_base"), type.getStoneBlock()); + + if (type != RockType.GRAVEL) { + Item splitter = Registries.ITEM.get(RocksMain.id(type.getSplitterName())); + registerParentedItemModel(itemModelGenerator, splitter, getItemId("splitter_base"), type.getStoneBlock()); + } + } + for (WoodType type : WoodType.stream().toList()) { + Item item = Registries.ITEM.get(RocksMain.id(type.name()+"_stick")); + registerParentedItemModel(itemModelGenerator, item, getItemId("stick_base"), StickType.getBaseBlock(type)); + } + itemModelGenerator.register(RocksMain.Geyser.asItem()); + itemModelGenerator.register(RocksMain.NetherGeyser.asItem()); + registerStarfishItemVariations(itemModelGenerator, RocksMain.Starfish); + itemModelGenerator.register(RocksMain.Seashell.asItem()); + itemModelGenerator.register(RocksMain.Pinecone.asItem()); + } + public static void registerParentedItemModel(ItemModelGenerator modelGenerator, Item item, Identifier parentId, Block textureSource) { + TextureMap textureMap = TextureMap.of(ZERO_TEXTURE_KEY, TextureMap.getId(textureSource)); + + Identifier itemModel = getSimpleParentModel(parentId, "").upload(item, textureMap, modelGenerator.modelCollector); + modelGenerator.output.accept(item, ItemModels.basic(itemModel)); + } + public final void registerStarfishItemVariations(ItemModelGenerator modelGenerator, Block starfish) { + Map variantMap = new HashMap<>(); + for (StarfishVariation variation : StarfishVariation.values()) { + variantMap.put(variation, ItemModels.basic(ModelIds.getBlockSubModelId(starfish, "_"+variation.toString()))); + } + modelGenerator.output.accept(starfish.asItem(), ItemModels.select(RocksMain.STARFISH_VARIATION, ItemModels.basic(ModelIds.getItemModelId(starfish.asItem())), variantMap)); + } + + public static List getRandomRotationVariants(VariantSetting baseSettings, T value) { + List list = new ArrayList<>(); + for (VariantSettings.Rotation rotation : VariantSettings.Rotation.values()) { + BlockStateVariant rotatedVariant = BlockStateVariant.create().put(baseSettings, value); + list.add(rotatedVariant.put(VariantSettings.Y, rotation)); + } + return list; + } + + private static class RockModel { + public static void registerBlockModel(BlockStateModelGenerator modelGenerator, Block rockBlock, Block textureSource) { + TextureMap textureMap = TextureMap.of(ZERO_TEXTURE_KEY, TextureMap.getId(textureSource)); + + Identifier largeRock = getSimpleParentModel(getBlockId("large_rock"), "_large").upload(rockBlock, textureMap, modelGenerator.modelCollector); + Identifier mediumRock = getSimpleParentModel(getBlockId("medium_rock"), "_medium").upload(rockBlock, textureMap, modelGenerator.modelCollector); + Identifier smallRock = getSimpleParentModel(getBlockId("small_rock"), "_small").upload(rockBlock, textureMap, modelGenerator.modelCollector); + Identifier tinyRock = getSimpleParentModel(getBlockId("tiny_rock"), "_tiny").upload(rockBlock, textureMap, modelGenerator.modelCollector); + modelGenerator.blockStateCollector.accept(createBlockState(rockBlock, new Identifier[]{largeRock, mediumRock, smallRock, tinyRock})); + } + + private static BlockStateSupplier createBlockState(Block rockBlock, Identifier[] modelIds) { + return VariantsBlockStateSupplier.create(rockBlock) + .coordinate(BlockStateVariantMap.create(RocksMain.ROCK_VARIATION) + .registerVariants(variation -> getRandomRotationVariants(VariantSettings.MODEL, modelIds[3 - variation.ordinal()])) + ); + } + } + private static class StickModel { + public static void registerBlockModel(BlockStateModelGenerator modelGenerator, Block stickBlock, Block textureSource) { + TextureMap textureMap = TextureMap.of(ZERO_TEXTURE_KEY, TextureMap.getId(textureSource)); + + Identifier largeRock = getSimpleParentModel(getBlockId("large_stick"), "_large").upload(stickBlock, textureMap, modelGenerator.modelCollector); + Identifier mediumRock = getSimpleParentModel(getBlockId("medium_stick"), "_medium").upload(stickBlock, textureMap, modelGenerator.modelCollector); + Identifier smallRock = getSimpleParentModel(getBlockId("small_stick"), "_small").upload(stickBlock, textureMap, modelGenerator.modelCollector); + modelGenerator.blockStateCollector.accept(createBlockState(stickBlock, new Identifier[]{largeRock, mediumRock, smallRock})); + } + + private static BlockStateSupplier createBlockState(Block stickBlock, Identifier[] modelIds) { + return VariantsBlockStateSupplier.create(stickBlock) + .coordinate(BlockStateVariantMap.create(RocksMain.STICK_VARIATION) + .registerVariants(variation -> getRandomRotationVariants(VariantSettings.MODEL, modelIds[2 - variation.ordinal()])) + ); + } + } +} diff --git a/src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java b/src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java index 3b13edc..393717e 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java @@ -3,10 +3,12 @@ package eu.midnightdust.motschen.rocks.datagen; import eu.midnightdust.motschen.rocks.RocksMain; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; -import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.data.recipe.RecipeExporter; +import net.minecraft.data.recipe.RecipeGenerator; +import net.minecraft.data.recipe.ShapelessRecipeJsonBuilder; import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.Identifier; @@ -17,17 +19,36 @@ public class Recipes extends FabricRecipeProvider { super(output, registriesFuture); } @Override - public void generate(RecipeExporter exporter) { - generateCrafting(exporter); + public String getName() { + return "Recipes"; } + @Override + protected RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup registries, RecipeExporter recipeExporter) { + return new RocksRecipeGenerator(registries, recipeExporter); + } + + public static class RocksRecipeGenerator extends RecipeGenerator { + protected RocksRecipeGenerator(RegistryWrapper.WrapperLookup registries, RecipeExporter exporter) { + super(registries, exporter); + } + + @Override + public void generate() { + generateCrafting(exporter); + } private void generateCrafting(RecipeExporter exporter) { RocksMain.splittersByType.forEach(((rockType, splitter) -> { - ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, Registries.BLOCK.get(Identifier.ofVanilla(rockType.name().toLowerCase()))) + ShapelessRecipeJsonBuilder.create(registries.getOrThrow(RegistryKeys.ITEM), RecipeCategory.BUILDING_BLOCKS, Registries.BLOCK.get(Identifier.ofVanilla(rockType.name().toLowerCase())).asItem()) .input(splitter, 4) - .criterion(FabricRecipeProvider.hasItem(splitter), FabricRecipeProvider.conditionsFromItem(splitter)) + .criterion(RecipeGenerator.hasItem(splitter), this.conditionsFromItem(splitter)) .offerTo(exporter, rockType.name().toLowerCase()+"_from_splitter"); })); } + } + + + + } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java b/src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java index 36d6add..a2e4340 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/item/polymer/StarfishItemPolymer.java @@ -2,22 +2,22 @@ package eu.midnightdust.motschen.rocks.item.polymer; import eu.midnightdust.motschen.rocks.RocksMain; import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation; -import eu.pb4.factorytools.api.item.AutoModeledPolymerItem; import eu.pb4.polymer.core.api.block.PolymerBlock; -import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; +import eu.pb4.polymer.core.api.item.PolymerItem; +import eu.pb4.polymer.resourcepack.extras.api.ResourcePackExtras; import net.minecraft.block.Block; import net.minecraft.component.DataComponentTypes; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; +import xyz.nucleoid.packettweaker.PacketContext; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.hasModOnClient; import static eu.midnightdust.motschen.rocks.util.polymer.PolyUtil.polymerId; -public class StarfishItemPolymer extends BlockItem implements AutoModeledPolymerItem { +public class StarfishItemPolymer extends BlockItem implements PolymerItem { private final Item polymerItem; public StarfishItemPolymer(T block, Settings settings, Item item) { @@ -26,31 +26,22 @@ public class StarfishItemPolymer extends BlockItem implements AutoModeledPolymer } @Override - public Item getPolymerItem() { - return polymerItem; - } - - @Override - public int getPolymerCustomModelData(ItemStack itemStack, @Nullable ServerPlayerEntity player) { + public @Nullable Identifier getPolymerItemModel(ItemStack itemStack, PacketContext context) { var state = itemStack.getComponents().get(DataComponentTypes.BLOCK_STATE); if (state != null && !state.isEmpty()) { StarfishVariation variation = state.getValue(RocksMain.STARFISH_VARIATION); - if (variation != null) return MODELS.get(variation).value(); + if (variation != null) return ResourcePackExtras.bridgeModel(polymerId(variation + "_starfish")); } - return MODELS.get(this).value(); + return itemStack.get(DataComponentTypes.ITEM_MODEL); } @Override - public void onRegistered(Identifier selfId) { - var item = Identifier.of(selfId.getNamespace(), "item/" + selfId.getPath()); - MODELS.put(this, PolymerResourcePackUtils.requestModel(this.getPolymerItem(), item)); - for (StarfishVariation variation : StarfishVariation.values()) { - MODELS.put(variation, PolymerResourcePackUtils.requestModel(this.getPolymerItem(), polymerId("item/" + variation.toString() + "_" + selfId.getPath()))); - } + public boolean canSyncRawToClient(PacketContext context) { + return hasModOnClient(context.getPlayer()); } @Override - public boolean canSyncRawToClient(@Nullable ServerPlayerEntity player) { - return hasModOnClient(player); + public Item getPolymerItem(ItemStack itemStack, PacketContext packetContext) { + return polymerItem; } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/util/ParticleUtil.java b/src/main/java/eu/midnightdust/motschen/rocks/util/ParticleUtil.java index eac7783..7423a12 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/util/ParticleUtil.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/util/ParticleUtil.java @@ -9,7 +9,7 @@ import net.minecraft.util.math.Vec3d; public class ParticleUtil { public static void spawnParticle(ServerPlayerEntity player, ParticleType type, Vec3d pos, Vec3d offset, float speed) { - ServerPlayNetworking.getSender(player).sendPacket(new ParticleS2CPacket((ParticleEffect) type, false, pos.x, pos.y, pos.z, + ServerPlayNetworking.getSender(player).sendPacket(new ParticleS2CPacket((ParticleEffect) type, false, true, pos.x, pos.y, pos.z, (float) offset.x / 16f, (float) offset.y / 16f, (float) offset.z / 16f, speed, 1)); } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/util/RegistryUtil.java b/src/main/java/eu/midnightdust/motschen/rocks/util/RegistryUtil.java index 6217cd1..9a47f9e 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/util/RegistryUtil.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/util/RegistryUtil.java @@ -25,12 +25,12 @@ import static eu.midnightdust.motschen.rocks.RocksMain.polymerMode; public class RegistryUtil { public static T registerBlockWithItem(Identifier id, T block) { Registry.register(Registries.BLOCK, id, block); - registerItem(id, blockItem(block)); + registerItem(id, blockItem(block, id)); return block; } - public static Item blockItem(Block block) { - if (polymerMode) return PolyUtil.polymerBlockItem(block); - return new BlockItem(block, new Item.Settings()); + public static Item blockItem(Block block, Identifier id) { + if (polymerMode) return PolyUtil.polymerBlockItem(block, id); + return new BlockItem(block, new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, id))); } public static Item registerItem(Identifier id, Item item) { Registry.register(Registries.ITEM, id, item); diff --git a/src/main/java/eu/midnightdust/motschen/rocks/util/RockType.java b/src/main/java/eu/midnightdust/motschen/rocks/util/RockType.java index 9d687c9..00e8de4 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/util/RockType.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/util/RockType.java @@ -1,5 +1,7 @@ package eu.midnightdust.motschen.rocks.util; +import net.minecraft.block.Block; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import java.util.Arrays; @@ -26,6 +28,12 @@ public enum RockType { if (this.equals(RockType.STONE)) splitterName = "cobblestone_splitter"; return splitterName; } + public Identifier getStoneId() { + return Identifier.ofVanilla(this.toString().toLowerCase()); + } + public Block getStoneBlock() { + return Registries.BLOCK.get(getStoneId()); + } public Identifier[] getVariations() { var variations = new Identifier[4]; diff --git a/src/main/java/eu/midnightdust/motschen/rocks/util/StickType.java b/src/main/java/eu/midnightdust/motschen/rocks/util/StickType.java index a44d566..41d13a7 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/util/StickType.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/util/StickType.java @@ -1,6 +1,10 @@ package eu.midnightdust.motschen.rocks.util; +import net.minecraft.block.Block; import net.minecraft.block.WoodType; +import net.minecraft.registry.Registries; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; import java.util.Objects; @@ -10,4 +14,15 @@ public class StickType { .replace("block.rocks.", "").replace("_stick", "") )).findFirst().orElse(WoodType.OAK); } + public static Block getBaseBlock(WoodType woodType) { + String logName = woodType.name() + "_"; + if (woodType.soundType() == BlockSoundGroup.NETHER_WOOD) logName += "stem"; + else if (woodType.soundType() == BlockSoundGroup.BAMBOO_WOOD) logName += "block"; + else logName += "log"; + + if (Registries.BLOCK.containsId(Identifier.ofVanilla(logName))) { + return Registries.BLOCK.get(Identifier.ofVanilla(logName)); + } + return null; + } } diff --git a/src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java b/src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java index 18664df..8f42284 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/util/polymer/PolyUtil.java @@ -9,12 +9,12 @@ import eu.midnightdust.motschen.rocks.block.polymer.model.*; import eu.midnightdust.motschen.rocks.item.polymer.StarfishItemPolymer; import eu.midnightdust.motschen.rocks.util.RockType; import eu.pb4.factorytools.api.item.FactoryBlockItem; -import eu.pb4.factorytools.api.item.ModeledItem; import eu.pb4.polymer.blocks.api.BlockModelType; import eu.pb4.polymer.blocks.api.PolymerBlockResourceUtils; import eu.pb4.polymer.core.api.block.PolymerBlock; import eu.pb4.polymer.core.api.block.PolymerBlockUtils; import eu.pb4.polymer.core.api.item.PolymerItemGroupUtils; +import eu.pb4.polymer.core.api.item.SimplePolymerItem; import eu.pb4.polymer.core.api.utils.PolymerSyncUtils; import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; import eu.pb4.polymer.virtualentity.api.ElementHolder; @@ -27,6 +27,8 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -66,13 +68,14 @@ public class PolyUtil { return playersWithMod.contains(player); } - public static Item polymerBlockItem(Block block) { - if (block instanceof Starfish) return new StarfishItemPolymer((Block & PolymerBlock) block, new Item.Settings(), Items.KELP); - else return new FactoryBlockItem((Block & PolymerBlock) block, new Item.Settings(), Items.KELP); + public static Item polymerBlockItem(Block block, Identifier id) { + if (block instanceof Starfish) return new StarfishItemPolymer((Block & PolymerBlock) block, new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, id)), Items.KELP); + else return new FactoryBlockItem((Block & PolymerBlock) block, new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, id)), Items.KELP); } - public static Item simplePolymerItem() { - return new ModeledItem(Items.FLINT, new Item.Settings()); + public static Item simplePolymerItem(Identifier id) { + return new SimplePolymerItem(new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, id)), Items.FLINT, true); + //return new ModeledItem(Items.FLINT, new Item.Settings()); } public static void registerPolymerGroup() { @@ -100,11 +103,11 @@ public class PolyUtil { } } - public static Rock newRockPolymer() {return new RockPolymer();} - public static Stick newStickPolymer() {return new StickPolymer();} - public static Block newPineconePolymer() {return new PineconePolymer();} - public static Block newSeashellPolymer() {return new SeashellPolymer();} - public static Block newStarfishPolymer() {return new StarfishPolymer();} - public static Block newOverworldGeyserPolymer() {return new OverworldGeyserPolymer();} - public static Block newNetherGeyserPolymer() {return new NetherGeyserPolymer();} + public static Rock newRockPolymer(Identifier id) {return new RockPolymer(id);} + public static Stick newStickPolymer(Identifier id) {return new StickPolymer(id);} + public static Block newPineconePolymer(Identifier id) {return new PineconePolymer(id);} + public static Block newSeashellPolymer(Identifier id) {return new SeashellPolymer(id);} + public static Block newStarfishPolymer(Identifier id) {return new StarfishPolymer(id);} + public static Block newOverworldGeyserPolymer(Identifier id) {return new OverworldGeyserPolymer(id);} + public static Block newNetherGeyserPolymer(Identifier id) {return new NetherGeyserPolymer(id);} } diff --git a/src/main/resources/assets/rocks/blockstates/acacia_stick.json b/src/main/resources/assets/rocks/blockstates/acacia_stick.json deleted file mode 100755 index 28df98c..0000000 --- a/src/main/resources/assets/rocks/blockstates/acacia_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_acacia_stick"}, - {"model": "rocks:block/small_acacia_stick", "y": 90}, - {"model": "rocks:block/small_acacia_stick", "y": 180}, - {"model": "rocks:block/small_acacia_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_acacia_stick"}, - {"model": "rocks:block/medium_acacia_stick", "y": 90}, - {"model": "rocks:block/medium_acacia_stick", "y": 180}, - {"model": "rocks:block/medium_acacia_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_acacia_stick"}, - {"model": "rocks:block/large_acacia_stick", "y": 90}, - {"model": "rocks:block/large_acacia_stick", "y": 180}, - {"model": "rocks:block/large_acacia_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/andesite_rock.json b/src/main/resources/assets/rocks/blockstates/andesite_rock.json deleted file mode 100755 index f953414..0000000 --- a/src/main/resources/assets/rocks/blockstates/andesite_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_andesite_rock"}, - {"model": "rocks:block/tiny_andesite_rock", "y": 90}, - {"model": "rocks:block/tiny_andesite_rock", "y": 180}, - {"model": "rocks:block/tiny_andesite_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_andesite_rock"}, - {"model": "rocks:block/small_andesite_rock", "y": 90}, - {"model": "rocks:block/small_andesite_rock", "y": 180}, - {"model": "rocks:block/small_andesite_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_andesite_rock"}, - {"model": "rocks:block/medium_andesite_rock", "y": 90}, - {"model": "rocks:block/medium_andesite_rock", "y": 180}, - {"model": "rocks:block/medium_andesite_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_andesite_rock"}, - {"model": "rocks:block/large_andesite_rock", "y": 90}, - {"model": "rocks:block/large_andesite_rock", "y": 180}, - {"model": "rocks:block/large_andesite_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/bamboo_stick.json b/src/main/resources/assets/rocks/blockstates/bamboo_stick.json deleted file mode 100755 index 4bef505..0000000 --- a/src/main/resources/assets/rocks/blockstates/bamboo_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_bamboo_stick"}, - {"model": "rocks:block/small_bamboo_stick", "y": 90}, - {"model": "rocks:block/small_bamboo_stick", "y": 180}, - {"model": "rocks:block/small_bamboo_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_bamboo_stick"}, - {"model": "rocks:block/medium_bamboo_stick", "y": 90}, - {"model": "rocks:block/medium_bamboo_stick", "y": 180}, - {"model": "rocks:block/medium_bamboo_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_bamboo_stick"}, - {"model": "rocks:block/large_bamboo_stick", "y": 90}, - {"model": "rocks:block/large_bamboo_stick", "y": 180}, - {"model": "rocks:block/large_bamboo_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/birch_stick.json b/src/main/resources/assets/rocks/blockstates/birch_stick.json deleted file mode 100755 index 6897250..0000000 --- a/src/main/resources/assets/rocks/blockstates/birch_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_birch_stick"}, - {"model": "rocks:block/small_birch_stick", "y": 90}, - {"model": "rocks:block/small_birch_stick", "y": 180}, - {"model": "rocks:block/small_birch_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_birch_stick"}, - {"model": "rocks:block/medium_birch_stick", "y": 90}, - {"model": "rocks:block/medium_birch_stick", "y": 180}, - {"model": "rocks:block/medium_birch_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_birch_stick"}, - {"model": "rocks:block/large_birch_stick", "y": 90}, - {"model": "rocks:block/large_birch_stick", "y": 180}, - {"model": "rocks:block/large_birch_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/cherry_stick.json b/src/main/resources/assets/rocks/blockstates/cherry_stick.json deleted file mode 100755 index 81dad86..0000000 --- a/src/main/resources/assets/rocks/blockstates/cherry_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_cherry_stick"}, - {"model": "rocks:block/small_cherry_stick", "y": 90}, - {"model": "rocks:block/small_cherry_stick", "y": 180}, - {"model": "rocks:block/small_cherry_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_cherry_stick"}, - {"model": "rocks:block/medium_cherry_stick", "y": 90}, - {"model": "rocks:block/medium_cherry_stick", "y": 180}, - {"model": "rocks:block/medium_cherry_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_cherry_stick"}, - {"model": "rocks:block/large_cherry_stick", "y": 90}, - {"model": "rocks:block/large_cherry_stick", "y": 180}, - {"model": "rocks:block/large_cherry_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/crimson_stick.json b/src/main/resources/assets/rocks/blockstates/crimson_stick.json deleted file mode 100755 index efc43c6..0000000 --- a/src/main/resources/assets/rocks/blockstates/crimson_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_crimson_stick"}, - {"model": "rocks:block/small_crimson_stick", "y": 90}, - {"model": "rocks:block/small_crimson_stick", "y": 180}, - {"model": "rocks:block/small_crimson_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_crimson_stick"}, - {"model": "rocks:block/medium_crimson_stick", "y": 90}, - {"model": "rocks:block/medium_crimson_stick", "y": 180}, - {"model": "rocks:block/medium_crimson_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_crimson_stick"}, - {"model": "rocks:block/large_crimson_stick", "y": 90}, - {"model": "rocks:block/large_crimson_stick", "y": 180}, - {"model": "rocks:block/large_crimson_stick", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/dark_oak_stick.json b/src/main/resources/assets/rocks/blockstates/dark_oak_stick.json deleted file mode 100755 index cbc5ee7..0000000 --- a/src/main/resources/assets/rocks/blockstates/dark_oak_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_dark_oak_stick"}, - {"model": "rocks:block/small_dark_oak_stick", "y": 90}, - {"model": "rocks:block/small_dark_oak_stick", "y": 180}, - {"model": "rocks:block/small_dark_oak_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_dark_oak_stick"}, - {"model": "rocks:block/medium_dark_oak_stick", "y": 90}, - {"model": "rocks:block/medium_dark_oak_stick", "y": 180}, - {"model": "rocks:block/medium_dark_oak_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_dark_oak_stick"}, - {"model": "rocks:block/large_dark_oak_stick", "y": 90}, - {"model": "rocks:block/large_dark_oak_stick", "y": 180}, - {"model": "rocks:block/large_dark_oak_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/diorite_rock.json b/src/main/resources/assets/rocks/blockstates/diorite_rock.json deleted file mode 100755 index 792405b..0000000 --- a/src/main/resources/assets/rocks/blockstates/diorite_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_diorite_rock"}, - {"model": "rocks:block/tiny_diorite_rock", "y": 90}, - {"model": "rocks:block/tiny_diorite_rock", "y": 180}, - {"model": "rocks:block/tiny_diorite_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_diorite_rock"}, - {"model": "rocks:block/small_diorite_rock", "y": 90}, - {"model": "rocks:block/small_diorite_rock", "y": 180}, - {"model": "rocks:block/small_diorite_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_diorite_rock"}, - {"model": "rocks:block/medium_diorite_rock", "y": 90}, - {"model": "rocks:block/medium_diorite_rock", "y": 180}, - {"model": "rocks:block/medium_diorite_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_diorite_rock"}, - {"model": "rocks:block/large_diorite_rock", "y": 90}, - {"model": "rocks:block/large_diorite_rock", "y": 180}, - {"model": "rocks:block/large_diorite_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/end_stone_rock.json b/src/main/resources/assets/rocks/blockstates/end_stone_rock.json deleted file mode 100755 index 30e8b90..0000000 --- a/src/main/resources/assets/rocks/blockstates/end_stone_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_end_stone_rock"}, - {"model": "rocks:block/tiny_end_stone_rock", "y": 90}, - {"model": "rocks:block/tiny_end_stone_rock", "y": 180}, - {"model": "rocks:block/tiny_end_stone_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_end_stone_rock"}, - {"model": "rocks:block/small_end_stone_rock", "y": 90}, - {"model": "rocks:block/small_end_stone_rock", "y": 180}, - {"model": "rocks:block/small_end_stone_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_end_stone_rock"}, - {"model": "rocks:block/medium_end_stone_rock", "y": 90}, - {"model": "rocks:block/medium_end_stone_rock", "y": 180}, - {"model": "rocks:block/medium_end_stone_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_end_stone_rock"}, - {"model": "rocks:block/large_end_stone_rock", "y": 90}, - {"model": "rocks:block/large_end_stone_rock", "y": 180}, - {"model": "rocks:block/large_end_stone_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/granite_rock.json b/src/main/resources/assets/rocks/blockstates/granite_rock.json deleted file mode 100755 index 82d4b2c..0000000 --- a/src/main/resources/assets/rocks/blockstates/granite_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_granite_rock"}, - {"model": "rocks:block/tiny_granite_rock", "y": 90}, - {"model": "rocks:block/tiny_granite_rock", "y": 180}, - {"model": "rocks:block/tiny_granite_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_granite_rock"}, - {"model": "rocks:block/small_granite_rock", "y": 90}, - {"model": "rocks:block/small_granite_rock", "y": 180}, - {"model": "rocks:block/small_granite_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_granite_rock"}, - {"model": "rocks:block/medium_granite_rock", "y": 90}, - {"model": "rocks:block/medium_granite_rock", "y": 180}, - {"model": "rocks:block/medium_granite_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_granite_rock"}, - {"model": "rocks:block/large_granite_rock", "y": 90}, - {"model": "rocks:block/large_granite_rock", "y": 180}, - {"model": "rocks:block/large_granite_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/gravel_rock.json b/src/main/resources/assets/rocks/blockstates/gravel_rock.json deleted file mode 100755 index 3dfe94f..0000000 --- a/src/main/resources/assets/rocks/blockstates/gravel_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_gravel_rock"}, - {"model": "rocks:block/tiny_gravel_rock", "y": 90}, - {"model": "rocks:block/tiny_gravel_rock", "y": 180}, - {"model": "rocks:block/tiny_gravel_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_gravel_rock"}, - {"model": "rocks:block/small_gravel_rock", "y": 90}, - {"model": "rocks:block/small_gravel_rock", "y": 180}, - {"model": "rocks:block/small_gravel_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_gravel_rock"}, - {"model": "rocks:block/medium_gravel_rock", "y": 90}, - {"model": "rocks:block/medium_gravel_rock", "y": 180}, - {"model": "rocks:block/medium_gravel_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_gravel_rock"}, - {"model": "rocks:block/large_gravel_rock", "y": 90}, - {"model": "rocks:block/large_gravel_rock", "y": 180}, - {"model": "rocks:block/large_gravel_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/ice_rock.json b/src/main/resources/assets/rocks/blockstates/ice_rock.json deleted file mode 100755 index 49231b1..0000000 --- a/src/main/resources/assets/rocks/blockstates/ice_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_ice_rock"}, - {"model": "rocks:block/tiny_ice_rock", "y": 90}, - {"model": "rocks:block/tiny_ice_rock", "y": 180}, - {"model": "rocks:block/tiny_ice_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_ice_rock"}, - {"model": "rocks:block/small_ice_rock", "y": 90}, - {"model": "rocks:block/small_ice_rock", "y": 180}, - {"model": "rocks:block/small_ice_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_ice_rock"}, - {"model": "rocks:block/medium_ice_rock", "y": 90}, - {"model": "rocks:block/medium_ice_rock", "y": 180}, - {"model": "rocks:block/medium_ice_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_ice_rock"}, - {"model": "rocks:block/large_ice_rock", "y": 90}, - {"model": "rocks:block/large_ice_rock", "y": 180}, - {"model": "rocks:block/large_ice_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/jungle_stick.json b/src/main/resources/assets/rocks/blockstates/jungle_stick.json deleted file mode 100755 index e0fd1a0..0000000 --- a/src/main/resources/assets/rocks/blockstates/jungle_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_jungle_stick"}, - {"model": "rocks:block/small_jungle_stick", "y": 90}, - {"model": "rocks:block/small_jungle_stick", "y": 180}, - {"model": "rocks:block/small_jungle_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_jungle_stick"}, - {"model": "rocks:block/medium_jungle_stick", "y": 90}, - {"model": "rocks:block/medium_jungle_stick", "y": 180}, - {"model": "rocks:block/medium_jungle_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_jungle_stick"}, - {"model": "rocks:block/large_jungle_stick", "y": 90}, - {"model": "rocks:block/large_jungle_stick", "y": 180}, - {"model": "rocks:block/large_jungle_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/mangrove_stick.json b/src/main/resources/assets/rocks/blockstates/mangrove_stick.json deleted file mode 100755 index 6459483..0000000 --- a/src/main/resources/assets/rocks/blockstates/mangrove_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_mangrove_stick"}, - {"model": "rocks:block/small_mangrove_stick", "y": 90}, - {"model": "rocks:block/small_mangrove_stick", "y": 180}, - {"model": "rocks:block/small_mangrove_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_mangrove_stick"}, - {"model": "rocks:block/medium_mangrove_stick", "y": 90}, - {"model": "rocks:block/medium_mangrove_stick", "y": 180}, - {"model": "rocks:block/medium_mangrove_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_mangrove_stick"}, - {"model": "rocks:block/large_mangrove_stick", "y": 90}, - {"model": "rocks:block/large_mangrove_stick", "y": 180}, - {"model": "rocks:block/large_mangrove_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/netherrack_rock.json b/src/main/resources/assets/rocks/blockstates/netherrack_rock.json deleted file mode 100755 index aef8f6f..0000000 --- a/src/main/resources/assets/rocks/blockstates/netherrack_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_netherrack_rock"}, - {"model": "rocks:block/tiny_netherrack_rock", "y": 90}, - {"model": "rocks:block/tiny_netherrack_rock", "y": 180}, - {"model": "rocks:block/tiny_netherrack_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_netherrack_rock"}, - {"model": "rocks:block/small_netherrack_rock", "y": 90}, - {"model": "rocks:block/small_netherrack_rock", "y": 180}, - {"model": "rocks:block/small_netherrack_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_netherrack_rock"}, - {"model": "rocks:block/medium_netherrack_rock", "y": 90}, - {"model": "rocks:block/medium_netherrack_rock", "y": 180}, - {"model": "rocks:block/medium_netherrack_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_netherrack_rock"}, - {"model": "rocks:block/large_netherrack_rock", "y": 90}, - {"model": "rocks:block/large_netherrack_rock", "y": 180}, - {"model": "rocks:block/large_netherrack_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/oak_stick.json b/src/main/resources/assets/rocks/blockstates/oak_stick.json deleted file mode 100755 index 1b2a1f8..0000000 --- a/src/main/resources/assets/rocks/blockstates/oak_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_oak_stick"}, - {"model": "rocks:block/small_oak_stick", "y": 90}, - {"model": "rocks:block/small_oak_stick", "y": 180}, - {"model": "rocks:block/small_oak_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_oak_stick"}, - {"model": "rocks:block/medium_oak_stick", "y": 90}, - {"model": "rocks:block/medium_oak_stick", "y": 180}, - {"model": "rocks:block/medium_oak_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_oak_stick"}, - {"model": "rocks:block/large_oak_stick", "y": 90}, - {"model": "rocks:block/large_oak_stick", "y": 180}, - {"model": "rocks:block/large_oak_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/red_sand_rock.json b/src/main/resources/assets/rocks/blockstates/red_sand_rock.json deleted file mode 100755 index 7990f1b..0000000 --- a/src/main/resources/assets/rocks/blockstates/red_sand_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_red_sand_rock"}, - {"model": "rocks:block/tiny_red_sand_rock", "y": 90}, - {"model": "rocks:block/tiny_red_sand_rock", "y": 180}, - {"model": "rocks:block/tiny_red_sand_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_red_sand_rock"}, - {"model": "rocks:block/small_red_sand_rock", "y": 90}, - {"model": "rocks:block/small_red_sand_rock", "y": 180}, - {"model": "rocks:block/small_red_sand_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_red_sand_rock"}, - {"model": "rocks:block/medium_red_sand_rock", "y": 90}, - {"model": "rocks:block/medium_red_sand_rock", "y": 180}, - {"model": "rocks:block/medium_red_sand_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_red_sand_rock"}, - {"model": "rocks:block/large_red_sand_rock", "y": 90}, - {"model": "rocks:block/large_red_sand_rock", "y": 180}, - {"model": "rocks:block/large_red_sand_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/rock.json b/src/main/resources/assets/rocks/blockstates/rock.json deleted file mode 100755 index 32e0e64..0000000 --- a/src/main/resources/assets/rocks/blockstates/rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_rock"}, - {"model": "rocks:block/tiny_rock", "y": 90}, - {"model": "rocks:block/tiny_rock", "y": 180}, - {"model": "rocks:block/tiny_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_rock"}, - {"model": "rocks:block/small_rock", "y": 90}, - {"model": "rocks:block/small_rock", "y": 180}, - {"model": "rocks:block/small_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_rock"}, - {"model": "rocks:block/medium_rock", "y": 90}, - {"model": "rocks:block/medium_rock", "y": 180}, - {"model": "rocks:block/medium_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_rock"}, - {"model": "rocks:block/large_rock", "y": 90}, - {"model": "rocks:block/large_rock", "y": 180}, - {"model": "rocks:block/large_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/sand_rock.json b/src/main/resources/assets/rocks/blockstates/sand_rock.json deleted file mode 100755 index 10b0424..0000000 --- a/src/main/resources/assets/rocks/blockstates/sand_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_sand_rock"}, - {"model": "rocks:block/tiny_sand_rock", "y": 90}, - {"model": "rocks:block/tiny_sand_rock", "y": 180}, - {"model": "rocks:block/tiny_sand_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_sand_rock"}, - {"model": "rocks:block/small_sand_rock", "y": 90}, - {"model": "rocks:block/small_sand_rock", "y": 180}, - {"model": "rocks:block/small_sand_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_sand_rock"}, - {"model": "rocks:block/medium_sand_rock", "y": 90}, - {"model": "rocks:block/medium_sand_rock", "y": 180}, - {"model": "rocks:block/medium_sand_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_sand_rock"}, - {"model": "rocks:block/large_sand_rock", "y": 90}, - {"model": "rocks:block/large_sand_rock", "y": 180}, - {"model": "rocks:block/large_sand_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/soul_soil_rock.json b/src/main/resources/assets/rocks/blockstates/soul_soil_rock.json deleted file mode 100755 index c44d786..0000000 --- a/src/main/resources/assets/rocks/blockstates/soul_soil_rock.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "variation=tiny": [ - {"model": "rocks:block/tiny_soul_soil_rock"}, - {"model": "rocks:block/tiny_soul_soil_rock", "y": 90}, - {"model": "rocks:block/tiny_soul_soil_rock", "y": 180}, - {"model": "rocks:block/tiny_soul_soil_rock", "y": 270} - ], - "variation=small": [ - {"model": "rocks:block/small_soul_soil_rock"}, - {"model": "rocks:block/small_soul_soil_rock", "y": 90}, - {"model": "rocks:block/small_soul_soil_rock", "y": 180}, - {"model": "rocks:block/small_soul_soil_rock", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_soul_soil_rock"}, - {"model": "rocks:block/medium_soul_soil_rock", "y": 90}, - {"model": "rocks:block/medium_soul_soil_rock", "y": 180}, - {"model": "rocks:block/medium_soul_soil_rock", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_soul_soil_rock"}, - {"model": "rocks:block/large_soul_soil_rock", "y": 90}, - {"model": "rocks:block/large_soul_soil_rock", "y": 180}, - {"model": "rocks:block/large_soul_soil_rock", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/blockstates/spruce_stick.json b/src/main/resources/assets/rocks/blockstates/spruce_stick.json deleted file mode 100755 index 8ce268a..0000000 --- a/src/main/resources/assets/rocks/blockstates/spruce_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_spruce_stick"}, - {"model": "rocks:block/small_spruce_stick", "y": 90}, - {"model": "rocks:block/small_spruce_stick", "y": 180}, - {"model": "rocks:block/small_spruce_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_spruce_stick"}, - {"model": "rocks:block/medium_spruce_stick", "y": 90}, - {"model": "rocks:block/medium_spruce_stick", "y": 180}, - {"model": "rocks:block/medium_spruce_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_spruce_stick"}, - {"model": "rocks:block/large_spruce_stick", "y": 90}, - {"model": "rocks:block/large_spruce_stick", "y": 180}, - {"model": "rocks:block/large_spruce_stick", "y": 270} - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/blockstates/warped_stick.json b/src/main/resources/assets/rocks/blockstates/warped_stick.json deleted file mode 100755 index 26469ff..0000000 --- a/src/main/resources/assets/rocks/blockstates/warped_stick.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "variation=small": [ - {"model": "rocks:block/small_warped_stick"}, - {"model": "rocks:block/small_warped_stick", "y": 90}, - {"model": "rocks:block/small_warped_stick", "y": 180}, - {"model": "rocks:block/small_warped_stick", "y": 270} - ], - "variation=medium": [ - {"model": "rocks:block/medium_warped_stick"}, - {"model": "rocks:block/medium_warped_stick", "y": 90}, - {"model": "rocks:block/medium_warped_stick", "y": 180}, - {"model": "rocks:block/medium_warped_stick", "y": 270} - ], - "variation=large": [ - {"model": "rocks:block/large_warped_stick"}, - {"model": "rocks:block/large_warped_stick", "y": 90}, - {"model": "rocks:block/large_warped_stick", "y": 180}, - {"model": "rocks:block/large_warped_stick", "y": 270} - ] - } -} diff --git a/src/main/resources/assets/rocks/lang/de_de.json b/src/main/resources/assets/rocks/lang/de_de.json deleted file mode 100755 index f0cc9e0..0000000 --- a/src/main/resources/assets/rocks/lang/de_de.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "itemGroup.rocks.rocks":"This Rocks!", - - "block.rocks.rock":"Steinbrocken", - "block.rocks.granite_rock":"Granitbrocken", - "block.rocks.diorite_rock":"Dioritbrocken", - "block.rocks.andesite_rock":"Andesitbrocken", - "block.rocks.sand_rock":"Sandsteinbrocken", - "block.rocks.red_sand_rock":"Roter Sandsteinbrocken", - "block.rocks.gravel_rock":"Kiesbrocken", - "block.rocks.end_stone_rock":"Endsteinbrocken", - "block.rocks.netherrack_rock":"Netherrackbrocken", - "block.rocks.soul_soil_rock":"Seelenerdebrocken", - "block.rocks.ice_rock":"Eisbrocken", - - "block.rocks.oak_stick":"Eichenholzstock", - "block.rocks.birch_stick":"Birkenholzstock", - "block.rocks.spruce_stick":"Fichtenholzstock", - "block.rocks.jungle_stick":"Tropenholzstock", - "block.rocks.acacia_stick":"Akazienholzstock", - "block.rocks.dark_oak_stick":"Schwarzeichenholzstock", - "block.rocks.mangrove_stick":"Mangrovenholzstock", - "block.rocks.cherry_stick":"Kirschholzstock", - "block.rocks.bamboo_stick":"Bambusstock", - "block.rocks.crimson_stick":"Karmesinstock", - "block.rocks.warped_stick":"Wirrstock", - - "block.rocks.geyser":"Geyser", - "block.rocks.nether_geyser":"Magma Geyser", - - "block.rocks.pinecone":"Tannenzapfen", - "block.rocks.seashell":"Muschel", - "block.rocks.starfish":"Seestern", - - "item.rocks.cobblestone_splitter":"Bruchsteinsplitter", - "item.rocks.granite_splitter":"Granitsplitter", - "item.rocks.diorite_splitter":"Dioritsplitter", - "item.rocks.andesite_splitter":"Andesitsplitter", - "item.rocks.sandstone_splitter":"Sandsteinsplitter", - "item.rocks.red_sandstone_splitter":"Roter Sandsteinsplitter", - "item.rocks.end_stone_splitter":"Endsteinsplitter", - "item.rocks.netherrack_splitter":"Netherracksplitter", - "item.rocks.soul_soil_splitter":"Seelenerdesplitter", - - "rocks.midnightconfig.title": "This Rocks! Konfiguration", - "rocks.midnightconfig.category.rocks":"Steine", - "rocks.midnightconfig.category.sticks":"Stöcke", - "rocks.midnightconfig.category.misc":"Sonstiges", - "rocks.midnightconfig.category.effects":"Effekte", - "rocks.midnightconfig.needs_restart": "§cStarte das Spiel neu, nachdem du Änderungen vorgenommen hast!", - "rocks.midnightconfig.needs_restart1": "§cStarte das Spiel neu, nachdem du Änderungen vorgenommen hast!", - "rocks.midnightconfig.needs_restart2": "§cStarte das Spiel neu, nachdem du Änderungen vorgenommen hast!", - "rocks.midnightconfig.rocks": "§aBrocken", - "rocks.midnightconfig.sticks": "§aStöcke", - "rocks.midnightconfig.misc": "§aWeiteres", - "rocks.midnightconfig.underwaterSeashell": "Unterwassermuschel", - "rocks.midnightconfig.underwaterStarfish": "Unterwasserseestern" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/lang/en_us.json b/src/main/resources/assets/rocks/lang/en_us.json deleted file mode 100755 index 1e0848a..0000000 --- a/src/main/resources/assets/rocks/lang/en_us.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "itemGroup.rocks.rocks":"This Rocks!", - - "block.rocks.rock":"Rock", - "block.rocks.granite_rock":"Granite Rock", - "block.rocks.diorite_rock":"Diorite Rock", - "block.rocks.andesite_rock":"Andesite Rock", - "block.rocks.sand_rock":"Sand Rock", - "block.rocks.red_sand_rock":"Red Sand Rock", - "block.rocks.gravel_rock":"Gravel Rock", - "block.rocks.end_stone_rock":"End Stone Rock", - "block.rocks.netherrack_rock":"Netherrack Rock", - "block.rocks.soul_soil_rock":"Soul Soil Rock", - "block.rocks.ice_rock":"Ice Rock", - - "block.rocks.oak_stick":"Oak Stick", - "block.rocks.birch_stick":"Birch Stick", - "block.rocks.spruce_stick":"Spruce Stick", - "block.rocks.jungle_stick":"Jungle Stick", - "block.rocks.acacia_stick":"Acacia Stick", - "block.rocks.dark_oak_stick":"Dark Oak Stick", - "block.rocks.mangrove_stick":"Mangrove Stick", - "block.rocks.cherry_stick":"Cherry Stick", - "block.rocks.bamboo_stick":"Bamboo Stick", - "block.rocks.crimson_stick":"Crimson Stick", - "block.rocks.warped_stick":"Warped Stick", - - "block.rocks.geyser":"Geyser", - "block.rocks.nether_geyser":"Magma Geyser", - - "block.rocks.pinecone":"Pinecone", - "block.rocks.seashell":"Seashell", - "block.rocks.starfish":"Starfish", - - "item.rocks.cobblestone_splitter":"Cobblestone Splitter", - "item.rocks.granite_splitter":"Granite Splitter", - "item.rocks.diorite_splitter":"Diorite Splitter", - "item.rocks.andesite_splitter":"Andesite Splitter", - "item.rocks.sandstone_splitter":"Sandstone Splitter", - "item.rocks.red_sandstone_splitter":"Red Sandstone Splitter", - "item.rocks.end_stone_splitter":"End Stone Splitter", - "item.rocks.netherrack_splitter":"Netherrack Splitter", - "item.rocks.soul_soil_splitter":"Soul Soil Splitter", - "item.rocks.ice_splitter":"Ice Splitter", - - "rocks.midnightconfig.title":"This Rocks! Config", - "rocks.midnightconfig.category.rocks":"Rocks", - "rocks.midnightconfig.category.sticks":"Sticks", - "rocks.midnightconfig.category.misc":"Miscellaneous", - "rocks.midnightconfig.category.effects":"Effects", - "rocks.midnightconfig.needs_restart":"§cRestart the game after changing options here!", - "rocks.midnightconfig.needs_restart1":"§cRestart the game after changing options here!", - "rocks.midnightconfig.needs_restart2":"§cRestart the game after changing options here!", - "rocks.midnightconfig.rocks":"§aRock Spawn Count", - "rocks.midnightconfig.sticks":"§aStick Spawn Count", - "rocks.midnightconfig.misc":"§aMiscellaneous Spawn Count", - "rocks.midnightconfig.underwaterSeashell":"Underwater Seashell", - "rocks.midnightconfig.underwaterStarfish":"Underwater Starfish", - "rocks.midnightconfig.geyserLevitation":"Geyser Levitation", - "rocks.midnightconfig.netherGeyserDamage":"Nether Geyser Damage", - "rocks.midnightconfig.enablePolymerMode":"Enable Polymer Mode", - "rocks.midnightconfig.enablePolymerMode.tooltip":"Allows the mod to work fully server-sided when used in combination with Polymer and FactoryTools", - "rocks.midnightconfig.polymerViewDistance":"Polymer View Distance" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_acacia_stick.json b/src/main/resources/assets/rocks/models/block/large_acacia_stick.json deleted file mode 100755 index ed70830..0000000 --- a/src/main/resources/assets/rocks/models/block/large_acacia_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/acacia_log", - "particle": "block/acacia_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_andesite_rock.json b/src/main/resources/assets/rocks/models/block/large_andesite_rock.json deleted file mode 100755 index 8ba1f44..0000000 --- a/src/main/resources/assets/rocks/models/block/large_andesite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/andesite", - "particle": "block/andesite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_bamboo_stick.json b/src/main/resources/assets/rocks/models/block/large_bamboo_stick.json deleted file mode 100755 index 10c2aa2..0000000 --- a/src/main/resources/assets/rocks/models/block/large_bamboo_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/bamboo_stalk", - "particle": "block/bamboo_stalk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_birch_stick.json b/src/main/resources/assets/rocks/models/block/large_birch_stick.json deleted file mode 100755 index af3fda1..0000000 --- a/src/main/resources/assets/rocks/models/block/large_birch_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/birch_log", - "particle": "block/birch_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_cherry_stick.json b/src/main/resources/assets/rocks/models/block/large_cherry_stick.json deleted file mode 100755 index 483a304..0000000 --- a/src/main/resources/assets/rocks/models/block/large_cherry_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/cherry_log", - "particle": "block/cherry_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_crimson_stick.json b/src/main/resources/assets/rocks/models/block/large_crimson_stick.json deleted file mode 100755 index 5406b50..0000000 --- a/src/main/resources/assets/rocks/models/block/large_crimson_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/crimson_stem", - "particle": "block/crimson_stem" - } -} diff --git a/src/main/resources/assets/rocks/models/block/large_dark_oak_stick.json b/src/main/resources/assets/rocks/models/block/large_dark_oak_stick.json deleted file mode 100755 index 3bc4f85..0000000 --- a/src/main/resources/assets/rocks/models/block/large_dark_oak_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/dark_oak_log", - "particle": "block/dark_oak_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_diorite_rock.json b/src/main/resources/assets/rocks/models/block/large_diorite_rock.json deleted file mode 100755 index e07500d..0000000 --- a/src/main/resources/assets/rocks/models/block/large_diorite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/diorite", - "particle": "block/diorite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_end_stone_rock.json b/src/main/resources/assets/rocks/models/block/large_end_stone_rock.json deleted file mode 100755 index 262ab7f..0000000 --- a/src/main/resources/assets/rocks/models/block/large_end_stone_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/end_stone", - "particle": "block/end_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_granite_rock.json b/src/main/resources/assets/rocks/models/block/large_granite_rock.json deleted file mode 100755 index ad921b4..0000000 --- a/src/main/resources/assets/rocks/models/block/large_granite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/granite", - "particle": "block/granite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_gravel_rock.json b/src/main/resources/assets/rocks/models/block/large_gravel_rock.json deleted file mode 100755 index 5f03a62..0000000 --- a/src/main/resources/assets/rocks/models/block/large_gravel_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/gravel", - "particle": "block/gravel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_ice_rock.json b/src/main/resources/assets/rocks/models/block/large_ice_rock.json deleted file mode 100755 index af7055a..0000000 --- a/src/main/resources/assets/rocks/models/block/large_ice_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/packed_ice", - "particle": "block/packed_ice" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_jungle_stick.json b/src/main/resources/assets/rocks/models/block/large_jungle_stick.json deleted file mode 100755 index 2c41cdc..0000000 --- a/src/main/resources/assets/rocks/models/block/large_jungle_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/jungle_log", - "particle": "block/jungle_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_mangrove_stick.json b/src/main/resources/assets/rocks/models/block/large_mangrove_stick.json deleted file mode 100755 index 8bfcc7f..0000000 --- a/src/main/resources/assets/rocks/models/block/large_mangrove_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/mangrove_log", - "particle": "block/mangrove_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_netherrack_rock.json b/src/main/resources/assets/rocks/models/block/large_netherrack_rock.json deleted file mode 100755 index 8d801fd..0000000 --- a/src/main/resources/assets/rocks/models/block/large_netherrack_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/netherrack", - "particle": "block/netherrack" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_red_sand_rock.json b/src/main/resources/assets/rocks/models/block/large_red_sand_rock.json deleted file mode 100755 index 118bcce..0000000 --- a/src/main/resources/assets/rocks/models/block/large_red_sand_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/red_sandstone", - "particle": "block/red_sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_rock.json b/src/main/resources/assets/rocks/models/block/large_rock.json index fca8cf5..0dda568 100755 --- a/src/main/resources/assets/rocks/models/block/large_rock.json +++ b/src/main/resources/assets/rocks/models/block/large_rock.json @@ -4,7 +4,7 @@ "ambientocclusion": false, "textures": { "0": "block/stone", - "particle": "block/stone" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/rocks/models/block/large_sand_rock.json b/src/main/resources/assets/rocks/models/block/large_sand_rock.json deleted file mode 100755 index 07084c2..0000000 --- a/src/main/resources/assets/rocks/models/block/large_sand_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/sandstone", - "particle": "block/sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_soul_soil_rock.json b/src/main/resources/assets/rocks/models/block/large_soul_soil_rock.json deleted file mode 100755 index 48d41fc..0000000 --- a/src/main/resources/assets/rocks/models/block/large_soul_soil_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_rock", - "textures": { - "0": "block/soul_soil", - "particle": "block/soul_soil" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_spruce_stick.json b/src/main/resources/assets/rocks/models/block/large_spruce_stick.json deleted file mode 100755 index d002cc8..0000000 --- a/src/main/resources/assets/rocks/models/block/large_spruce_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/spruce_log", - "particle": "block/spruce_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/large_oak_stick.json b/src/main/resources/assets/rocks/models/block/large_stick.json similarity index 100% rename from src/main/resources/assets/rocks/models/block/large_oak_stick.json rename to src/main/resources/assets/rocks/models/block/large_stick.json diff --git a/src/main/resources/assets/rocks/models/block/large_warped_stick.json b/src/main/resources/assets/rocks/models/block/large_warped_stick.json deleted file mode 100755 index bc6672a..0000000 --- a/src/main/resources/assets/rocks/models/block/large_warped_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/large_oak_stick", - "textures": { - "0": "block/warped_stem", - "particle": "block/warped_stem" - } -} diff --git a/src/main/resources/assets/rocks/models/block/medium_acacia_stick.json b/src/main/resources/assets/rocks/models/block/medium_acacia_stick.json deleted file mode 100755 index 6a588cc..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_acacia_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/acacia_log", - "particle": "block/acacia_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_andesite_rock.json b/src/main/resources/assets/rocks/models/block/medium_andesite_rock.json deleted file mode 100755 index 35b67b9..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_andesite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/andesite", - "particle": "block/andesite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_bamboo_stick.json b/src/main/resources/assets/rocks/models/block/medium_bamboo_stick.json deleted file mode 100755 index 7fcf3ea..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_bamboo_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/bamboo_stalk", - "particle": "block/bamboo_stalk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_birch_stick.json b/src/main/resources/assets/rocks/models/block/medium_birch_stick.json deleted file mode 100755 index f1ffda5..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_birch_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/birch_log", - "particle": "block/birch_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_cherry_stick.json b/src/main/resources/assets/rocks/models/block/medium_cherry_stick.json deleted file mode 100755 index 824d98a..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_cherry_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/cherry_log", - "particle": "block/cherry_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_crimson_stick.json b/src/main/resources/assets/rocks/models/block/medium_crimson_stick.json deleted file mode 100755 index 43ec76a..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_crimson_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/crimson_stem", - "particle": "block/crimson_stem" - } -} diff --git a/src/main/resources/assets/rocks/models/block/medium_dark_oak_stick.json b/src/main/resources/assets/rocks/models/block/medium_dark_oak_stick.json deleted file mode 100755 index 70cbf4b..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_dark_oak_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/dark_oak_log", - "particle": "block/dark_oak_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_diorite_rock.json b/src/main/resources/assets/rocks/models/block/medium_diorite_rock.json deleted file mode 100755 index 97bc8e6..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_diorite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/diorite", - "particle": "block/diorite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_end_stone_rock.json b/src/main/resources/assets/rocks/models/block/medium_end_stone_rock.json deleted file mode 100755 index 387e18d..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_end_stone_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/end_stone", - "particle": "block/end_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_granite_rock.json b/src/main/resources/assets/rocks/models/block/medium_granite_rock.json deleted file mode 100755 index be4ed22..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_granite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/granite", - "particle": "block/granite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_gravel_rock.json b/src/main/resources/assets/rocks/models/block/medium_gravel_rock.json deleted file mode 100755 index f79c671..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_gravel_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/gravel", - "particle": "block/gravel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_ice_rock.json b/src/main/resources/assets/rocks/models/block/medium_ice_rock.json deleted file mode 100755 index 1a75f9a..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_ice_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/packed_ice", - "particle": "block/packed_ice" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_jungle_stick.json b/src/main/resources/assets/rocks/models/block/medium_jungle_stick.json deleted file mode 100755 index 7d5ebb3..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_jungle_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/jungle_log", - "particle": "block/jungle_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_mangrove_stick.json b/src/main/resources/assets/rocks/models/block/medium_mangrove_stick.json deleted file mode 100755 index 725fd67..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_mangrove_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/mangrove_log", - "particle": "block/mangrove_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_netherrack_rock.json b/src/main/resources/assets/rocks/models/block/medium_netherrack_rock.json deleted file mode 100755 index 9e79823..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_netherrack_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/netherrack", - "particle": "block/netherrack" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_red_sand_rock.json b/src/main/resources/assets/rocks/models/block/medium_red_sand_rock.json deleted file mode 100755 index 47a5bd7..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_red_sand_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/red_sandstone", - "particle": "block/red_sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_rock.json b/src/main/resources/assets/rocks/models/block/medium_rock.json index 9430a8a..e31ddb6 100755 --- a/src/main/resources/assets/rocks/models/block/medium_rock.json +++ b/src/main/resources/assets/rocks/models/block/medium_rock.json @@ -4,7 +4,7 @@ "ambientocclusion": false, "textures": { "0": "block/stone", - "particle": "block/stone" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/rocks/models/block/medium_sand_rock.json b/src/main/resources/assets/rocks/models/block/medium_sand_rock.json deleted file mode 100755 index 9d081fb..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_sand_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/sandstone", - "particle": "block/sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_soul_soil_rock.json b/src/main/resources/assets/rocks/models/block/medium_soul_soil_rock.json deleted file mode 100755 index dc46f59..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_soul_soil_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_rock", - "textures": { - "0": "block/soul_soil", - "particle": "block/soul_soil" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_spruce_stick.json b/src/main/resources/assets/rocks/models/block/medium_spruce_stick.json deleted file mode 100755 index 84eeca6..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_spruce_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/spruce_log", - "particle": "block/spruce_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/medium_oak_stick.json b/src/main/resources/assets/rocks/models/block/medium_stick.json similarity index 100% rename from src/main/resources/assets/rocks/models/block/medium_oak_stick.json rename to src/main/resources/assets/rocks/models/block/medium_stick.json diff --git a/src/main/resources/assets/rocks/models/block/medium_warped_stick.json b/src/main/resources/assets/rocks/models/block/medium_warped_stick.json deleted file mode 100755 index 36df041..0000000 --- a/src/main/resources/assets/rocks/models/block/medium_warped_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/medium_oak_stick", - "textures": { - "0": "block/warped_stem", - "particle": "block/warped_stem" - } -} diff --git a/src/main/resources/assets/rocks/models/block/small_acacia_stick.json b/src/main/resources/assets/rocks/models/block/small_acacia_stick.json deleted file mode 100755 index 756bb7a..0000000 --- a/src/main/resources/assets/rocks/models/block/small_acacia_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/acacia_log", - "particle": "block/acacia_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_andesite_rock.json b/src/main/resources/assets/rocks/models/block/small_andesite_rock.json deleted file mode 100755 index 728622b..0000000 --- a/src/main/resources/assets/rocks/models/block/small_andesite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/andesite", - "particle": "block/andesite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_bamboo_stick.json b/src/main/resources/assets/rocks/models/block/small_bamboo_stick.json deleted file mode 100755 index 0ac98ac..0000000 --- a/src/main/resources/assets/rocks/models/block/small_bamboo_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/bamboo_stalk", - "particle": "block/bamboo_stalk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_birch_stick.json b/src/main/resources/assets/rocks/models/block/small_birch_stick.json deleted file mode 100755 index f9b01bf..0000000 --- a/src/main/resources/assets/rocks/models/block/small_birch_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/birch_log", - "particle": "block/birch_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_cherry_stick.json b/src/main/resources/assets/rocks/models/block/small_cherry_stick.json deleted file mode 100755 index 2f9d15a..0000000 --- a/src/main/resources/assets/rocks/models/block/small_cherry_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/cherry_log", - "particle": "block/cherry_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_crimson_stick.json b/src/main/resources/assets/rocks/models/block/small_crimson_stick.json deleted file mode 100755 index 422d9a2..0000000 --- a/src/main/resources/assets/rocks/models/block/small_crimson_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/crimson_stem", - "particle": "block/crimson_stem" - } -} diff --git a/src/main/resources/assets/rocks/models/block/small_dark_oak_stick.json b/src/main/resources/assets/rocks/models/block/small_dark_oak_stick.json deleted file mode 100755 index 9ba2ebc..0000000 --- a/src/main/resources/assets/rocks/models/block/small_dark_oak_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/dark_oak_log", - "particle": "block/dark_oak_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_diorite_rock.json b/src/main/resources/assets/rocks/models/block/small_diorite_rock.json deleted file mode 100755 index 3221bcd..0000000 --- a/src/main/resources/assets/rocks/models/block/small_diorite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/diorite", - "particle": "block/diorite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_end_stone_rock.json b/src/main/resources/assets/rocks/models/block/small_end_stone_rock.json deleted file mode 100755 index e380fcb..0000000 --- a/src/main/resources/assets/rocks/models/block/small_end_stone_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/end_stone", - "particle": "block/end_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_granite_rock.json b/src/main/resources/assets/rocks/models/block/small_granite_rock.json deleted file mode 100755 index ce36f41..0000000 --- a/src/main/resources/assets/rocks/models/block/small_granite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/granite", - "particle": "block/granite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_gravel_rock.json b/src/main/resources/assets/rocks/models/block/small_gravel_rock.json deleted file mode 100755 index c8055f6..0000000 --- a/src/main/resources/assets/rocks/models/block/small_gravel_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/gravel", - "particle": "block/gravel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_ice_rock.json b/src/main/resources/assets/rocks/models/block/small_ice_rock.json deleted file mode 100755 index 51f81a1..0000000 --- a/src/main/resources/assets/rocks/models/block/small_ice_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/packed_ice", - "particle": "block/packed_ice" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_jungle_stick.json b/src/main/resources/assets/rocks/models/block/small_jungle_stick.json deleted file mode 100755 index 3594b65..0000000 --- a/src/main/resources/assets/rocks/models/block/small_jungle_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/jungle_log", - "particle": "block/jungle_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_mangrove_stick.json b/src/main/resources/assets/rocks/models/block/small_mangrove_stick.json deleted file mode 100755 index cf1b86f..0000000 --- a/src/main/resources/assets/rocks/models/block/small_mangrove_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/mangrove_log", - "particle": "block/mangrove_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_netherrack_rock.json b/src/main/resources/assets/rocks/models/block/small_netherrack_rock.json deleted file mode 100755 index 0cdf6d0..0000000 --- a/src/main/resources/assets/rocks/models/block/small_netherrack_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/netherrack", - "particle": "block/netherrack" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_red_sand_rock.json b/src/main/resources/assets/rocks/models/block/small_red_sand_rock.json deleted file mode 100755 index 975662d..0000000 --- a/src/main/resources/assets/rocks/models/block/small_red_sand_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/red_sandstone", - "particle": "block/red_sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_rock.json b/src/main/resources/assets/rocks/models/block/small_rock.json index 1a94c5a..f1628b4 100755 --- a/src/main/resources/assets/rocks/models/block/small_rock.json +++ b/src/main/resources/assets/rocks/models/block/small_rock.json @@ -4,7 +4,7 @@ "ambientocclusion": false, "textures": { "0": "block/stone", - "particle": "block/stone" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/rocks/models/block/small_sand_rock.json b/src/main/resources/assets/rocks/models/block/small_sand_rock.json deleted file mode 100755 index f4b9dfb..0000000 --- a/src/main/resources/assets/rocks/models/block/small_sand_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/sandstone", - "particle": "block/sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_soul_soil_rock.json b/src/main/resources/assets/rocks/models/block/small_soul_soil_rock.json deleted file mode 100755 index 525154c..0000000 --- a/src/main/resources/assets/rocks/models/block/small_soul_soil_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_rock", - "textures": { - "0": "block/soul_soil", - "particle": "block/soul_soil" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_spruce_stick.json b/src/main/resources/assets/rocks/models/block/small_spruce_stick.json deleted file mode 100755 index ca2e00b..0000000 --- a/src/main/resources/assets/rocks/models/block/small_spruce_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/spruce_log", - "particle": "block/spruce_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/small_oak_stick.json b/src/main/resources/assets/rocks/models/block/small_stick.json similarity index 100% rename from src/main/resources/assets/rocks/models/block/small_oak_stick.json rename to src/main/resources/assets/rocks/models/block/small_stick.json diff --git a/src/main/resources/assets/rocks/models/block/small_warped_stick.json b/src/main/resources/assets/rocks/models/block/small_warped_stick.json deleted file mode 100755 index 4361a72..0000000 --- a/src/main/resources/assets/rocks/models/block/small_warped_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/small_oak_stick", - "textures": { - "0": "block/warped_stem", - "particle": "block/warped_stem" - } -} diff --git a/src/main/resources/assets/rocks/models/block/tiny_andesite_rock.json b/src/main/resources/assets/rocks/models/block/tiny_andesite_rock.json deleted file mode 100755 index 60309c6..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_andesite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/andesite", - "particle": "block/andesite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_diorite_rock.json b/src/main/resources/assets/rocks/models/block/tiny_diorite_rock.json deleted file mode 100755 index 2385f91..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_diorite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/diorite", - "particle": "block/diorite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_end_stone_rock.json b/src/main/resources/assets/rocks/models/block/tiny_end_stone_rock.json deleted file mode 100755 index 9e846e0..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_end_stone_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/end_stone", - "particle": "block/end_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_granite_rock.json b/src/main/resources/assets/rocks/models/block/tiny_granite_rock.json deleted file mode 100755 index bae2cc6..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_granite_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/granite", - "particle": "block/granite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_gravel_rock.json b/src/main/resources/assets/rocks/models/block/tiny_gravel_rock.json deleted file mode 100755 index c83ea52..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_gravel_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/gravel", - "particle": "block/gravel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_ice_rock.json b/src/main/resources/assets/rocks/models/block/tiny_ice_rock.json deleted file mode 100755 index 869b295..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_ice_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/packed_ice", - "particle": "block/packed_ice" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_netherrack_rock.json b/src/main/resources/assets/rocks/models/block/tiny_netherrack_rock.json deleted file mode 100755 index 54a0e20..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_netherrack_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/netherrack", - "particle": "block/netherrack" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_red_sand_rock.json b/src/main/resources/assets/rocks/models/block/tiny_red_sand_rock.json deleted file mode 100755 index fbef2bc..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_red_sand_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/red_sandstone", - "particle": "block/red_sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_rock.json b/src/main/resources/assets/rocks/models/block/tiny_rock.json index c7fd2ca..69836ef 100755 --- a/src/main/resources/assets/rocks/models/block/tiny_rock.json +++ b/src/main/resources/assets/rocks/models/block/tiny_rock.json @@ -4,7 +4,7 @@ "ambientocclusion": false, "textures": { "0": "block/stone", - "particle": "block/stone" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/rocks/models/block/tiny_sand_rock.json b/src/main/resources/assets/rocks/models/block/tiny_sand_rock.json deleted file mode 100755 index 28f0dea..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_sand_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/sandstone", - "particle": "block/sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/block/tiny_soul_soil_rock.json b/src/main/resources/assets/rocks/models/block/tiny_soul_soil_rock.json deleted file mode 100755 index aa1e3b0..0000000 --- a/src/main/resources/assets/rocks/models/block/tiny_soul_soil_rock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:block/tiny_rock", - "textures": { - "0": "block/soul_soil", - "particle": "block/soul_soil" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/acacia_stick.json b/src/main/resources/assets/rocks/models/item/acacia_stick.json deleted file mode 100755 index 54caf28..0000000 --- a/src/main/resources/assets/rocks/models/item/acacia_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/acacia_log", - "particle": "block/acacia_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/andesite_rock.json b/src/main/resources/assets/rocks/models/item/andesite_rock.json deleted file mode 100755 index dd5445b..0000000 --- a/src/main/resources/assets/rocks/models/item/andesite_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_andesite_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/andesite_splitter.json b/src/main/resources/assets/rocks/models/item/andesite_splitter.json deleted file mode 100755 index 594896a..0000000 --- a/src/main/resources/assets/rocks/models/item/andesite_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/andesite", - "particle": "block/andesite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/bamboo_stick.json b/src/main/resources/assets/rocks/models/item/bamboo_stick.json deleted file mode 100755 index 4b524cc..0000000 --- a/src/main/resources/assets/rocks/models/item/bamboo_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/bamboo_stalk", - "particle": "block/bamboo_stalk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/birch_stick.json b/src/main/resources/assets/rocks/models/item/birch_stick.json deleted file mode 100755 index 1b69ba0..0000000 --- a/src/main/resources/assets/rocks/models/item/birch_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/birch_log", - "particle": "block/birch_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/cherry_stick.json b/src/main/resources/assets/rocks/models/item/cherry_stick.json deleted file mode 100755 index 965ac2a..0000000 --- a/src/main/resources/assets/rocks/models/item/cherry_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/cherry_log", - "particle": "block/cherry_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/crimson_stick.json b/src/main/resources/assets/rocks/models/item/crimson_stick.json deleted file mode 100755 index 9da48b2..0000000 --- a/src/main/resources/assets/rocks/models/item/crimson_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/crimson_stem", - "particle": "block/crimson_stem" - } -} diff --git a/src/main/resources/assets/rocks/models/item/dark_oak_stick.json b/src/main/resources/assets/rocks/models/item/dark_oak_stick.json deleted file mode 100755 index ee06b0c..0000000 --- a/src/main/resources/assets/rocks/models/item/dark_oak_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/dark_oak_log", - "particle": "block/dark_oak_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/diorite_rock.json b/src/main/resources/assets/rocks/models/item/diorite_rock.json deleted file mode 100755 index ba09472..0000000 --- a/src/main/resources/assets/rocks/models/item/diorite_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_diorite_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/diorite_splitter.json b/src/main/resources/assets/rocks/models/item/diorite_splitter.json deleted file mode 100755 index c32fef8..0000000 --- a/src/main/resources/assets/rocks/models/item/diorite_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/diorite", - "particle": "block/diorite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/end_stone_rock.json b/src/main/resources/assets/rocks/models/item/end_stone_rock.json deleted file mode 100755 index 5026350..0000000 --- a/src/main/resources/assets/rocks/models/item/end_stone_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_end_stone_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/end_stone_splitter.json b/src/main/resources/assets/rocks/models/item/end_stone_splitter.json deleted file mode 100755 index ea23602..0000000 --- a/src/main/resources/assets/rocks/models/item/end_stone_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/end_stone", - "particle": "block/end_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/granite_rock.json b/src/main/resources/assets/rocks/models/item/granite_rock.json deleted file mode 100755 index 9a66192..0000000 --- a/src/main/resources/assets/rocks/models/item/granite_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_granite_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/granite_splitter.json b/src/main/resources/assets/rocks/models/item/granite_splitter.json deleted file mode 100755 index 88f7ffe..0000000 --- a/src/main/resources/assets/rocks/models/item/granite_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/granite", - "particle": "block/granite" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/gravel_rock.json b/src/main/resources/assets/rocks/models/item/gravel_rock.json deleted file mode 100755 index b7f0da1..0000000 --- a/src/main/resources/assets/rocks/models/item/gravel_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_gravel_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/ice_rock.json b/src/main/resources/assets/rocks/models/item/ice_rock.json deleted file mode 100755 index fbe789e..0000000 --- a/src/main/resources/assets/rocks/models/item/ice_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_ice_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/ice_splitter.json b/src/main/resources/assets/rocks/models/item/ice_splitter.json deleted file mode 100755 index e6cab6e..0000000 --- a/src/main/resources/assets/rocks/models/item/ice_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/packed_ice", - "particle": "block/packed_ice" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/jungle_stick.json b/src/main/resources/assets/rocks/models/item/jungle_stick.json deleted file mode 100755 index ec66c84..0000000 --- a/src/main/resources/assets/rocks/models/item/jungle_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/jungle_log", - "particle": "block/jungle_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/mangrove_stick.json b/src/main/resources/assets/rocks/models/item/mangrove_stick.json deleted file mode 100755 index 072dfbe..0000000 --- a/src/main/resources/assets/rocks/models/item/mangrove_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/mangrove_log", - "particle": "block/mangrove_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/netherrack_rock.json b/src/main/resources/assets/rocks/models/item/netherrack_rock.json deleted file mode 100755 index 051e1f9..0000000 --- a/src/main/resources/assets/rocks/models/item/netherrack_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_netherrack_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/netherrack_splitter.json b/src/main/resources/assets/rocks/models/item/netherrack_splitter.json deleted file mode 100755 index d4ced83..0000000 --- a/src/main/resources/assets/rocks/models/item/netherrack_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/netherrack", - "particle": "block/netherrack" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/red_sand_rock.json b/src/main/resources/assets/rocks/models/item/red_sand_rock.json deleted file mode 100755 index 4b20384..0000000 --- a/src/main/resources/assets/rocks/models/item/red_sand_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_red_sand_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/red_sandstone_splitter.json b/src/main/resources/assets/rocks/models/item/red_sandstone_splitter.json deleted file mode 100755 index c6a36af..0000000 --- a/src/main/resources/assets/rocks/models/item/red_sandstone_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/red_sandstone", - "particle": "block/red_sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/rock.json b/src/main/resources/assets/rocks/models/item/rock_base.json similarity index 100% rename from src/main/resources/assets/rocks/models/item/rock.json rename to src/main/resources/assets/rocks/models/item/rock_base.json diff --git a/src/main/resources/assets/rocks/models/item/sand_rock.json b/src/main/resources/assets/rocks/models/item/sand_rock.json deleted file mode 100755 index 58daf35..0000000 --- a/src/main/resources/assets/rocks/models/item/sand_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_sand_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/sandstone_splitter.json b/src/main/resources/assets/rocks/models/item/sandstone_splitter.json deleted file mode 100755 index 140f930..0000000 --- a/src/main/resources/assets/rocks/models/item/sandstone_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/sandstone", - "particle": "block/sandstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/soul_soil_rock.json b/src/main/resources/assets/rocks/models/item/soul_soil_rock.json deleted file mode 100755 index dda3722..0000000 --- a/src/main/resources/assets/rocks/models/item/soul_soil_rock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "rocks:block/large_soul_soil_rock" -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/soul_soil_splitter.json b/src/main/resources/assets/rocks/models/item/soul_soil_splitter.json deleted file mode 100755 index 7236eff..0000000 --- a/src/main/resources/assets/rocks/models/item/soul_soil_splitter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/cobblestone_splitter", - "textures": { - "0": "block/soul_soil", - "particle": "block/soul_soil" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/cobblestone_splitter.json b/src/main/resources/assets/rocks/models/item/splitter_base.json similarity index 98% rename from src/main/resources/assets/rocks/models/item/cobblestone_splitter.json rename to src/main/resources/assets/rocks/models/item/splitter_base.json index 967c467..3f20268 100755 --- a/src/main/resources/assets/rocks/models/item/cobblestone_splitter.json +++ b/src/main/resources/assets/rocks/models/item/splitter_base.json @@ -2,7 +2,7 @@ "credit": "made by Motschen", "textures": { "0": "block/cobblestone", - "particle": "block/cobblestone" + "particle": "#0" }, "gui_light": "front", "elements": [ diff --git a/src/main/resources/assets/rocks/models/item/spruce_stick.json b/src/main/resources/assets/rocks/models/item/spruce_stick.json deleted file mode 100755 index 74aaa6d..0000000 --- a/src/main/resources/assets/rocks/models/item/spruce_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/spruce_log", - "particle": "block/spruce_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/rocks/models/item/oak_stick.json b/src/main/resources/assets/rocks/models/item/stick_base.json similarity index 100% rename from src/main/resources/assets/rocks/models/item/oak_stick.json rename to src/main/resources/assets/rocks/models/item/stick_base.json diff --git a/src/main/resources/assets/rocks/models/item/warped_stick.json b/src/main/resources/assets/rocks/models/item/warped_stick.json deleted file mode 100755 index e05a029..0000000 --- a/src/main/resources/assets/rocks/models/item/warped_stick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "rocks:item/oak_stick", - "textures": { - "0": "block/warped_stem", - "particle": "block/warped_stem" - } -}