Update for 1.16.3

Author: TBoshoven

.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
               TAG_VERSION="$(echo "$CIRCLE_TAG" | sed -E 's/[^0-9]+//')"
               sed -Ei 's/^(\s*version = ")([0-9]+\.){2}[0-9]+-DEV\.0+"$/\1'$TAG_VERSION'.'$CIRCLE_BUILD_NUM'"/' build.gradle
             else
-              [[ $CIRCLE_BRANCH = '1.16.2' ]] && LIB_VERSION=MASTER || LIB_VERSION=DEV
+              [[ $CIRCLE_BRANCH = '1.16.3' ]] && LIB_VERSION=MASTER || LIB_VERSION=DEV
               sed -Ei 's/^(\s*version = "([0-9]+\.){2}[0-9]+-)DEV\.0+"$/\1'$LIB_VERSION'.'$CIRCLE_BUILD_NUM'"/' build.gradle
             fi
       - restore_cache:
@@ -91,7 +91,7 @@ jobs:
             TAG_BUILD="$(echo "$CIRCLE_TAG" | sed -E 's/-[0-9.-]+$//' | sed -E 's/(^|-)([^-])/\U\2/g')"
             TAG_VERSION="$(echo "$CIRCLE_TAG" | sed -E 's/[^0-9]+//')"
             PROJECT_ID="$(jq -r .projectId $TAG_BUILD/curseforge.json)"
-            METADATA="$(jq -n '{"changelog": $ARGS.positional[0], "changelogType": "markdown", "displayName": $ARGS.positional[1], "gameVersions": [8010, 7498, 4458], "releaseType": "release"}' --args "$DESCRIPTION" "v$TAG_VERSION.$CIRCLE_BUILD_NUM")"
+            METADATA="$(jq -n '{"changelog": $ARGS.positional[0], "changelogType": "markdown", "displayName": $ARGS.positional[1], "gameVersions": [8056, 7498, 4458], "releaseType": "release"}' --args "$DESCRIPTION" "v$TAG_VERSION.$CIRCLE_BUILD_NUM")"
             FILE="$(ls /tmp/workspace/libs/*.jar | head -n 1)"
             curl -XPOST "https://minecraft.curseforge.com/api/projects/$PROJECT_ID/upload-file" -F "file=@$FILE" -F "metadata=$METADATA" -H "X-Api-Token: $CURSEFORGE_TOKEN"
 workflows:

.github/labeler.yaml

@@ -1,7 +1,7 @@
 ci:
 - '.circleci/**/*'
 - '.github/**/*'
-minecraft 1.16.2:
+minecraft 1.16.3:
 # Looks like Labeler doesn't match directories starting on '.' by default.
 # Include at least the root-level ones.
 - '.*'

.github/workflows/labeler.yaml

@@ -2,7 +2,7 @@ name: Pull Request Labeler
 on:
   pull_request:
     branches:
-    - 1.16.2
+    - 1.16.3
 
 jobs:
   triage:

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/data/BlockStates.java

@@ -9,8 +9,8 @@
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.client.model.generators.BlockStateProvider;
 import net.minecraftforge.client.model.generators.ConfiguredModel;
-import net.minecraftforge.client.model.generators.ExistingFileHelper;
 import net.minecraftforge.client.model.generators.ModelFile;
+import net.minecraftforge.common.data.ExistingFileHelper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/data/DataGenerators.java

@@ -2,7 +2,7 @@
 
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.data.DataGenerator;
-import net.minecraftforge.client.model.generators.ExistingFileHelper;
+import net.minecraftforge.common.data.ExistingFileHelper;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
 

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/data/ItemModels.java

@@ -5,9 +5,9 @@
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.model.generators.ExistingFileHelper;
 import net.minecraftforge.client.model.generators.ItemModelProvider;
 import net.minecraftforge.client.model.generators.ModelFile;
+import net.minecraftforge.common.data.ExistingFileHelper;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/data/BlockStates.java

@@ -8,8 +8,8 @@
 import net.minecraft.state.properties.BlockStateProperties;
 import net.minecraftforge.client.model.generators.BlockStateProvider;
 import net.minecraftforge.client.model.generators.ConfiguredModel;
-import net.minecraftforge.client.model.generators.ExistingFileHelper;
 import net.minecraftforge.client.model.generators.ModelFile;
+import net.minecraftforge.common.data.ExistingFileHelper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/data/DataGenerators.java

@@ -2,7 +2,7 @@
 
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.data.DataGenerator;
-import net.minecraftforge.client.model.generators.ExistingFileHelper;
+import net.minecraftforge.common.data.ExistingFileHelper;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
 

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/data/ItemModels.java

@@ -5,9 +5,9 @@
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.model.generators.ExistingFileHelper;
 import net.minecraftforge.client.model.generators.ItemModelProvider;
 import net.minecraftforge.client.model.generators.ModelFile;
+import net.minecraftforge.common.data.ExistingFileHelper;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

build.gradle

@@ -24,7 +24,7 @@ subprojects {
 
     String modName = project.getName().replaceAll(/([a-z])([A-Z])/, /$1_$2/).toLowerCase()
 
-    version = "1.16.2-DEV.0"
+    version = "1.16.3-DEV.0"
     group = "com.tomboshoven.minecraft." + project.getName().toLowerCase()
     archivesBaseName = project.projectDir.name
 
@@ -68,7 +68,7 @@ subprojects {
     }
 
     dependencies {
-        minecraft "net.minecraftforge:forge:1.16.2-33.0.22"
+        minecraft "net.minecraftforge:forge:1.16.3-34.0.13"
 
         implementation 'com.google.code.findbugs:jsr305:3.0.2'
     }