feat: 1.20.6 fabric

plasmoapp · Apr 28, 2024 · ced386c · ced386c
1 parent f93ff67
commit ced386c
Show file tree

Hide file tree

Showing 70 changed files with 310 additions and 152 deletions.
diff --git a/.github/workflows/prerelease-publish.yml b/.github/workflows/prerelease-publish.yml
@@ -15,14 +15,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        distribution: zulu
+        distribution: temurin
         java-version: |
           8
           16
           17
+          21
 
     - name: Build with Gradle
       uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,14 +15,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        distribution: zulu
+        distribution: temurin
         java-version: |
           8
           16
           17
+          21
 
     - name: Build with Gradle
       uses: gradle/gradle-build-action@v2

diff --git a/client/1.20.6-fabric/gradle.properties b/client/1.20.6-fabric/gradle.properties
@@ -0,0 +1 @@
+essential.defaults.loom.minecraft=com.mojang:minecraft:1.20.6-rc1
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -2,7 +2,6 @@ import gg.essential.gradle.multiversion.excludeKotlinDefaultImpls
 import gg.essential.gradle.multiversion.mergePlatformSpecifics
 import gg.essential.gradle.util.RelocationTransform.Companion.registerRelocationAttribute
 import gg.essential.gradle.util.noServerRunConfigs
-import gg.essential.util.prebundleNow
 import su.plo.config.toml.Toml
 import su.plo.voice.extension.slibPlatform
 import su.plo.voice.util.copyJarToRootProject
@@ -55,13 +54,6 @@ crowdin {
 
 val shadowCommon by configurations.creating
 
-val relocatedUC = registerRelocationAttribute("relocate-uc") {
-    relocate("gg.essential.universal", "su.plo.voice.universal")
-}
-val universalCraft by configurations.creating {
-    attributes { attribute(relocatedUC, true) }
-}
-
 fun universalCraftVersion() = libs.versions.universalcraft.map {
     val minecraftVersion = when (platform.mcVersion) {
         11605 -> "1.16.2"
@@ -100,18 +92,24 @@ dependencies {
             12001 -> "0.84.0+1.20.1"
             12002 -> "0.89.1+1.20.2"
             12004 -> "0.95.4+1.20.4"
+            12006 -> "0.97.7+1.20.6"
             else -> throw GradleException("Unsupported platform $platform")
         }
 
         modImplementation("net.fabricmc.fabric-api:fabric-api:${fabricApiVersion}")
         "include"("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
     }
 
-    universalCraft("gg.essential:universalcraft-${universalCraftVersion()}") {
-        isTransitive = false
+    rootProject.libs.versions.universalcraft.map {
+        "gg.essential:universalcraft-${universalCraftVersion()}"
+    }.also {
+        modApi(it) {
+            isTransitive = false
+        }
+        shadowCommon(it) {
+            isTransitive = false
+        }
     }
-    modApi(prebundleNow(universalCraft))
-    shadowCommon(prebundleNow(universalCraft))
 
     val includedProjects = listOf(
         ":api:common",
@@ -195,6 +193,8 @@ tasks {
             exclude("README.md")
             exclude("META-INF/*.kotlin_module")
 
+            relocate("gg.essential.universal", "su.plo.voice.universal")
+
             if (platform.mcVersion < 11700 || (platform.isForge && platform.mcVersion < 11800)) {
                 exclude(dependency("org.apache.logging.log4j:log4j-api"))
                 exclude(dependency("org.apache.logging.log4j:log4j-core"))

diff --git a/client/gradle.properties b/client/gradle.properties
@@ -1,6 +1,6 @@
 essential.defaults.loom=1
 essential.defaults.loom.mappings=official
-essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.22
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.15.10
 
 org.gradle.daemon=false
 org.gradle.parallel=true

diff --git a/client/root.gradle.kts b/client/root.gradle.kts
@@ -6,6 +6,8 @@ group = "$group.client-root"
 
 preprocess {
 
+    val fabric12006 = createNode("1.20.6-fabric", 12006, "official")
+
     val forge12004 = createNode("1.20.4-forge", 12004, "official")
     val fabric12004 = createNode("1.20.4-fabric", 12004, "official")
 
@@ -33,6 +35,8 @@ preprocess {
     val forge11605 = createNode("1.16.5-forge", 11605, "official")
     val fabric11605 = createNode("1.16.5-fabric", 11605, "official")
 
+    fabric12006.link(fabric12004)
+
     fabric12004.link(fabric12002, file("1.20.4-1.20.2.txt"))
     forge12004.link(forge12002, file("1.20.4-1.20.2.txt"))
 

diff --git a/client/src/main/java/su/plo/lib/mod/client/chat/ClientChatUtil.java b/client/src/main/java/su/plo/lib/mod/client/chat/ClientChatUtil.java
@@ -1,7 +1,7 @@
 package su.plo.lib.mod.client.chat;
 
 import su.plo.slib.api.chat.component.McTextComponent;
-import su.plo.voice.universal.UMinecraft;
+import gg.essential.universal.UMinecraft;
 import lombok.NonNull;
 import lombok.experimental.UtilityClass;
 import net.minecraft.network.chat.Component;

diff --git a/client/src/main/java/su/plo/lib/mod/client/chat/ClientTextConverter.java b/client/src/main/java/su/plo/lib/mod/client/chat/ClientTextConverter.java
@@ -5,7 +5,7 @@
 import su.plo.slib.api.chat.converter.McTextConverter;
 import su.plo.slib.api.chat.converter.TranslatableTextConverter;
 import su.plo.slib.mod.chat.ComponentTextConverter;
-import su.plo.voice.universal.wrappers.message.UTextComponent;
+import gg.essential.universal.wrappers.message.UTextComponent;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import net.minecraft.network.chat.Component;
@@ -21,12 +21,12 @@ public final class ClientTextConverter extends TranslatableTextConverter<Compone
 
     @Override
     public @NotNull String convertToJson(@NotNull Component text) {
-        return Component.Serializer.toJson(text);
+        return textConverter.convertToJson(text);
     }
 
     @Override
     public Component convertFromJson(@NotNull String json) {
-        return Component.Serializer.fromJson(json);
+        return textConverter.convertFromJson(json);
     }
 
     @Override

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractButton.java b/client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractButton.java
@@ -1,7 +1,7 @@
 package su.plo.lib.mod.client.gui.components;
 
 import su.plo.slib.api.chat.component.McTextComponent;
-import su.plo.voice.universal.UKeyboard;
+import gg.essential.universal.UKeyboard;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import su.plo.lib.mod.client.gui.widget.GuiAbstractWidget;

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractScrollbar.java b/client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractScrollbar.java
@@ -2,8 +2,8 @@
 
 import com.google.common.collect.Lists;
 import net.minecraft.util.Mth;
-import su.plo.voice.universal.UGraphics;
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UGraphics;
+import gg.essential.universal.UMatrixStack;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractSlider.java b/client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractSlider.java
@@ -2,9 +2,9 @@
 
 import net.minecraft.util.Mth;
 import su.plo.lib.mod.client.gui.widget.GuiWidgetTexture;
-import su.plo.voice.universal.UGraphics;
-import su.plo.voice.universal.UKeyboard;
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UGraphics;
+import gg.essential.universal.UKeyboard;
+import gg.essential.universal.UMatrixStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import su.plo.lib.mod.client.gui.widget.GuiAbstractWidget;

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/components/Button.java b/client/src/main/java/su/plo/lib/mod/client/gui/components/Button.java
@@ -1,7 +1,7 @@
 package su.plo.lib.mod.client.gui.components;
 
 import su.plo.slib.api.chat.component.McTextComponent;
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UMatrixStack;
 import org.jetbrains.annotations.NotNull;
 import su.plo.lib.mod.client.gui.narration.NarrationOutput;
 

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/components/IconButton.java b/client/src/main/java/su/plo/lib/mod/client/gui/components/IconButton.java
@@ -1,8 +1,8 @@
 package su.plo.lib.mod.client.gui.components;
 
 import su.plo.slib.api.chat.component.McTextComponent;
-import su.plo.voice.universal.UGraphics;
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UGraphics;
+import gg.essential.universal.UMatrixStack;
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.resources.ResourceLocation;

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/components/TextFieldWidget.java b/client/src/main/java/su/plo/lib/mod/client/gui/components/TextFieldWidget.java
diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/screen/GuiScreen.java b/client/src/main/java/su/plo/lib/mod/client/gui/screen/GuiScreen.java
@@ -2,8 +2,8 @@
 
 import com.google.common.collect.Lists;
 import su.plo.slib.api.chat.component.McTextComponent;
-import su.plo.voice.universal.UMatrixStack;
-import su.plo.voice.universal.UMinecraft;
+import gg.essential.universal.UMatrixStack;
+import gg.essential.universal.UMinecraft;
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.client.gui.screens.Screen;

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/screen/GuiScreenListener.java b/client/src/main/java/su/plo/lib/mod/client/gui/screen/GuiScreenListener.java
@@ -1,6 +1,6 @@
 package su.plo.lib.mod.client.gui.screen;
 
-import su.plo.voice.universal.UKeyboard;
+import gg.essential.universal.UKeyboard;
 import org.jetbrains.annotations.Nullable;
 import su.plo.lib.mod.client.gui.widget.GuiWidgetListener;
 

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/screen/ScreenWrapper.java b/client/src/main/java/su/plo/lib/mod/client/gui/screen/ScreenWrapper.java
@@ -1,7 +1,7 @@
 package su.plo.lib.mod.client.gui.screen;
 
 import su.plo.slib.api.chat.component.McTextComponent;
-import su.plo.voice.universal.*;
+import gg.essential.universal.*;
 import lombok.Getter;
 import lombok.ToString;
 import net.minecraft.client.gui.screens.Screen;

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/widget/GuiAbstractWidget.java b/client/src/main/java/su/plo/lib/mod/client/gui/widget/GuiAbstractWidget.java
@@ -1,9 +1,9 @@
 package su.plo.lib.mod.client.gui.widget;
 
 import su.plo.slib.api.chat.component.McTextComponent;
-import su.plo.voice.universal.UGraphics;
-import su.plo.voice.universal.UMatrixStack;
-import su.plo.voice.universal.USound;
+import gg.essential.universal.UGraphics;
+import gg.essential.universal.UMatrixStack;
+import gg.essential.universal.USound;
 import lombok.Getter;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/widget/GuiWidget.java b/client/src/main/java/su/plo/lib/mod/client/gui/widget/GuiWidget.java
@@ -1,12 +1,20 @@
 package su.plo.lib.mod.client.gui.widget;
 
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UMatrixStack;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
 public interface GuiWidget {
 
+    //#if MC>=12005
+    //$$ ResourceLocation MENU_LIST_BACKGROUND_LOCATION = new ResourceLocation("textures/gui/menu_list_background.png");
+    //$$ ResourceLocation INWORLD_MENU_LIST_BACKGROUND_LOCATION = new ResourceLocation("textures/gui/inworld_menu_list_background.png");
+    //$$
+    //$$ ResourceLocation FOOTER_SEPARATOR_LOCATION = new ResourceLocation("textures/gui/footer_separator.png");
+    //$$ ResourceLocation INWORLD_FOOTER_SEPARATOR_LOCATION = new ResourceLocation("textures/gui/inworld_footer_separator.png");
+    //#else
     ResourceLocation BACKGROUND_LOCATION = new ResourceLocation("textures/gui/options_background.png");
+    //#endif
 
     int getWidth();
 

diff --git a/client/src/main/java/su/plo/lib/mod/client/gui/widget/GuiWidgetListener.java b/client/src/main/java/su/plo/lib/mod/client/gui/widget/GuiWidgetListener.java
@@ -1,6 +1,6 @@
 package su.plo.lib.mod.client.gui.widget;
 
-import su.plo.voice.universal.UKeyboard;
+import gg.essential.universal.UKeyboard;
 import org.jetbrains.annotations.Nullable;
 
 public interface GuiWidgetListener {

diff --git a/client/src/main/java/su/plo/lib/mod/client/render/RenderUtil.java b/client/src/main/java/su/plo/lib/mod/client/render/RenderUtil.java
@@ -20,11 +20,11 @@
 import org.jetbrains.annotations.NotNull;
 import su.plo.lib.mod.client.gui.widget.GuiWidgetTexture;
 import su.plo.slib.api.chat.component.McTextComponent;
-import su.plo.voice.universal.UGraphics;
-import su.plo.voice.universal.UMatrixStack;
-import su.plo.voice.universal.UMinecraft;
-import su.plo.voice.universal.UResolution;
-import su.plo.voice.universal.wrappers.message.UTextComponent;
+import gg.essential.universal.UGraphics;
+import gg.essential.universal.UMatrixStack;
+import gg.essential.universal.UMinecraft;
+import gg.essential.universal.UResolution;
+import gg.essential.universal.wrappers.message.UTextComponent;
 import lombok.experimental.UtilityClass;
 import net.minecraft.client.renderer.MultiBufferSource;
 import su.plo.lib.mod.client.chat.ClientTextConverter;

diff --git a/client/src/main/java/su/plo/lib/mod/client/render/particle/BillboardParticle2D.java b/client/src/main/java/su/plo/lib/mod/client/render/particle/BillboardParticle2D.java
@@ -1,7 +1,7 @@
 package su.plo.lib.mod.client.render.particle;
 
-import su.plo.voice.universal.UGraphics;
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UGraphics;
+import gg.essential.universal.UMatrixStack;
 import net.minecraft.util.Mth;
 import org.joml.Vector3f;
 

diff --git a/client/src/main/java/su/plo/lib/mod/client/render/particle/Particle2D.java b/client/src/main/java/su/plo/lib/mod/client/render/particle/Particle2D.java
@@ -1,7 +1,7 @@
 package su.plo.lib.mod.client.render.particle;
 
-import su.plo.voice.universal.UGraphics;
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UGraphics;
+import gg.essential.universal.UMatrixStack;
 import net.minecraft.client.particle.ParticleRenderType;
 
 import net.minecraft.world.phys.AABB;

diff --git a/client/src/main/java/su/plo/lib/mod/client/render/shader/ShaderUtil.java b/client/src/main/java/su/plo/lib/mod/client/render/shader/ShaderUtil.java
@@ -1,7 +1,7 @@
 package su.plo.lib.mod.client.render.shader;
 
-import su.plo.voice.universal.shader.BlendState;
-import su.plo.voice.universal.shader.UShader;
+import gg.essential.universal.shader.BlendState;
+import gg.essential.universal.shader.UShader;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import su.plo.voice.client.ModVoiceClient;

diff --git a/client/src/main/java/su/plo/lib/mod/client/render/shader/SolidColorShader.java b/client/src/main/java/su/plo/lib/mod/client/render/shader/SolidColorShader.java
@@ -1,8 +1,8 @@
 package su.plo.lib.mod.client.render.shader;
 
-import su.plo.voice.universal.shader.BlendState;
-import su.plo.voice.universal.shader.SamplerUniform;
-import su.plo.voice.universal.shader.UShader;
+import gg.essential.universal.shader.BlendState;
+import gg.essential.universal.shader.SamplerUniform;
+import gg.essential.universal.shader.UShader;
 import lombok.experimental.UtilityClass;
 
 import java.io.IOException;

diff --git a/client/src/main/java/su/plo/lib/mod/client/render/texture/ModPlayerSkins.java b/client/src/main/java/su/plo/lib/mod/client/render/texture/ModPlayerSkins.java
@@ -13,7 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import su.plo.slib.api.entity.player.McGameProfile;
-import su.plo.voice.universal.UMinecraft;
+import gg.essential.universal.UMinecraft;
 
 import java.util.Map;
 import java.util.UUID;

diff --git a/client/src/main/java/su/plo/voice/client/ModVoiceClient.java b/client/src/main/java/su/plo/voice/client/ModVoiceClient.java
@@ -4,8 +4,8 @@
 import su.plo.slib.api.logging.McLoggerFactory;
 import su.plo.slib.mod.logging.Log4jLogger;
 import su.plo.voice.client.gui.settings.VoiceScreens;
-import su.plo.voice.universal.UKeyboard;
-import su.plo.voice.universal.UMinecraft;
+import gg.essential.universal.UKeyboard;
+import gg.essential.universal.UMinecraft;
 import lombok.Getter;
 import net.minecraft.client.KeyMapping;
 import org.jetbrains.annotations.NotNull;
@@ -33,6 +33,12 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+
+//#if MC>=12005
+//$$ import su.plo.slib.mod.channel.ByteArrayCodec;
+//$$ import su.plo.slib.mod.channel.ModChannelManager;
+//#endif
+
 //#else
 //$$ import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
 //$$ import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -138,12 +144,21 @@ public void onInitializeClient() {
 
         ClientLifecycleEvents.CLIENT_STOPPING.register((minecraft) -> onShutdown());
         HudRenderCallback.EVENT.register(hudRenderer::render);
-        WorldRenderEvents.END.register(
+        WorldRenderEvents.LAST.register(
                 (context) -> levelRenderer.render(context.world(), context.matrixStack(), context.camera(), context.tickDelta())
         );
         ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> onServerDisconnect());
+
+        //#if MC>=12005
+        //$$ ByteArrayCodec voiceChannelCodec = ModChannelManager.Companion.getOrRegisterCodec(ModVoiceServer.CHANNEL);
+        //$$ ByteArrayCodec flagChannelCodec = ModChannelManager.Companion.getOrRegisterCodec(ModVoiceServer.FLAG_CHANNEL);
+        //$$
+        //$$ ClientPlayNetworking.registerGlobalReceiver(voiceChannelCodec.getType(), handler);
+        //$$ ClientPlayNetworking.registerGlobalReceiver(flagChannelCodec.getType(), (payload, context) -> {});
+        //#else
         ClientPlayNetworking.registerGlobalReceiver(ModVoiceServer.CHANNEL, handler);
         ClientPlayNetworking.registerGlobalReceiver(ModVoiceServer.FLAG_CHANNEL, (client, handler, buf, responseSender) -> {});
+        //#endif
 
         KeyBindingHelper.registerKeyBinding(MENU_KEY);
     }