build: relocate universalcraft in shadowJar

not sure why it was relocated in configuration, don't find any obvious issues

.github/workflows/prerelease-publish.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
         distribution: temurin

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
         distribution: temurin

client/build.gradle.kts

@@ -45,13 +45,6 @@ plasmoCrowdin {
 
 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 uStatsVersion() = rootProject.libs.versions.ustats.map {
     val minecraftVersion = when (platform.mcVersion) {
         12001, 12002, 12004, 12005 -> "1.20"
@@ -85,14 +78,16 @@ dependencies {
         "include"(modImplementation("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")!!)
     }
 
-    universalCraft(rootProject.libs.versions.universalcraft.map {
+    rootProject.libs.versions.universalcraft.map {
         "gg.essential:universalcraft-$platform:$it"
-    }) {
-        isTransitive = false
+    }.also {
+        modApi(it) {
+            isTransitive = false
+        }
+        shadowCommon(it) {
+            isTransitive = false
+        }
     }
-    // prebundleNow was trying to access maven repo too early (?)
-    modApi(prebundle(universalCraft))
-    shadowCommon(prebundle(universalCraft))
 
     "su.plo.ustats:${uStatsVersion()}".also {
         modApi(it) {
@@ -157,6 +152,7 @@ tasks {
         configurations = listOf(shadowCommon)
 
         relocate("su.plo.crowdin", "su.plo.voice.libs.crowdin")
+        relocate("gg.essential.universal", "su.plo.voice.universal")
 
         relocate("su.plo.ustats", "su.plo.voice.ustats")
 

client/src/main/java/su/plo/lib/mod/client/chat/ClientChatUtil.java

@@ -1,6 +1,6 @@
 package su.plo.lib.mod.client.chat;
 
-import su.plo.voice.universal.UMinecraft;
+import gg.essential.universal.UMinecraft;
 import lombok.NonNull;
 import lombok.experimental.UtilityClass;
 import net.minecraft.network.chat.Component;

client/src/main/java/su/plo/lib/mod/client/chat/ClientTextConverter.java

@@ -1,6 +1,6 @@
 package su.plo.lib.mod.client.chat;
 
-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;

client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractButton.java

@@ -1,6 +1,6 @@
 package su.plo.lib.mod.client.gui.components;
 
-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.api.chat.MinecraftTextComponent;

client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractScrollbar.java

@@ -1,8 +1,8 @@
 package su.plo.lib.mod.client.gui.components;
 
 import com.google.common.collect.Lists;
-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;

client/src/main/java/su/plo/lib/mod/client/gui/components/AbstractSlider.java

@@ -1,9 +1,9 @@
 package su.plo.lib.mod.client.gui.components;
 
 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.api.MathLib;

client/src/main/java/su/plo/lib/mod/client/gui/components/Button.java

@@ -1,6 +1,6 @@
 package su.plo.lib.mod.client.gui.components;
 
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UMatrixStack;
 import org.jetbrains.annotations.NotNull;
 import su.plo.lib.api.chat.MinecraftTextComponent;
 import su.plo.lib.mod.client.gui.narration.NarrationOutput;

client/src/main/java/su/plo/lib/mod/client/gui/components/IconButton.java

@@ -1,7 +1,7 @@
 package su.plo.lib.mod.client.gui.components;
 
-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;

client/src/main/java/su/plo/lib/mod/client/gui/screen/GuiScreen.java

@@ -1,9 +1,9 @@
 package su.plo.lib.mod.client.gui.screen;
 
 import com.google.common.collect.Lists;
-import su.plo.voice.universal.UMatrixStack;
-import su.plo.voice.universal.UMinecraft;
-import su.plo.voice.universal.UResolution;
+import gg.essential.universal.UMatrixStack;
+import gg.essential.universal.UMinecraft;
+import gg.essential.universal.UResolution;
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.client.gui.screens.Screen;

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;
 

client/src/main/java/su/plo/lib/mod/client/gui/screen/ScreenWrapper.java

@@ -1,6 +1,6 @@
 package su.plo.lib.mod.client.gui.screen;
 
-import su.plo.voice.universal.*;
+import gg.essential.universal.*;
 import lombok.Getter;
 import lombok.ToString;
 import net.minecraft.client.gui.screens.Screen;

client/src/main/java/su/plo/lib/mod/client/gui/widget/GuiAbstractWidget.java

@@ -1,8 +1,8 @@
 package su.plo.lib.mod.client.gui.widget;
 
-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;

client/src/main/java/su/plo/lib/mod/client/gui/widget/GuiWidget.java

@@ -1,6 +1,6 @@
 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;
 

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 {

client/src/main/java/su/plo/lib/mod/client/render/RenderUtil.java

@@ -15,11 +15,11 @@
 import com.mojang.blaze3d.vertex.Tesselator;
 import org.jetbrains.annotations.NotNull;
 import su.plo.lib.mod.client.gui.widget.GuiWidgetTexture;
-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.api.chat.MinecraftTextComponent;

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;
 

client/src/main/java/su/plo/lib/mod/client/render/particle/Particle2D.java

@@ -1,8 +1,8 @@
 package su.plo.lib.mod.client.render.particle;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
-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.core.particles.ParticleGroup;
 import net.minecraft.util.RandomSource;

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;

client/src/main/java/su/plo/lib/mod/client/render/shader/SolidColorShader.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.experimental.UtilityClass;
 
 import java.io.IOException;

client/src/main/java/su/plo/lib/mod/client/render/texture/ModPlayerSkins.java

@@ -8,7 +8,7 @@
 import com.mojang.authlib.properties.Property;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.systems.RenderSystem;
-import su.plo.voice.universal.UMinecraft;
+import gg.essential.universal.UMinecraft;
 import net.minecraft.client.multiplayer.PlayerInfo;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.resources.DefaultPlayerSkin;

client/src/main/java/su/plo/voice/client/ModVoiceClient.java

@@ -1,8 +1,8 @@
 package su.plo.voice.client;
 
 import com.mojang.blaze3d.platform.InputConstants;
-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;

client/src/main/java/su/plo/voice/client/audio/capture/VoiceClientActivation.java

@@ -2,7 +2,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
-import su.plo.voice.universal.UChat;
+import gg.essential.universal.UChat;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

client/src/main/java/su/plo/voice/client/audio/source/ClientLoopbackSource.java

@@ -1,6 +1,6 @@
 package su.plo.voice.client.audio.source;
 
-import su.plo.voice.universal.UMinecraft;
+import gg.essential.universal.UMinecraft;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;

client/src/main/java/su/plo/voice/client/config/keybind/ConfigKeyBindings.java

@@ -4,7 +4,7 @@
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimaps;
-import su.plo.voice.universal.UScreen;
+import gg.essential.universal.UScreen;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

client/src/main/java/su/plo/voice/client/config/keybind/HotkeyActions.java

@@ -10,7 +10,7 @@
 import su.plo.voice.api.client.config.keybind.KeyBindings;
 import su.plo.voice.client.config.VoiceClientConfig;
 import su.plo.voice.proto.packets.tcp.serverbound.PlayerStatePacket;
-import su.plo.voice.universal.UChat;
+import gg.essential.universal.UChat;
 
 @RequiredArgsConstructor
 public final class HotkeyActions {

client/src/main/java/su/plo/voice/client/connection/ModServerConnection.java

@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import su.plo.voice.universal.UMinecraft;
+import gg.essential.universal.UMinecraft;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.local.LocalAddress;
 import lombok.Getter;

client/src/main/java/su/plo/voice/client/event/render/EntityRenderEvent.java

@@ -1,6 +1,6 @@
 package su.plo.voice.client.event.render;
 
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UMatrixStack;
 import lombok.Getter;
 import lombok.NonNull;
 import net.minecraft.world.entity.Entity;

client/src/main/java/su/plo/voice/client/event/render/HudRenderEvent.java

@@ -1,6 +1,6 @@
 package su.plo.voice.client.event.render;
 
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UMatrixStack;
 import lombok.Getter;
 import lombok.NonNull;
 import su.plo.voice.api.event.Event;

client/src/main/java/su/plo/voice/client/event/render/LevelRenderEvent.java

@@ -1,6 +1,6 @@
 package su.plo.voice.client.event.render;
 
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UMatrixStack;
 import lombok.Getter;
 import lombok.NonNull;
 import net.minecraft.client.multiplayer.ClientLevel;

client/src/main/java/su/plo/voice/client/event/render/PlayerRenderEvent.java

@@ -1,6 +1,6 @@
 package su.plo.voice.client.event.render;
 
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UMatrixStack;
 import lombok.Getter;
 import lombok.NonNull;
 import net.minecraft.world.entity.player.Player;

client/src/main/java/su/plo/voice/client/gui/PlayerVolumeAction.java

@@ -1,7 +1,7 @@
 package su.plo.voice.client.gui;
 
-import su.plo.voice.universal.UMinecraft;
-import su.plo.voice.universal.UScreen;
+import gg.essential.universal.UMinecraft;
+import gg.essential.universal.UScreen;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;

client/src/main/java/su/plo/voice/client/gui/settings/HudPositionScreen.java

@@ -1,8 +1,8 @@
 package su.plo.voice.client.gui.settings;
 
-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.config.entry.EnumConfigEntry;

client/src/main/java/su/plo/voice/client/gui/settings/VoiceNotAvailableScreen.java

@@ -1,8 +1,8 @@
 package su.plo.voice.client.gui.settings;
 
-import su.plo.voice.universal.UDesktop;
-import su.plo.voice.universal.UGraphics;
-import su.plo.voice.universal.UMatrixStack;
+import gg.essential.universal.UDesktop;
+import gg.essential.universal.UGraphics;
+import gg.essential.universal.UMatrixStack;
 import org.jetbrains.annotations.NotNull;
 import su.plo.lib.api.chat.MinecraftTextComponent;
 import su.plo.lib.mod.client.gui.components.Button;

client/src/main/java/su/plo/voice/client/gui/settings/VoiceSettingsAboutFeature.java

@@ -1,9 +1,9 @@
 package su.plo.voice.client.gui.settings;
 
 import com.google.common.collect.Lists;
-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.RequiredArgsConstructor;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;