release v21.11.0

Fuzss · Fuzss · commit c89e95f1390e · 2025-12-14T23:43:24.000+01:00
diff --git a/1.21.11/CHANGELOG.md b/1.21.11/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v21.11.0-1.21.11] - 2025-12-14
+
+### Changed
+
+- Update to Minecraft 1.21.11
diff --git a/1.21.11/Common/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 b/1.21.11/Common/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86
@@ -1,2 +1,2 @@
-// 1.21.10	2025-10-08T22:59:25.860205	Pack Metadata
-e4d25c12715bf783274587a70f50636419143fb5 pack.mcmeta
+// 1.21.11	2025-12-14T23:41:54.05021	Pack Metadata
+4d54d372d0d59e8de4042ebb9ec50529fb5cb1ec pack.mcmeta
diff --git a/1.21.11/Common/src/generated/resources/.cache/190dc8cc9e260d5273a6d094a2d5cfe3ccdbd9b6 b/1.21.11/Common/src/generated/resources/.cache/190dc8cc9e260d5273a6d094a2d5cfe3ccdbd9b6
@@ -1,2 +1,2 @@
-// 1.21.10	2025-10-08T22:59:25.851359	Language (en_us)
+// 1.21.11	2025-12-14T23:41:54.037043	Language (en_us)
 3fe337587ed4300aa5ab2eb0fa61c9f753cbc27c assets/stoneworks/lang/en_us.json
diff --git a/1.21.11/Common/src/generated/resources/.cache/50b16d832771f8a8317f4d1b88c5121208c8c4f9 b/1.21.11/Common/src/generated/resources/.cache/50b16d832771f8a8317f4d1b88c5121208c8c4f9
@@ -1,4 +1,4 @@
-// 1.21.10	2025-10-08T22:59:25.824149	Tags for minecraft:block mod id vanilla
+// 1.21.11	2025-12-14T23:41:54.020766	Tags for minecraft:block mod id vanilla
 b53345de26b7f40119186a7ab96ee8cd2684d56f data/minecraft/tags/block/mineable/pickaxe.json
 f38d4357085f21523dd3010cf8f95a548c0b24f0 data/minecraft/tags/block/slabs.json
 20b676126f496e8b95202859dc2b94abf4b06b01 data/minecraft/tags/block/stairs.json
diff --git a/1.21.11/Common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7 b/1.21.11/Common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7
@@ -1,4 +1,4 @@
-// 1.21.10	2025-10-08T22:59:25.830519	Model Definitions
+// 1.21.11	2025-12-14T23:41:54.022617	Model Definitions
 d97c867fb2ac22d79df44af806b26d6ea6260b35 assets/stoneworks/blockstates/andesite_brick_slab.json
 594cd50684b1dd32ed4934b2125912a97a219a16 assets/stoneworks/blockstates/andesite_brick_stairs.json
 bb5bd0d02eeb98914e90cd7253cb50cff622010e assets/stoneworks/blockstates/andesite_brick_wall.json
diff --git a/1.21.11/Common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/1.21.11/Common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.21.10	2025-10-08T22:59:25.853118	Recipes
+// 1.21.11	2025-12-14T23:41:54.038428	Recipes
 8e7047eefe03de1b3a588fef98a940957d51c1bc data/stoneworks/advancement/recipes/building_blocks/andesite_brick_slab.json
 fa3584097b1c1a9afdf0a90b9f0c17bd0c595b71 data/stoneworks/advancement/recipes/building_blocks/andesite_brick_slab_from_andesite_bricks_stonecutting.json
 872917ed4d0234e56c91deff60aff2dde7e6ec60 data/stoneworks/advancement/recipes/building_blocks/andesite_brick_stairs.json
diff --git a/1.21.11/Common/src/generated/resources/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49 b/1.21.11/Common/src/generated/resources/.cache/dc1d6e7286e7569a79007c10f809d49635ea1c49
@@ -1,4 +1,4 @@
-// 1.21.10	2025-10-08T22:59:25.811503	Block Loot Tables
+// 1.21.11	2025-12-14T23:41:54.016685	Block Loot Tables
 b6cfca649dde271ba0715d9f6bc1e156de392f54 data/stoneworks/loot_table/blocks/andesite_brick_slab.json
 a18d04f807d39954c14e8d2a2e2b0b1c3fb7eade data/stoneworks/loot_table/blocks/andesite_brick_stairs.json
 5487cc408f8f4acc735ea8e43b37587d5aeca366 data/stoneworks/loot_table/blocks/andesite_brick_wall.json
diff --git a/1.21.11/Common/src/generated/resources/pack.mcmeta b/1.21.11/Common/src/generated/resources/pack.mcmeta
@@ -1,7 +1,10 @@
 {
   "pack": {
     "description": "Resources for Stoneworks",
-    "max_format": 88,
-    "min_format": 88
+    "max_format": 94,
+    "min_format": [
+      94,
+      1
+    ]
   }
 }
diff --git a/1.21.11/Common/src/main/java/fuzs/stoneworks/Stoneworks.java b/1.21.11/Common/src/main/java/fuzs/stoneworks/Stoneworks.java
@@ -2,10 +2,9 @@
 
 import fuzs.puzzleslib.api.config.v3.ConfigHolder;
 import fuzs.puzzleslib.api.core.v1.ModConstructor;
-import fuzs.puzzleslib.api.core.v1.utility.ResourceLocationHelper;
 import fuzs.stoneworks.config.CommonConfig;
 import fuzs.stoneworks.init.ModRegistry;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,7 +20,7 @@ public void onConstructMod() {
         ModRegistry.bootstrap();
     }
 
-    public static ResourceLocation id(String path) {
-        return ResourceLocationHelper.fromNamespaceAndPath(MOD_ID, path);
+    public static Identifier id(String path) {
+        return Identifier.fromNamespaceAndPath(MOD_ID, path);
     }
 }
diff --git a/1.21.11/Common/src/main/java/fuzs/stoneworks/data/ModBlockTagsProvider.java b/1.21.11/Common/src/main/java/fuzs/stoneworks/data/ModBlockTagsProvider.java
@@ -35,4 +35,4 @@ public void addTags(HolderLookup.Provider provider) {
                 .filter(Objects::nonNull)
                 .forEach(this.tag(BlockTags.WALLS)::add);
     }
-}
+}
diff --git a/1.21.11/Common/src/main/java/fuzs/stoneworks/world/block/variant/StoneBlockVariant.java b/1.21.11/Common/src/main/java/fuzs/stoneworks/world/block/variant/StoneBlockVariant.java
@@ -1,15 +1,13 @@
 package fuzs.stoneworks.world.block.variant;
 
-import fuzs.puzzleslib.api.core.v1.utility.ResourceLocationHelper;
 import fuzs.stoneworks.Stoneworks;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.Objects;
@@ -81,7 +79,6 @@ public Stream<Block> allBlocks() {
         return Stream.of(this.block(), this.stairs(), this.slab(), this.wall()).filter(Objects::nonNull);
     }
 
-    @NotNull
     public Block block() {
         return Objects.requireNonNull(this.block(0, this.blockName()), "base block is null");
     }
@@ -103,8 +100,9 @@ public Block wall() {
 
     @Nullable
     private Block block(int index, String key) {
-        if (this.blocks[index] == null && (this.isVanillaVariant() || index == 0 || this.blockVariant.supportsAdditionalBlocks())) {
-            ResourceLocation id = this.id(key);
+        if (this.blocks[index] == null && (this.isVanillaVariant() || index == 0
+                || this.blockVariant.supportsAdditionalBlocks())) {
+            Identifier id = this.id(key);
             if (!BuiltInRegistries.BLOCK.containsKey(id)) {
                 if (this.isVanillaVariant()) {
                     // stupid hack so this does not run every time when the vanilla variant simply doesn't have the block type
@@ -119,8 +117,8 @@ private Block block(int index, String key) {
         return this.blocks[index] == Blocks.AIR ? null : this.blocks[index];
     }
 
-    public ResourceLocation id(String key) {
-        return ResourceLocationHelper.fromNamespaceAndPath(Stoneworks.MOD_ID, key);
+    public Identifier id(String key) {
+        return Identifier.fromNamespaceAndPath(Stoneworks.MOD_ID, key);
     }
 
     public BlockState baseBlockState() {
diff --git a/1.21.11/Common/src/main/java/fuzs/stoneworks/world/block/variant/StoneVariantsProvider.java b/1.21.11/Common/src/main/java/fuzs/stoneworks/world/block/variant/StoneVariantsProvider.java
@@ -1,15 +1,15 @@
 package fuzs.stoneworks.world.block.variant;
 
 import com.google.common.collect.Maps;
-import fuzs.puzzleslib.api.core.v1.utility.ResourceLocationHelper;
+import net.minecraft.resources.Identifier;
 import fuzs.stoneworks.Stoneworks;
 import fuzs.stoneworks.config.CommonConfig;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -20,8 +20,7 @@
 
 public class StoneVariantsProvider {
     private static final Map<String, StoneBlockVariant> STONE_BLOCK_VARIANTS = Maps.newLinkedHashMap();
-    @Nullable
-    private static Collection<ItemStack> sortedVariantItems;
+    @Nullable private static Collection<ItemStack> sortedVariantItems;
 
     static {
         registerAllStoneBlockVariants();
@@ -169,8 +168,8 @@ public String wallName() {
         }
 
         @Override
-        public ResourceLocation id(String key) {
-            return ResourceLocationHelper.withDefaultNamespace(key);
+        public Identifier id(String key) {
+            return Identifier.withDefaultNamespace(key);
         }
 
         @Override
diff --git a/1.21.11/gradle.properties b/1.21.11/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 loom.ignoreDependencyLoomVersionValidation=true
 
-project.libs=1.21.10-SNAPSHOT
+project.libs=1.21.11-SNAPSHOT
 project.platforms=Common, Fabric, NeoForge
 project.plugins=1.0-SNAPSHOT
 
@@ -15,7 +15,7 @@ mod.group=fuzs.stoneworks
 mod.id=stoneworks
 mod.license=MPL-2.0
 mod.name=Stoneworks
-mod.version=21.10.0
+mod.version=21.11.0
 
 dependencies.fabric.fabricapi=required
 dependencies.fabric.forgeconfigapiport=required
diff --git a/1.21.11/gradle/wrapper/gradle-wrapper.jar b/1.21.11/gradle/wrapper/gradle-wrapper.jar
diff --git a/1.21.11/gradle/wrapper/gradle-wrapper.properties b/1.21.11/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/1.21.11/metadata.json b/1.21.11/metadata.json
@@ -0,0 +1,61 @@
+{
+    "mod": {
+        "id": "stoneworks",
+        "group": "fuzs.stoneworks",
+        "name": "Stoneworks",
+        "version": "21.11.0",
+        "authors": [
+            "Fuzs"
+        ],
+        "description": "Vanilla stone types in plenty of variations for all your building needs.",
+        "license": "MPL-2.0"
+    },
+    "dependencies": [
+        {
+            "name": "fabricapi",
+            "type": "required",
+            "platforms": [
+                "fabric"
+            ]
+        },
+        {
+            "name": "forgeconfigapiport",
+            "type": "required",
+            "platforms": [
+                "fabric"
+            ]
+        },
+        {
+            "name": "puzzleslib",
+            "type": "required",
+            "platforms": [
+                "fabric",
+                "neoforge"
+            ]
+        }
+    ],
+    "links": [
+        {
+            "name": "curseforge",
+            "slug": "stoneworks",
+            "id": "852663"
+        },
+        {
+            "name": "github",
+            "slug": "stoneworks"
+        },
+        {
+            "name": "modrinth",
+            "slug": "stoneworks",
+            "id": "FzyTKtVF"
+        }
+    ],
+    "environments": {
+        "client": "required",
+        "server": "required"
+    },
+    "platforms": [
+        "fabric",
+        "neoforge"
+    ]
+}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-// 1.21.10 2025-10-08T22:59:25.851359 Language (en_us)`
	`1`	`+// 1.21.11 2025-12-14T23:41:54.037043 Language (en_us)`
`2`	`2`	`3fe337587ed4300aa5ab2eb0fa61c9f753cbc27c assets/stoneworks/lang/en_us.json`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// 1.21.10 2025-10-08T22:59:25.824149 Tags for minecraft:block mod id vanilla`
	`1`	`+// 1.21.11 2025-12-14T23:41:54.020766 Tags for minecraft:block mod id vanilla`
`2`	`2`	`b53345de26b7f40119186a7ab96ee8cd2684d56f data/minecraft/tags/block/mineable/pickaxe.json`
`3`	`3`	`f38d4357085f21523dd3010cf8f95a548c0b24f0 data/minecraft/tags/block/slabs.json`
`4`	`4`	`20b676126f496e8b95202859dc2b94abf4b06b01 data/minecraft/tags/block/stairs.json`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// 1.21.10 2025-10-08T22:59:25.830519 Model Definitions`
	`1`	`+// 1.21.11 2025-12-14T23:41:54.022617 Model Definitions`
`2`	`2`	`d97c867fb2ac22d79df44af806b26d6ea6260b35 assets/stoneworks/blockstates/andesite_brick_slab.json`
`3`	`3`	`594cd50684b1dd32ed4934b2125912a97a219a16 assets/stoneworks/blockstates/andesite_brick_stairs.json`
`4`	`4`	`bb5bd0d02eeb98914e90cd7253cb50cff622010e assets/stoneworks/blockstates/andesite_brick_wall.json`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// 1.21.10 2025-10-08T22:59:25.853118 Recipes`
	`1`	`+// 1.21.11 2025-12-14T23:41:54.038428 Recipes`
`2`	`2`	`8e7047eefe03de1b3a588fef98a940957d51c1bc data/stoneworks/advancement/recipes/building_blocks/andesite_brick_slab.json`
`3`	`3`	`fa3584097b1c1a9afdf0a90b9f0c17bd0c595b71 data/stoneworks/advancement/recipes/building_blocks/andesite_brick_slab_from_andesite_bricks_stonecutting.json`
`4`	`4`	`872917ed4d0234e56c91deff60aff2dde7e6ec60 data/stoneworks/advancement/recipes/building_blocks/andesite_brick_stairs.json`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// 1.21.10 2025-10-08T22:59:25.811503 Block Loot Tables`
	`1`	`+// 1.21.11 2025-12-14T23:41:54.016685 Block Loot Tables`
`2`	`2`	`b6cfca649dde271ba0715d9f6bc1e156de392f54 data/stoneworks/loot_table/blocks/andesite_brick_slab.json`
`3`	`3`	`a18d04f807d39954c14e8d2a2e2b0b1c3fb7eade data/stoneworks/loot_table/blocks/andesite_brick_stairs.json`
`4`	`4`	`5487cc408f8f4acc735ea8e43b37587d5aeca366 data/stoneworks/loot_table/blocks/andesite_brick_wall.json`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"pack": {`
`3`	`3`	`"description": "Resources for Stoneworks",`
`4`		`- "max_format": 88,`
`5`		`- "min_format": 88`
	`4`	`+ "max_format": 94,`
	`5`	`+ "min_format": [`
	`6`	`+ 94,`
	`7`	`+ 1`
	`8`	`+ ]`
`6`	`9`	`}`
`7`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,9 @@`
`2`	`2`
`3`	`3`	`import fuzs.puzzleslib.api.config.v3.ConfigHolder;`
`4`	`4`	`import fuzs.puzzleslib.api.core.v1.ModConstructor;`
`5`		`-import fuzs.puzzleslib.api.core.v1.utility.ResourceLocationHelper;`
`6`	`5`	`import fuzs.stoneworks.config.CommonConfig;`
`7`	`6`	`import fuzs.stoneworks.init.ModRegistry;`
`8`		`-import net.minecraft.resources.ResourceLocation;`
	`7`	`+import net.minecraft.resources.Identifier;`
`9`	`8`	`import org.slf4j.Logger;`
`10`	`9`	`import org.slf4j.LoggerFactory;`
`11`	`10`
`@@ -21,7 +20,7 @@ public void onConstructMod() {`
`21`	`20`	`ModRegistry.bootstrap();`
`22`	`21`	`}`
`23`	`22`
`24`		`- public static ResourceLocation id(String path) {`
`25`		`- return ResourceLocationHelper.fromNamespaceAndPath(MOD_ID, path);`
	`23`	`+ public static Identifier id(String path) {`
	`24`	`+ return Identifier.fromNamespaceAndPath(MOD_ID, path);`
`26`	`25`	`}`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,4 @@ public void addTags(HolderLookup.Provider provider) {`
`35`	`35`	`.filter(Objects::nonNull)`
`36`	`36`	`.forEach(this.tag(BlockTags.WALLS)::add);`
`37`	`37`	`}`
`38`		`-}`
	`38`	`+}`