work for 1.20.6

- removed MagmaCube
- use fabric-loom (with official mojang mappings) to provide classes

TODOs:
- decompile fix
- custom component serializer

.gitignore

@@ -10,13 +10,6 @@ dependency-reduced-pom.xml
 /MinecraftForge-API/out/
 target/
 /target/
-/work/testClient/
-/work/testServer/
-/work/mcdev/
-/work/jbsdiff/
-/work/jbsdiffPatcher/
-/work/Installer/
-/work/temp/
 /logs/
 /Blueberry-Client
 *.release[bB]ackup

Blueberry-API/build.gradle.kts

@@ -1,9 +1,16 @@
 import net.blueberrymc.gradle.buildSrc.constants.*
 
+plugins {
+ id("fabric-loom") version "1.7-SNAPSHOT"
+}
+
 version = API_VERSION
 
 dependencies {
- compileOnly("net.blueberrymc.magmacube:magmacube:$MINECRAFT_VERSION")
+ // To change the versions see the gradle.properties file
+ minecraft("com.mojang:minecraft:$MINECRAFT_VERSION")
+ mappings(loom.officialMojangMappings())
+
  implementation("org.jetbrains:annotations:24.0.1")
  compileOnlyApi("org.jetbrains:annotations:24.0.1")
  api("com.github.JnCrMx:discord-game-sdk4j:v0.5.5")
@@ -17,11 +24,11 @@ dependencies {
  api("io.netty:netty-all:4.1.97.Final")
  api("org.apache.commons:commons-lang3:3.13.0")
  api("org.yaml:snakeyaml:2.2")
- api("org.ow2.asm:asm:9.4")
- api("org.ow2.asm:asm-tree:9.4")
- api("org.ow2.asm:asm-analysis:9.4")
- api("org.ow2.asm:asm-commons:9.4")
- api("org.ow2.asm:asm-util:9.4")
+ api("org.ow2.asm:asm:9.7")
+ api("org.ow2.asm:asm-tree:9.7")
+ api("org.ow2.asm:asm-analysis:9.7")
+ api("org.ow2.asm:asm-commons:9.7")
+ api("org.ow2.asm:asm-util:9.7")
  api("org.spongepowered:mixin:0.8.5")
  api("net.blueberrymc:native-util:2.1.0")
  api("ca.weblite:java-objc-bridge:1.1")

Blueberry-API/gradle.properties

@@ -0,0 +1 @@
+minecraft_version=1.20.6

MagmaCube-Patches/0001-POM-Changes.patch

@@ -6,36 +6,41 @@ Subject: [PATCH] POM Changes
 
 diff --git a/.gitignore b/.gitignore
 new file mode 100644
-index 0000000000000000000000000000000000000000..93d79a837f61bb4b17c531702c0ead10726b29dc
+index 0000000000000000000000000000000000000000..411d8a0e5dc5b56f34d2a2ca1d03c11362ea81ad
 --- /dev/null
 +++ b/.gitignore
 @@ -0,0 +1,3 @@
-++target/
-++*.iml
-++build/
++target/
++*.iml
++build/
+\ No newline at end of file
 diff --git a/src/main/java/net/minecraft/client/ClientBrandRetriever.java b/src/main/java/net/minecraft/client/ClientBrandRetriever.java
-index fb84bbcd532981037e97b33e7b8bdef539dbbd2c..871ca99691b10950eeeb6d4b7630708f34f3bef7 100644
+index a251d2fbe5376fe8772b96f546946661392ade85..87a093c129acff5fb880c3930d7b6a667577bed8 100644
 --- a/src/main/java/net/minecraft/client/ClientBrandRetriever.java
 +++ b/src/main/java/net/minecraft/client/ClientBrandRetriever.java
-@@ -3,7 +3,7 @@ package net.minecraft.client;
- import net.minecraft.obfuscate.DontObfuscate;
+@@ -6,10 +6,10 @@ import net.minecraft.obfuscate.DontObfuscate;
 
+ @Environment(EnvType.CLIENT)
  public class ClientBrandRetriever {
-- public static final String VANILLA_NAME = "magmacube"; // MagmaCube > vanilla!
-+ public static final String VANILLA_NAME = "blueberry"; // Blueberry > // MagmaCube > vanilla!;
+- public static final String VANILLA_NAME = "vanilla";
++ public static final String VANILLA_NAME = "blueberry"; // Blueberry > vanilla
 
- @DontObfuscate
- public static String getClientModName() {
+ @DontObfuscate
+ public static String getClientModName() {
+- return "vanilla";
++ return VANILLA_NAME;
+ }
+ }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e7ca55d6860645896beffcd40a00eb23f455fa2f..4c2c530b37d9431b893300472a52da767ea1dbf5 100644
+index c776c3612a4565076e8fa974695f104590123b6d..d971e37b8884a4390827091a28761776e7e52ac7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -949,7 +949,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1098,7 +1098,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
-  @DontObfuscate
-  public String getServerModName() {
-- return "magmacube"; // MagmaCube > vanilla!
-+ return "blueberry"; // Blueberry > // MagmaCube > vanilla!
-  }
+  @DontObfuscate
+  public String getServerModName() {
+- return "vanilla";
++ return "blueberry"; // Blueberry > vanilla
+  }
 
-  public SystemReport fillSystemReport(SystemReport systemReport) {
+  public SystemReport fillSystemReport(SystemReport systemReport) {