[DEV] Rebuild porting patches

2025-04-28 13:49:31 +02:00
parent fe00eabdff
commit 799a0fecc7
100 changed files with 789 additions and 199 deletions
--- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
+++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch
@@ -1,6 +1,14 @@
 --- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
 +++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
-@@ -159,7 +159,7 @@
+@@ -37,7 +37,6 @@
+ /**
+  * @author HypherionSA
+  */
+-@SuppressWarnings("deprecation")
+ @Deprecated(forRemoval = true, since = "2.1.3")
+ public class CraterConfigScreen extends Screen {
+     public static final float SCROLLBAR_BOTTOM_COLOR = .5f;
+@@ -160,7 +159,7 @@
             return new TextConfigOption<>(Objects::toString, BigDecimal::new);
         }
         if (value instanceof ResourceLocation) {
@@ -9,15 +17,17 @@
         }
         if (isSubConfig) {
             return new SubConfigWidget<>(config, this, value);
-@@ -180,6 +180,7 @@
+@@ -180,7 +179,8 @@
+ 
     @Override
     public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
-         overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
+-        /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
+        overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
 +
         renderScrollBar();
 
         matrices.pose().pushPose();
-@@ -188,9 +189,8 @@
+@@ -189,9 +189,8 @@
         overlayBackground(matrices.pose(), height - BOTTOM, height, 64);
         renderShadow(matrices.pose());
         matrices.drawCenteredString(font, getTitle(), width / 2, 9, 0xFFFFFF);
@@ -28,7 +38,16 @@
 
         int y = (int) (TOP + 4 - Math.round(scrollerAmount));
         for (Option<?> option : options) {
-@@ -217,47 +217,49 @@
+@@ -199,7 +198,7 @@
+             option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta);
+             renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0]));
+             y += height1;
+-        }*/
+        }
+     }
+ 
+     private void renderScrollBar() {
+@@ -218,47 +217,49 @@
             int maxY = this.height - BOTTOM;
             //RenderSystem.disableTexture();
             Tesselator tesselator = Tesselator.getInstance();
@@ -110,21 +129,22 @@
     }
 
     protected void overlayBackground(PoseStack matrices, int h1, int h2, int color) {
-@@ -266,15 +268,16 @@
+@@ -267,15 +268,16 @@
 
     protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
         Tesselator tesselator = Tesselator.getInstance();
 -        BufferBuilder buffer = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
 -        //RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
 -        //RenderSystem.setShaderTexture(0, Screen.MENU_BACKGROUND);
-+        BufferBuilder buffer = tesselator.getBuilder();
-+        RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
-         RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+-        //RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
 -        buffer.addVertex(matrix, minX, maxY, 0.0F).setUv(minX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
 -        buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
 -        buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
 -        buffer.addVertex(matrix, minX, minY, 0.0F).setUv(minX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
 -        //BufferUploader.drawWithShader(buffer.buildOrThrow());
+        BufferBuilder buffer = tesselator.getBuilder();
+        RenderSystem.setShaderTexture(0, Screen.BACKGROUND_LOCATION);
+        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
 +        RenderSystem.setShader(GameRenderer::getPositionTexColorShader);
 +        buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
 +        buffer.vertex(matrix, minX, maxY, 0.0F).uv(minX / 32.0F, maxY / 32.0F).color(red, green, blue, endAlpha).endVertex();
@@ -135,7 +155,7 @@
     }
 
     public int scrollHeight() {
-@@ -332,12 +335,12 @@
+@@ -333,12 +335,12 @@
     }
 
     @Override
@@ -150,3 +170,12 @@
     }
 
     @Override
+@@ -385,7 +387,7 @@
+                 for (String desc : description) {
+                     list.add(Component.translatable(desc));
+                 }
+-                //stack.renderComponentTooltip(font, list, mouseX, mouseY);
+                stack.renderComponentTooltip(font, list, mouseX, mouseY);
+             }
+         }
+     }
--- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch
+++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java.patch
@@ -9,3 +9,12 @@
     }
 
     public boolean isSinglePlayer() {
+@@ -55,7 +55,7 @@
+     }
+ 
+     public String getGameVersion() {
+-        return SharedConstants.getCurrentVersion().name();
+        return SharedConstants.getCurrentVersion().getName();
+     }
+ 
+     public String getUserName() {
--- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch
+++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java.patch
@@ -0,0 +1,11 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
+@@ -38,7 +38,7 @@
+     }
+ 
+     public String getName() {
+-        return SharedConstants.getCurrentVersion().name();
+        return SharedConstants.getCurrentVersion().getName();
+     }
+ 
+     public boolean usesAuthentication() {
--- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
+++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
@@ -8,7 +8,7 @@
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
 import lombok.Getter;
-@@ -10,21 +10,16 @@
+@@ -10,46 +10,29 @@
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.kyori.adventure.text.serializer.json.JSONOptions;
@@ -28,11 +28,12 @@
 
     @Getter
 -    private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options(
+-            JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version())
 +    private static final GsonComponentSerializer adventureSerializer = (ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER) ? GsonComponentSerializer.builder().build() : GsonComponentSerializer.builder().options(
-             JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion())
+            JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion())
     ).build();
 
-@@ -32,24 +27,12 @@
+     private static final MiniMessage miniMessage = MiniMessage.miniMessage();
 
     public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
         final String serialised = adventureSerializer.serialize(inComponent);