revert: 1.21.1 backport

build.gradle

@@ -43,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}")

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
-loader_version=0.16.10
+	minecraft_version=1.21.4
+	yarn_mappings=1.21.4+build.4
+	loader_version=0.16.9
 
 # Mod Properties
-	mod_version = 1.9.3+1.21.1
+	mod_version = 1.9.3
 	maven_group = eu.midnightdust.motschen
 	archives_base_name = rocks
 	release_type=release
@@ -17,7 +17,7 @@ loader_version=0.16.10
 
 # 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.115.1+1.21.1
-midnightlib_version=1.6.9+1.21-fabric
-polymer_version=0.9.18+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

src/main/generated/assets/rocks/items/acacia_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/acacia_stick"
+  }
+}

src/main/generated/assets/rocks/items/andesite_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/andesite_rock"
+  }
+}

src/main/generated/assets/rocks/items/andesite_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/andesite_splitter"
+  }
+}

src/main/generated/assets/rocks/items/bamboo_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/bamboo_stick"
+  }
+}

src/main/generated/assets/rocks/items/birch_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/birch_stick"
+  }
+}

src/main/generated/assets/rocks/items/cherry_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/cherry_stick"
+  }
+}

src/main/generated/assets/rocks/items/cobblestone_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/cobblestone_splitter"
+  }
+}

src/main/generated/assets/rocks/items/crimson_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/crimson_stick"
+  }
+}

src/main/generated/assets/rocks/items/dark_oak_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/dark_oak_stick"
+  }
+}

src/main/generated/assets/rocks/items/diorite_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/diorite_rock"
+  }
+}

src/main/generated/assets/rocks/items/diorite_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/diorite_splitter"
+  }
+}

src/main/generated/assets/rocks/items/end_stone_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/end_stone_rock"
+  }
+}

src/main/generated/assets/rocks/items/end_stone_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/end_stone_splitter"
+  }
+}

src/main/generated/assets/rocks/items/geyser.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/geyser"
+  }
+}

src/main/generated/assets/rocks/items/granite_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/granite_rock"
+  }
+}

src/main/generated/assets/rocks/items/granite_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/granite_splitter"
+  }
+}

src/main/generated/assets/rocks/items/gravel_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/gravel_rock"
+  }
+}

src/main/generated/assets/rocks/items/ice_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/ice_rock"
+  }
+}

src/main/generated/assets/rocks/items/ice_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/ice_splitter"
+  }
+}

src/main/generated/assets/rocks/items/jungle_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/jungle_stick"
+  }
+}

src/main/generated/assets/rocks/items/mangrove_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/mangrove_stick"
+  }
+}

src/main/generated/assets/rocks/items/nether_geyser.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/nether_geyser"
+  }
+}

src/main/generated/assets/rocks/items/netherrack_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/netherrack_rock"
+  }
+}

src/main/generated/assets/rocks/items/netherrack_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/netherrack_splitter"
+  }
+}

src/main/generated/assets/rocks/items/oak_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/oak_stick"
+  }
+}

src/main/generated/assets/rocks/items/pale_oak_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/pale_oak_stick"
+  }
+}

src/main/generated/assets/rocks/items/pinecone.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/pinecone"
+  }
+}

src/main/generated/assets/rocks/items/red_sand_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/red_sand_rock"
+  }
+}

src/main/generated/assets/rocks/items/red_sandstone_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/red_sandstone_splitter"
+  }
+}

src/main/generated/assets/rocks/items/rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/rock"
+  }
+}

src/main/generated/assets/rocks/items/sand_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/sand_rock"
+  }
+}

src/main/generated/assets/rocks/items/sandstone_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/sandstone_splitter"
+  }
+}

src/main/generated/assets/rocks/items/seashell.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/seashell"
+  }
+}

src/main/generated/assets/rocks/items/soul_soil_rock.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/soul_soil_rock"
+  }
+}

src/main/generated/assets/rocks/items/soul_soil_splitter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/soul_soil_splitter"
+  }
+}

src/main/generated/assets/rocks/items/spruce_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/spruce_stick"
+  }
+}

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"
+  }
+}

src/main/generated/assets/rocks/items/warped_stick.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "rocks:item/warped_stick"
+  }
+}

src/main/generated/assets/rocks/lang/de_de.json

@@ -17,6 +17,7 @@
   "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",
@@ -26,16 +27,44 @@
   "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.cobblestone_splitter": "Bruchsteinsplitter",
+  "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.biomeExclusions": "Ausgeschlosene Biome",
   "rocks.midnightconfig.biomeExclusions.tooltip": "In diesen Biomen werden keine Features der Mod generiert.\nFormat: modid:biome_name",

src/main/generated/assets/rocks/lang/en_us.json

@@ -17,6 +17,7 @@
   "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",
@@ -26,16 +27,44 @@
   "block.rocks.spruce_stick": "Spruce Stick",
   "block.rocks.starfish": "Starfish",
   "block.rocks.warped_stick": "Warped Stick",
-  "item.rocks.andesite_splitter": "Andesite Fragment",
-  "item.rocks.cobblestone_splitter": "Cobblestone Fragment",
-  "item.rocks.diorite_splitter": "Diorite Fragment",
-  "item.rocks.end_stone_splitter": "End Stone Fragment",
-  "item.rocks.granite_splitter": "Granite Fragment",
-  "item.rocks.ice_splitter": "Ice Fragment",
-  "item.rocks.netherrack_splitter": "Netherrack Fragment",
-  "item.rocks.red_sandstone_splitter": "Red Sandstone Fragment",
-  "item.rocks.sandstone_splitter": "Sandstone Fragment",
-  "item.rocks.soul_soil_splitter": "Soul Soil Fragment",
+  "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.biomeExclusions": "Excluded biomes",
   "rocks.midnightconfig.biomeExclusions.tooltip": "No feature will generate in these biomes.\nFormat: modid:biome_name",