Ver código fonte

Bruh I forgot more stuff

Danielshe 5 anos atrás
pai
commit
d7865d5350

+ 1 - 1
build.gradle

@@ -14,7 +14,7 @@ targetCompatibility = 1.8
 
 group = "me.shedaniel.cloth"
 archivesBaseName = "config-2"
-version = project.mod_version.contains("unstable") ? (project.mod_version + "." + buildTime()) : project.mod_version
+version = ((String) project.mod_version).contains("unstable") ? (project.mod_version + "." + buildTime()) : project.mod_version
 
 minecraft {
 }

+ 1 - 1
src/main/java/me/shedaniel/clothconfig2/gui/entries/BooleanListEntry.java

@@ -72,7 +72,7 @@ public class BooleanListEntry extends TooltipListEntry<Boolean> {
     @Override
     public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
         super.render(index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
-        Window window = MinecraftClient.getInstance().window;
+        Window window = MinecraftClient.getInstance().method_22683();
         this.resetButton.active = isEditable() && getDefaultValue().isPresent() && defaultValue.get().booleanValue() != bool.get();
         this.resetButton.y = y;
         this.buttonWidget.active = isEditable();

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

@@ -93,8 +93,8 @@ public class DoubleListListEntry extends BaseListEntry<Double, DoubleListListEnt
                 }
                 
                 @Override
-                public void addText(String string_1) {
-                    super.addText(stripCharacters.apply(string_1));
+                public void write(String string_1) {
+                    super.write(stripCharacters.apply(string_1));
                 }
             };
             widget.setMaxLength(999999);
@@ -138,7 +138,7 @@ public class DoubleListListEntry extends BaseListEntry<Double, DoubleListListEnt
             widget.setWidth(entryWidth - 12);
             widget.x = x;
             widget.y = y + 1;
-            widget.setIsEditable(listListEntry.isEditable());
+            widget.setEditable(listListEntry.isEditable());
             this.isSelected = isSelected;
             widget.render(mouseX, mouseY, delta);
             if (isSelected && listListEntry.isEditable())

+ 1 - 1
src/main/java/me/shedaniel/clothconfig2/gui/entries/EnumListEntry.java

@@ -90,7 +90,7 @@ public class EnumListEntry<T extends Enum<?>> extends TooltipListEntry<T> {
     @Override
     public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
         super.render(index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
-        Window window = MinecraftClient.getInstance().window;
+        Window window = MinecraftClient.getInstance().method_22683();
         this.resetButton.active = isEditable() && getDefaultValue().isPresent() && getDefaultIndex() != this.index.get();
         this.resetButton.y = y;
         this.buttonWidget.active = isEditable();

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

@@ -93,8 +93,8 @@ public class FloatListListEntry extends BaseListEntry<Float, FloatListListEntry.
                 }
                 
                 @Override
-                public void addText(String string_1) {
-                    super.addText(stripCharacters.apply(string_1));
+                public void write(String string_1) {
+                    super.write(stripCharacters.apply(string_1));
                 }
             };
             widget.setMaxLength(999999);
@@ -138,7 +138,7 @@ public class FloatListListEntry extends BaseListEntry<Float, FloatListListEntry.
             widget.setWidth(entryWidth - 12);
             widget.x = x;
             widget.y = y + 1;
-            widget.setIsEditable(listListEntry.isEditable());
+            widget.setEditable(listListEntry.isEditable());
             this.isSelected = isSelected;
             widget.render(mouseX, mouseY, delta);
             if (isSelected && listListEntry.isEditable())

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

@@ -93,8 +93,8 @@ public class IntegerListListEntry extends BaseListEntry<Integer, IntegerListList
                 }
                 
                 @Override
-                public void addText(String string_1) {
-                    super.addText(stripCharacters.apply(string_1));
+                public void write(String string_1) {
+                    super.write(stripCharacters.apply(string_1));
                 }
             };
             widget.setMaxLength(999999);
@@ -138,7 +138,7 @@ public class IntegerListListEntry extends BaseListEntry<Integer, IntegerListList
             widget.setWidth(entryWidth - 12);
             widget.x = x;
             widget.y = y + 1;
-            widget.setIsEditable(listListEntry.isEditable());
+            widget.setEditable(listListEntry.isEditable());
             this.isSelected = isSelected;
             widget.render(mouseX, mouseY, delta);
             if (isSelected && listListEntry.isEditable())

+ 1 - 1
src/main/java/me/shedaniel/clothconfig2/gui/entries/IntegerSliderEntry.java

@@ -105,7 +105,7 @@ public class IntegerSliderEntry extends TooltipListEntry<Integer> {
     @Override
     public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
         super.render(index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
-        Window window = MinecraftClient.getInstance().window;
+        Window window = MinecraftClient.getInstance().method_22683();
         this.resetButton.active = isEditable() && getDefaultValue().isPresent() && defaultValue.get().intValue() != value.get();
         this.resetButton.y = y;
         this.sliderWidget.active = isEditable();

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

@@ -93,8 +93,8 @@ public class LongListListEntry extends BaseListEntry<Long, LongListListEntry.Lon
                 }
                 
                 @Override
-                public void addText(String string_1) {
-                    super.addText(stripCharacters.apply(string_1));
+                public void write(String string_1) {
+                    super.write(stripCharacters.apply(string_1));
                 }
             };
             widget.setMaxLength(999999);
@@ -138,7 +138,7 @@ public class LongListListEntry extends BaseListEntry<Long, LongListListEntry.Lon
             widget.setWidth(entryWidth - 12);
             widget.x = x;
             widget.y = y + 1;
-            widget.setIsEditable(listListEntry.isEditable());
+            widget.setEditable(listListEntry.isEditable());
             this.isSelected = isSelected;
             widget.render(mouseX, mouseY, delta);
             if (isSelected && listListEntry.isEditable())

+ 1 - 1
src/main/java/me/shedaniel/clothconfig2/gui/entries/LongSliderEntry.java

@@ -105,7 +105,7 @@ public class LongSliderEntry extends TooltipListEntry<Long> {
     @Override
     public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
         super.render(index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
-        Window window = MinecraftClient.getInstance().window;
+        Window window = MinecraftClient.getInstance().method_22683();
         this.resetButton.active = isEditable() && getDefaultValue().isPresent() && defaultValue.get().longValue() != value.get();
         this.resetButton.y = y;
         this.sliderWidget.active = isEditable();

+ 1 - 1
src/main/java/me/shedaniel/clothconfig2/gui/entries/StringListListEntry.java

@@ -91,7 +91,7 @@ public class StringListListEntry extends BaseListEntry<String, StringListListEnt
             widget.setWidth(entryWidth - 12);
             widget.x = x;
             widget.y = y + 1;
-            widget.setIsEditable(listListEntry.isEditable());
+            widget.setEditable(listListEntry.isEditable());
             this.isSelected = isSelected;
             widget.render(mouseX, mouseY, delta);
             if (isSelected && listListEntry.isEditable())

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

@@ -43,8 +43,8 @@ public abstract class TextFieldListEntry<T> extends TooltipListEntry<T> {
             }
             
             @Override
-            public void addText(String string_1) {
-                super.addText(stripAddText(string_1));
+            public void write(String string_1) {
+                super.write(stripAddText(string_1));
             }
         };
         textFieldWidget.setMaxLength(999999);
@@ -75,10 +75,10 @@ public abstract class TextFieldListEntry<T> extends TooltipListEntry<T> {
     @Override
     public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
         super.render(index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
-        Window window = MinecraftClient.getInstance().window;
+        Window window = MinecraftClient.getInstance().method_22683();
         this.resetButton.active = isEditable() && getDefaultValue().isPresent() && !isMatchDefault(textFieldWidget.getText());
         this.resetButton.y = y;
-        this.textFieldWidget.setIsEditable(isEditable());
+        this.textFieldWidget.setEditable(isEditable());
         this.textFieldWidget.y = y + 1;
         if (MinecraftClient.getInstance().textRenderer.isRightToLeft()) {
             MinecraftClient.getInstance().textRenderer.drawWithShadow(I18n.translate(getFieldName()), window.getScaledWidth() - x - MinecraftClient.getInstance().textRenderer.getStringWidth(I18n.translate(getFieldName())), y + 5, getPreferredTextColor());