From d622980aab45e94470d3e86ce5074d8cc043d5ff Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 29 Oct 2024 13:25:56 +0100 Subject: [PATCH] Add missing particle mappings --- build.gradle.kts | 2 +- mappings/diff/mapping-1.21.2to1.21.json | 4 ++-- mappings/extra/enchantments-1.21.nbt | Bin 0 -> 28925 bytes output_hashes.json | 2 +- .../mappingsgenerator/ManualRunner.java | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 mappings/extra/enchantments-1.21.nbt diff --git a/build.gradle.kts b/build.gradle.kts index c8fc605..b604a89 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { api("ch.qos.logback:logback-classic:1.5.8") compileOnly("org.jetbrains:annotations:26.0.1") // Uncomment to manually run mappings gen in ide - compileOnly(files("server.jar")) + // compileOnly(files("server.jar")) testImplementation("org.junit.jupiter:junit-jupiter:5.11.1") testRuntimeOnly("org.junit.platform:junit-platform-launcher") diff --git a/mappings/diff/mapping-1.21.2to1.21.json b/mappings/diff/mapping-1.21.2to1.21.json index bf96acf..faf75ff 100644 --- a/mappings/diff/mapping-1.21.2to1.21.json +++ b/mappings/diff/mapping-1.21.2to1.21.json @@ -390,8 +390,8 @@ "pale_hanging_moss[tip=false]": "hanging_roots[waterlogged=false]" }, "particles": { - "trail": "", - "block_crumble": "" + "trail": "entity_effect", + "block_crumble": "block" }, "blockentities": { "creaking_heart": "" diff --git a/mappings/extra/enchantments-1.21.nbt b/mappings/extra/enchantments-1.21.nbt new file mode 100644 index 0000000000000000000000000000000000000000..a5f8432d7a1d056fe1a817b9a787ed1fa7760102 GIT binary patch literal 28925 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 literal 0 HcmV?d00001 diff --git a/output_hashes.json b/output_hashes.json index 8f6c14f..fd59798 100644 --- a/output_hashes.json +++ b/output_hashes.json @@ -236,7 +236,7 @@ "size": 1732 }, "1.21.2:1.21": { - "object-hash": -2005729684, + "object-hash": -2005691965, "size": 6356 } } \ No newline at end of file diff --git a/src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java b/src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java index b93c2d0..dbafdd0 100644 --- a/src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java +++ b/src/main/java/com/viaversion/mappingsgenerator/ManualRunner.java @@ -111,15 +111,15 @@ public final class ManualRunner { try { // Server jar bundle since 21w39a - // Alternatively, java -DbundlerMainClass=net.minecraft.data.Main -jar server.jar --reports + // Alternatively, java -DbundlerMainClass=net.minecraft.data.Main -jar server.jar --all System.setProperty("bundlerMainClass", "net.minecraft.data.Main"); - Class.forName("net.minecraft.bundler.Main").getDeclaredMethod("main", String[].class).invoke(null, (Object) new String[]{"--reports"}); + Class.forName("net.minecraft.bundler.Main").getDeclaredMethod("main", String[].class).invoke(null, (Object) new String[]{"--all"}); ServerJarUtil.waitForServerMain(); } catch (final ClassNotFoundException ignored) { final Class mainClass = Class.forName("net.minecraft.data.Main"); mainClass.getDeclaredMethod("main", String[].class).invoke(null, (Object) new String[]{"--reports"}); } - MappingsGenerator.collectMappings("1.20.5"); + MappingsGenerator.collectMappings("1.21.2-pre3"); } }