Browse Source

20w22a

Signed-off-by: shedaniel <daniel@shedaniel.me>
shedaniel 5 năm trước cách đây
mục cha
commit
e59582c7a0

+ 1 - 1
build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version "0.4.3"
+    id 'fabric-loom' version "0.4.18"
     id 'maven-publish'
     id 'maven'
     id 'signing'

+ 6 - 6
gradle.properties

@@ -1,8 +1,8 @@
-supported_version=20w21a
-minecraft_version=20w21a
-yarn_mappings=20w21a+build.15+legacy.20w09a+build.8
+supported_version=20w22a
+minecraft_version=20w22a
+yarn_mappings=20w22a+build.1+legacy.20w09a+build.8
 loader_version=0.8.4+build.198
-fabric_version=0.10.10+build.347-1.16
-mod_version=4.4.0-unstable
-modmenu_version=1.11.6+build.11
+fabric_version=0.10.11+build.348-1.16
+mod_version=4.4.1-unstable
+modmenu_version=1.11.7+build.12
 nec_version=1.2.3+1.15.1

+ 4 - 3
src/main/java/me/shedaniel/clothconfig2/gui/GlobalizedClothConfigScreen.java

@@ -5,6 +5,7 @@ import com.google.common.collect.Maps;
 import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.clothconfig2.api.*;
 import me.shedaniel.math.Rectangle;
+import net.minecraft.class_5348;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.Screen;
@@ -240,7 +241,7 @@ public class GlobalizedClothConfigScreen extends AbstractConfigScreen implements
         
         @Override
         public int getItemHeight() {
-            List<Text> strings = MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(text, getParent().getItemWidth());
+            List<class_5348> strings = MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(text, getParent().getItemWidth());
             if (strings.isEmpty())
                 return 0;
             return 4 + strings.size() * 10;
@@ -262,8 +263,8 @@ public class GlobalizedClothConfigScreen extends AbstractConfigScreen implements
         @Override
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isHovered, float delta) {
             int yy = y + 2;
-            List<Text> texts = MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(this.text, getParent().getItemWidth());
-            for (Text text : texts) {
+            List<class_5348> texts = MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(this.text, getParent().getItemWidth());
+            for (class_5348 text : texts) {
                 MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, text, x - 4 + entryWidth / 2 - MinecraftClient.getInstance().textRenderer.getWidth(text) / 2, yy, -1);
                 yy += 10;
             }

+ 4 - 3
src/main/java/me/shedaniel/clothconfig2/gui/entries/TextListEntry.java

@@ -2,6 +2,7 @@ package me.shedaniel.clothconfig2.gui.entries;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.class_5348;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.util.math.MatrixStack;
@@ -45,8 +46,8 @@ public class TextListEntry extends TooltipListEntry<Object> {
         super.render(matrices, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
         this.savedWidth = entryWidth;
         int yy = y + 4;
-        List<Text> strings = MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(text, savedWidth);
-        for (Text string : strings) {
+        List<class_5348> strings = MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(text, savedWidth);
+        for (class_5348 string : strings) {
             MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, string, x, yy, color);
             yy += MinecraftClient.getInstance().textRenderer.fontHeight + 3;
         }
@@ -56,7 +57,7 @@ public class TextListEntry extends TooltipListEntry<Object> {
     public int getItemHeight() {
         if (savedWidth == -1)
             return 12;
-        List<Text> strings = MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(text, savedWidth);
+        List<class_5348> strings = MinecraftClient.getInstance().textRenderer.wrapStringToWidthAsList(text, savedWidth);
         if (strings.isEmpty())
             return 0;
         return 15 + strings.size() * 12;