From 747838ad3c81a6324dc1600996e8b44aba6235cf Mon Sep 17 00:00:00 2001 From: ix0rai Date: Fri, 8 Nov 2024 18:15:38 -0600 Subject: [PATCH] update enigma to `2.5.2` and plugin to `2.3.1` (#658) * update enigma to `2.5.1` and plugin to `2.3.1` * remove asm snapshot repo * Drop invalid mappings * Drop invalid mappings * bump to 2.5.2 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: actions-user --- build.gradle | 4 ---- gradle/libs.versions.toml | 4 ++-- .../minecraft/client/render/model/BakedQuadFactory.mapping | 1 - .../minecraft/loot/provider/score/LootScoreProvider.mapping | 2 -- mappings/net/minecraft/server/command/FunctionCommand.mapping | 3 --- .../net/minecraft/server/function/CommandFunction.mapping | 2 -- 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 3213fb76bc..f06a0ff0b8 100644 --- a/build.gradle +++ b/build.gradle @@ -12,10 +12,6 @@ buildscript { name "Fabric Repository" url 'https://maven.fabricmc.net' } - // remove when ASM fix is released - maven { - url = "https://repository.ow2.org/nexus/content/repositories/snapshots/" - } mavenCentral() mavenLocal() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 312896d279..3bf29b7f1b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,8 +4,8 @@ download_task = "4.1.1" guava = "33.2.1-jre" jackson_xml = "2.14.1" launchermeta_parser = "1.0.0" -enigma = "2.5.0" -enigma_plugin = "2.2.3" +enigma = "2.5.2" +enigma_plugin = "2.3.1" tiny_remapper = "0.7.2" stitch = "0.6.1" unpick = "3.0.8" diff --git a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping index 1a2dcd5aa5..7c402038fe 100644 --- a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping +++ b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/unmapped/C_mappupwb net/minecraft/client/render/model/BakedQ ARG 2 rotation METHOD m_glkjqosm transformVertex (Lorg/joml/Vector3f;Lnet/minecraft/unmapped/C_qvfggwhk;)V ARG 1 vertex - ARG 2 transformation METHOD m_lgpkkhov packVertexData (Lnet/minecraft/unmapped/C_ljanghzk;Lnet/minecraft/unmapped/C_uflrwbwt;Lnet/minecraft/unmapped/C_xpuuihxf;[FLnet/minecraft/unmapped/C_qvfggwhk;Lnet/minecraft/unmapped/C_rruqzaih;)[I ARG 1 texture ARG 2 sprite diff --git a/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping index b74b17962b..bc6d516560 100644 --- a/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/unmapped/C_bvhqzshp net/minecraft/loot/provider/score/LootScoreProvider METHOD m_mwbmaeyv getType ()Lnet/minecraft/unmapped/C_bocpfiym; - METHOD m_snzluimt (Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_hswmfudr; - ARG 1 context METHOD m_xmdejrtz getRequiredParameters ()Ljava/util/Set; diff --git a/mappings/net/minecraft/server/command/FunctionCommand.mapping b/mappings/net/minecraft/server/command/FunctionCommand.mapping index 831071e4c9..b15200aa6f 100644 --- a/mappings/net/minecraft/server/command/FunctionCommand.mapping +++ b/mappings/net/minecraft/server/command/FunctionCommand.mapping @@ -17,6 +17,3 @@ CLASS net/minecraft/unmapped/C_rzopqxjv net/minecraft/server/command/FunctionCom METHOD m_rhudupoi (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 function ARG 1 error - CLASS C_ggykovea - METHOD m_qggvwcgu (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/unmapped/C_hhlwcnih; - ARG 1 context diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index 3c5a7b90d7..e94427c1e9 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/unmapped/C_soipoenw net/minecraft/server/function/CommandFunction - METHOD m_mydomkjw (Lnet/minecraft/unmapped/C_hhlwcnih;Lcom/mojang/brigadier/CommandDispatcher;)Lnet/minecraft/unmapped/C_cawuzyqd; - ARG 1 nbt METHOD m_olmsbxlb create (Lnet/minecraft/unmapped/C_ncpywfca;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/unmapped/C_xazjuxla;Ljava/util/List;)Lnet/minecraft/unmapped/C_soipoenw; COMMENT Parses a function in the context of {@code source}. COMMENT