update to 1.21

Author: Cheaterpaul

.github/workflows/crowdin.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup Java JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
           cache: 'gradle'
       - name: Determine Crowdin branch

.github/workflows/gradle-build.yml

@@ -3,11 +3,11 @@ name: Build
 on:
   push:
     branches:
-      - '1.20*'
+      - '1.21*'
       - 'feature/*'
   pull_request:
     branches:
-      - '1.20*'
+      - '1.21*'
       - 'feature/*'
 
 jobs:
@@ -17,11 +17,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 1.17
+      - name: Set up JDK 1.21
         uses: actions/setup-java@v3.1.0
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
       - name: Setup Gradle
         run: ./gradlew

.github/workflows/publish.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Setup Java JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
           cache: 'gradle'
       - name: Determine Crowdin branch
@@ -90,7 +90,7 @@ jobs:
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
         cache: 'gradle'
     - name: Install Crowdin CLI

README.md

@@ -1,4 +1,4 @@
-Werewolves for Minecraft 1.20 - Latest branch
+Werewolves for Minecraft 1.21 - Latest branch
 ====
 
 

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'net.neoforged.gradle.userdev' version '7.0.124'
-    id "net.neoforged.gradle.mixin" version "7.0.124"
+    id 'net.neoforged.gradle.userdev' version '7.0.145'
+    id "net.neoforged.gradle.mixin" version "7.0.145"
     id 'idea'
     id 'eclipse'
     id "me.modmuss50.mod-publish-plugin" version "0.4.2"
@@ -13,7 +13,7 @@ base {
     archivesName = mod_name
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 sourceSets {
     api {
@@ -77,7 +77,7 @@ tasks.named('processResources', ProcessResources).configure {
     ]
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+    filesMatching(['META-INF/neoforge.mods.toml', 'pack.mcmeta']) {
         expand replaceProperties + [project: project]
     }
 }

gradle.properties

@@ -4,13 +4,13 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.debug=false
 
 # forge
-minecraft_version=1.20.4
-minecraft_version_range=[1.20.4,1.21)
-forge_version=20.4.210
-forge_version_range=[20.4,)
-loader_version_range=[1,)
-parchment_minecraft_version=1.20.2
-parchment_mappings_version=2023.12.10
+minecraft_version=1.21
+minecraft_version_range=[1.21,1.22)
+forge_version=21.0.143
+forge_version_range=[21.0.143,)
+loader_version_range=[4,)
+neogradle.subsystems.parchment.minecraftVersion=1.21
+neogradle.subsystems.parchment.mappingsVersion=2024.07.28
 pack_format_number=18
 
 # mod
@@ -37,21 +37,21 @@ type="test"
 classification="test"
 
 #vampirism settings
-vampirism_version=1.10.1
-vampirism_version_range=[1.10.0,1.11.0)
+vampirism_version=1.10.0-beta.1
+vampirism_version_range=[1.10.0-beta.1,1.11.0)
 
 #jei setting
 include_jei=true
-jei_mc_version=1.20.4
-jei_version=17.3.0.49
+jei_mc_version=1.21
+jei_version=19.3.1.24
 
 #guideapi setting
-include_guideapi=false
-guideapi_version=1.20.1-2.2.6
+include_guideapi=true
+guideapi_version=1.21-2.3.0-beta.1
 
 #terrablender setting
 include_terrablender=true
-terrablender_version=1.20.4-3.3.0.12
+terrablender_version=1.21-4.0.0.1
 
 #jade
 include_jade=false

gradle/artifacts.gradle

@@ -6,15 +6,17 @@
  developers like to distribute.
 */
 
-task sourcesJar(type: Jar, dependsOn: classes) {
+tasks.register('sourcesJar', Jar) {
+    dependsOn classes
 
     description = 'Creates a JAR containing the source code.'
     from sourceSets.main.allSource
     from sourceSets.api.allSource
     archiveClassifier = 'sources'
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+tasks.register('javadocJar', Jar) {
+    dependsOn javadoc
 
     description = 'Creates a JAR containing the JavaDocs.'
     from javadoc.destinationDir
@@ -26,7 +28,6 @@ javadoc {
 }
 
 artifacts {
-
     archives sourcesJar
     archives javadocJar
 }

gradle/forge.gradle

@@ -70,16 +70,20 @@ runs {
     configureEach {
         systemProperty 'forge.logging.console.level', 'debug'
 
-        modSources = [project.sourceSets.api, project.sourceSets.main]
+        modSources project.sourceSets.api, project.sourceSets.main
     }
     client {
         systemProperty 'vampirism_target', 'dev'
         jvmArgument '-XX:+AllowEnhancedClassRedefinition'
+        jvmArgument '-XX:+IgnoreUnrecognizedVMOptions'
         systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+        systemProperty 'mixin.debug.export', 'true'
     }
 
     server {
         systemProperty 'vampirism_target', 'dev'
+        jvmArgument '-XX:+AllowEnhancedClassRedefinition'
+        jvmArgument '-XX:+IgnoreUnrecognizedVMOptions'
         systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
         programArgument '--nogui'
     }
@@ -93,11 +97,4 @@ runs {
         systemProperty 'vampirism_target', 'dev_data'
         programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
-}
-
-subsystems {
-    parchment {
-        minecraftVersion = project.parchment_minecraft_version
-        mappingsVersion = project.parchment_mappings_version
-    }
 }

src/api/java/de/teamlapen/werewolves/api/ModRegistryItems.java

@@ -0,0 +1,20 @@
+package de.teamlapen.werewolves.api;
+
+import de.teamlapen.vampirism.api.util.VResourceLocation;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.neoforged.neoforge.registries.DeferredHolder;
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
+public class ModRegistryItems {
+
+    public static final DeferredHolder<Block, Block> JACARANDA_PLANKS = DeferredHolder.create(ResourceKey.create(Registries.BLOCK, WResourceLocation.mod("jacaranda_planks")));
+    public static final DeferredHolder<Block, Block> MAGIC_PLANKS = DeferredHolder.create(ResourceKey.create(Registries.BLOCK, WResourceLocation.mod("magic_planks")));
+    public static final DeferredHolder<Item, Item> JACARANDA_BOAT = DeferredHolder.create(ResourceKey.create(Registries.ITEM, WResourceLocation.mod("jacaranda_boat")));
+    public static final DeferredHolder<Item, Item> MAGIC_BOAT = DeferredHolder.create(ResourceKey.create(Registries.ITEM, WResourceLocation.mod("magic_boat")));
+    public static final DeferredHolder<Item, Item> JACARANDA_CHEST_BOAT = DeferredHolder.create(ResourceKey.create(Registries.ITEM, WResourceLocation.mod("jacaranda_chest_boat")));
+    public static final DeferredHolder<Item, Item> MAGIC_CHEST_BOAT = DeferredHolder.create(ResourceKey.create(Registries.ITEM, WResourceLocation.mod("magic_chest_boat")));
+}

src/api/java/de/teamlapen/werewolves/api/WEnums.java

@@ -0,0 +1,16 @@
+package de.teamlapen.werewolves.api;
+
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.entity.vehicle.Boat;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import net.neoforged.fml.common.asm.enumextension.EnumProxy;
+
+import java.util.function.Supplier;
+
+public class WEnums {
+    public static final EnumProxy<MobCategory> WEREWOLF_CATEGORY = new EnumProxy<>(MobCategory.class, WReference.MODID + ":werewolf", 8, false, false, 128);
+    public static final EnumProxy<Boat.Type> JACARANDA_BOAT_TYPE = new EnumProxy<>(Boat.Type.class, ModRegistryItems.JACARANDA_PLANKS, WReference.MODID + ":jacaranda", ModRegistryItems.JACARANDA_BOAT, ModRegistryItems.JACARANDA_CHEST_BOAT, (Supplier<Item>)() -> Items.STICK, false);
+    public static final EnumProxy<Boat.Type> MAGIC_BOAT_TYPE = new EnumProxy<>(Boat.Type.class, ModRegistryItems.MAGIC_PLANKS, WReference.MODID + ":magic", ModRegistryItems.MAGIC_BOAT, ModRegistryItems.MAGIC_CHEST_BOAT, (Supplier<Item>)() -> Items.STICK, false);
+
+}

src/api/java/de/teamlapen/werewolves/api/WReference.java

@@ -2,11 +2,8 @@
 
 import de.teamlapen.vampirism.api.entity.factions.IPlayableFaction;
 import de.teamlapen.werewolves.api.entities.player.IWerewolfPlayer;
-import net.minecraft.world.entity.MobType;
-import net.minecraft.world.item.CreativeModeTab;
 
 public class WReference {
     public static final String MODID = "werewolves";
-    public static MobType WEREWOLF_CREATURE_ATTRIBUTES;
     public static IPlayableFaction<IWerewolfPlayer> WEREWOLF_FACTION;
 }

src/api/java/de/teamlapen/werewolves/api/WResourceLocation.java

@@ -0,0 +1,27 @@
+package de.teamlapen.werewolves.api;
+
+import de.teamlapen.vampirism.api.VReference;
+import net.minecraft.resources.ResourceLocation;
+
+public class WResourceLocation {
+
+    public static ResourceLocation loc(String namespace, String path) {
+        return ResourceLocation.fromNamespaceAndPath(namespace, path);
+    }
+
+    public static ResourceLocation mod(String path) {
+        return ResourceLocation.fromNamespaceAndPath(WReference.MODID, path);
+    }
+
+    public static ResourceLocation v(String path) {
+        return ResourceLocation.fromNamespaceAndPath(VReference.MODID, path);
+    }
+
+    public static ResourceLocation common(String path) {
+        return ResourceLocation.fromNamespaceAndPath("c", path);
+    }
+
+    public static ResourceLocation mc(String path) {
+        return ResourceLocation.withDefaultNamespace(path);
+    }
+}

src/api/java/de/teamlapen/werewolves/api/WerewolvesAttachments.java

@@ -1,8 +1,5 @@
 package de.teamlapen.werewolves.api;
 
-import de.teamlapen.vampirism.api.VReference;
-import de.teamlapen.vampirism.api.VampirismAttachments;
-import de.teamlapen.vampirism.api.entity.player.vampire.IVampirePlayer;
 import de.teamlapen.werewolves.api.entities.player.IWerewolfPlayer;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.neoforge.attachment.AttachmentType;
@@ -14,8 +11,8 @@ public class WerewolvesAttachments {
     public static final DeferredHolder<AttachmentType<?>, AttachmentType<IWerewolfPlayer>> WEREWOLF_PLAYER = DeferredHolder.create(NeoForgeRegistries.Keys.ATTACHMENT_TYPES, Keys.WEREWOLF_PLAYER);
 
     public static class Keys {
-        public static final ResourceLocation WEREWOLF_PLAYER = new ResourceLocation(WReference.MODID, "werewolf_player");
-        public static final ResourceLocation WOLFSBANE_HANDLER = new ResourceLocation(WReference.MODID, "wolfbane_handler");
-        public static final ResourceLocation DAMAGE_HANDLER = new ResourceLocation(WReference.MODID, "damage_handler");
+        public static final ResourceLocation WEREWOLF_PLAYER = WResourceLocation.mod("werewolf_player");
+        public static final ResourceLocation WOLFSBANE_HANDLER = WResourceLocation.mod("wolfbane_handler");
+        public static final ResourceLocation DAMAGE_HANDLER = WResourceLocation.mod("damage_handler");
     }
 }

src/api/java/de/teamlapen/werewolves/api/entities/werewolf/WerewolfForm.java

@@ -1,7 +1,11 @@
 package de.teamlapen.werewolves.api.entities.werewolf;
 
 import com.mojang.serialization.Codec;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.Pose;
 
@@ -12,6 +16,7 @@
 public class WerewolfForm {
     private static final Map<String, WerewolfForm> REGISTRY = new HashMap<>();
     public static final Codec<WerewolfForm> CODEC = Codec.STRING.xmap(WerewolfForm::getForm, WerewolfForm::getName);
+    public static final StreamCodec<ByteBuf, WerewolfForm> STREAM_CODEC = ByteBufCodecs.STRING_UTF8.map(REGISTRY::get, WerewolfForm::getName);
     public static final WerewolfForm NONE = new WerewolfForm("none", null, true, false, 0, 0F, true, 0);
     public static final WerewolfForm HUMAN = new WerewolfForm("human", null, true, true, 3, 0.05F, true, 0.16f);
     public static final WerewolfForm BEAST = new WerewolfForm("beast", WerewolfSize.BEAST, false, true, 11, 0.2F, true, 0.32f);

src/main/resources/assets/werewolves/models/item/crossbow_arrow_silver_bolt.json renamed to src/generated/resources/assets/werewolves/models/item/crossbow_arrow_silver_bolt.json

@@ -1,3 +1,3 @@
 {
   "parent": "vampirism:item/crossbow_arrow"
-}
+}

src/generated/resources/data/c/tags/block/incorrect_for_silver_tool.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#minecraft:needs_diamond_tool"
+  ]
+}

src/generated/resources/data/forge/tags/blocks/jacaranda_log.json renamed to src/generated/resources/data/c/tags/block/jacaranda_log.json

@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "werewolves:white_pelt"
-            ]
+            "items": "werewolves:white_pelt"
           }
         ]
       },

src/generated/resources/data/forge/tags/blocks/magic_log.json renamed to src/generated/resources/data/c/tags/block/magic_log.json

@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "werewolves:white_pelt"
-            ]
+            "items": "werewolves:white_pelt"
           }
         ]
       },

src/generated/resources/data/forge/tags/blocks/ore_rates/singular.json renamed to src/generated/resources/data/c/tags/block/ore_rates/singular.json

@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "werewolves:white_pelt"
-            ]
+            "items": "werewolves:white_pelt"
           }
         ]
       },

src/generated/resources/data/forge/tags/blocks/ores/silver.json renamed to src/generated/resources/data/c/tags/block/ores/silver.json

@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "werewolves:white_pelt"
-            ]
+            "items": "werewolves:white_pelt"
           }
         ]
       },

src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json renamed to src/generated/resources/data/c/tags/block/storage_blocks/raw_silver.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:gems/diamond"
+            "items": "#c:gems/diamond"
           }
         ]
       },
@@ -15,9 +15,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "werewolves:wolfsbane_diffuser_normal"
-            ]
+            "items": "werewolves:wolfsbane_diffuser_normal"
           }
         ]
       },