Update AutoRenamingTool, remove SuppressForbidden annotation patches,

and update SetCustomModelDataFunction patch to use a cast
neoforged · Nov 8, 2024 · a6291ea · a6291ea
1 parent 8316876
commit a6291ea
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 57 deletions.
diff --git a/versions/snapshot/1.21/24w45a/config.json b/versions/snapshot/1.21/24w45a/config.json
@@ -16,7 +16,7 @@
         "jvmargs": []
     },
     "rename": {
-        "version": "net.neoforged:AutoRenamingTool:2.0.4:all",
+        "version": "net.neoforged:AutoRenamingTool:2.0.5:all",
         "args": ["--input", "{input}", "--output", "{output}", "--map", "{mappings}", "--cfg", "{libraries}", "--ann-fix", "--ids-fix", "--src-fix", "--record-fix", "--unfinal-params"]
     },
     "bundler_extract_jar": {

diff --git a/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/data/Main.java.patch b/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/data/Main.java.patch
diff --git a/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/data/Main.java.patch b/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/data/Main.java.patch
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/data/Main.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/data/Main.java.patch
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Bootstrap.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Bootstrap.java.patch
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Main.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Main.java.patch
diff --git a/...ed/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch b/...ed/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch
@@ -5,7 +5,7 @@
  public class SetCustomModelDataFunction extends LootItemConditionalFunction {
      private static final Codec<NumberProvider> COLOR_PROVIDER_CODEC = Codec.withAlternative(
 -        NumberProviders.CODEC, ExtraCodecs.RGB_COLOR_CODEC, ConstantValue::new
-+        NumberProviders.CODEC, ExtraCodecs.RGB_COLOR_CODEC, integer -> new ConstantValue((float) integer)
++        NumberProviders.CODEC, ExtraCodecs.RGB_COLOR_CODEC, (Function<Integer, NumberProvider>)ConstantValue::new
      );
      public static final MapCodec<SetCustomModelDataFunction> CODEC = RecordCodecBuilder.mapCodec(
          p_386432_ -> commonFields(p_386432_)