20w12a

Signed-off-by: shedaniel <daniel@shedaniel.me>

build.gradle

@@ -1,7 +1,7 @@
 import java.text.SimpleDateFormat
 
 plugins {
-    id 'fabric-loom' version '0.2.6-SNAPSHOT'
+    id 'fabric-loom' version '0.2.7-SNAPSHOT'
     id 'maven-publish'
     id 'maven'
     id 'signing'
@@ -23,7 +23,7 @@ sourceCompatibility = targetCompatibility = 1.8
 
 group = "me.shedaniel.cloth"
 archivesBaseName = "config-2"
-version = (project.mod_version as String).contains("unstable") ? (project.mod_version + "." + buildTime()) : project.mod_version as String
+version = project.mod_version
 
 minecraft {
 }
@@ -35,12 +35,6 @@ processResources {
     inputs.property "version", project.version
 }
 
-static def buildTime() {
-    def df = new SimpleDateFormat("yyyyMMddHHmm")
-    df.setTimeZone(TimeZone.getTimeZone("UTC"))
-    return df.format(new Date())
-}
-
 dependencies {
     compileOnly 'org.jetbrains:annotations:18.0.0'
 

gradle.properties

@@ -1,7 +1,7 @@
-minecraft_version=20w10a
-yarn_mappings=20w10a+build.2
+minecraft_version=20w12a
+yarn_mappings=20w12a+build.3
 loader_version=0.7.8+build.186
-fabric_version=0.4.34+build.303-1.16
+fabric_version=0.5.4+build.310-1.16
 mod_version=3.1.0-unstable
 modmenu_version=1.10.1+build.30
 nec_version=1.2.3+1.15.1

src/main/java/me/shedaniel/clothconfig2/gui/ClothConfigScreen.java

@@ -204,9 +204,9 @@ public abstract class ClothConfigScreen extends Screen {
         requiresRestart = false;
         if (openOtherScreens) {
             if (requiresRestart)
-                ClothConfigScreen.this.minecraft.openScreen(new ClothRequiresRestartScreen(parent));
+                ClothConfigScreen.this.client.openScreen(new ClothRequiresRestartScreen(parent));
             else
-                ClothConfigScreen.this.minecraft.openScreen(parent);
+                ClothConfigScreen.this.client.openScreen(parent);
         }
     }
     
@@ -218,16 +218,16 @@ public abstract class ClothConfigScreen extends Screen {
         if (listWidget != null)
             tabbedEntries.put(tabs.get(selectedTabIndex).getLeft(), (List) listWidget.children());
         selectedTabIndex = nextTabIndex;
-        children.add(listWidget = new ListWidget(minecraft, width, height, isShowingTabs() ? 70 : 30, height - 32, getBackgroundLocation()));
+        children.add(listWidget = new ListWidget(client, width, height, isShowingTabs() ? 70 : 30, height - 32, getBackgroundLocation()));
         listWidget.setSmoothScrolling(this.smoothScrollingList);
         if (tabbedEntries.size() > selectedTabIndex)
             Lists.newArrayList(tabbedEntries.values()).get(selectedTabIndex).forEach(entry -> listWidget.children().add(entry));
         int buttonWidths = (width - 50 - 12) / 3;
         addButton(quitButton = new ButtonWidget(25, height - 26, buttonWidths, 20, edited ? I18n.translate("text.cloth-config.cancel_discard") : I18n.translate("gui.cancel"), widget -> {
             if (confirmSave && edited)
-                minecraft.openScreen(new ConfirmScreen(new QuitSaveConsumer(), new TranslatableText("text.cloth-config.quit_config"), new TranslatableText("text.cloth-config.quit_config_sure"), I18n.translate("text.cloth-config.quit_discard"), I18n.translate("gui.cancel")));
+                client.openScreen(new ConfirmScreen(new QuitSaveConsumer(), new TranslatableText("text.cloth-config.quit_config"), new TranslatableText("text.cloth-config.quit_config_sure"), I18n.translate("text.cloth-config.quit_discard"), I18n.translate("gui.cancel")));
             else
-                minecraft.openScreen(parent);
+                client.openScreen(parent);
         }));
         addButton(saveButton = new AbstractPressableButtonWidget(25 + 6 + buttonWidths, height - 26, buttonWidths, 20, "") {
             @Override
@@ -280,13 +280,13 @@ public abstract class ClothConfigScreen extends Screen {
                 
                 @Override
                 public void renderButton(int int_1, int int_2, float float_1) {
-                    minecraft.getTextureManager().bindTexture(CONFIG_TEX);
+                    client.getTextureManager().bindTexture(CONFIG_TEX);
                     RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha);
                     int int_3 = this.getYImage(this.isHovered());
                     RenderSystem.enableBlend();
                     RenderSystem.blendFuncSeparate(770, 771, 0, 1);
                     RenderSystem.blendFunc(770, 771);
-                    this.blit(x, y, 12, 18 * int_3, width, height);
+                    this.drawTexture(x, y, 12, 18 * int_3, width, height);
                 }
             });
             int j = 0;
@@ -305,13 +305,13 @@ public abstract class ClothConfigScreen extends Screen {
                 
                 @Override
                 public void renderButton(int int_1, int int_2, float float_1) {
-                    minecraft.getTextureManager().bindTexture(CONFIG_TEX);
+                    client.getTextureManager().bindTexture(CONFIG_TEX);
                     RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha);
                     int int_3 = this.getYImage(this.isHovered());
                     RenderSystem.enableBlend();
                     RenderSystem.blendFuncSeparate(770, 771, 0, 1);
                     RenderSystem.blendFunc(770, 771);
-                    this.blit(x, y, 0, 18 * int_3, width, height);
+                    this.drawTexture(x, y, 0, 18 * int_3, width, height);
                 }
             });
         } else {
@@ -395,7 +395,7 @@ public abstract class ClothConfigScreen extends Screen {
             child.lateRender(int_1, int_2, float_1);
         ScissorsHandler.INSTANCE.removeLastScissor();
         if (isShowingTabs()) {
-            drawCenteredString(minecraft.textRenderer, title, width / 2, 18, -1);
+            drawCenteredString(client.textRenderer, title, width / 2, 18, -1);
             Rectangle onlyInnerTabBounds = new Rectangle(tabsBounds.x + 20, tabsBounds.y, tabsBounds.width - 40, tabsBounds.height);
             ScissorsHandler.INSTANCE.scissor(onlyInnerTabBounds);
             if (isTransparentBackground())
@@ -408,7 +408,7 @@ public abstract class ClothConfigScreen extends Screen {
             buttonLeftTab.render(int_1, int_2, float_1);
             buttonRightTab.render(int_1, int_2, float_1);
         } else
-            drawCenteredString(minecraft.textRenderer, title, width / 2, 12, -1);
+            drawCenteredString(client.textRenderer, title, width / 2, 12, -1);
         
         if (displayErrors && isEditable()) {
             List<String> errors = Lists.newArrayList();
@@ -417,26 +417,26 @@ public abstract class ClothConfigScreen extends Screen {
                     if (entry.getConfigError().isPresent())
                         errors.add(((Optional<String>) entry.getConfigError()).get());
             if (errors.size() > 0) {
-                minecraft.getTextureManager().bindTexture(CONFIG_TEX);
+                client.getTextureManager().bindTexture(CONFIG_TEX);
                 RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
                 String text = "§c" + (errors.size() == 1 ? errors.get(0) : I18n.translate("text.cloth-config.multi_error"));
                 if (isTransparentBackground()) {
-                    int stringWidth = minecraft.textRenderer.getStringWidth(text);
-                    fillGradient(8, 9, 20 + stringWidth, 14 + minecraft.textRenderer.fontHeight, 0x68000000, 0x68000000);
+                    int stringWidth = client.textRenderer.getStringWidth(text);
+                    fillGradient(8, 9, 20 + stringWidth, 14 + client.textRenderer.fontHeight, 0x68000000, 0x68000000);
                 }
-                blit(10, 10, 0, 54, 3, 11);
-                drawString(minecraft.textRenderer, text, 18, 12, -1);
+                drawTexture(10, 10, 0, 54, 3, 11);
+                drawString(client.textRenderer, text, 18, 12, -1);
             }
         } else if (!isEditable()) {
-            minecraft.getTextureManager().bindTexture(CONFIG_TEX);
+            client.getTextureManager().bindTexture(CONFIG_TEX);
             RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
             String text = "§c" + I18n.translate("text.cloth-config.not_editable");
             if (isTransparentBackground()) {
-                int stringWidth = minecraft.textRenderer.getStringWidth(text);
-                fillGradient(8, 9, 20 + stringWidth, 14 + minecraft.textRenderer.fontHeight, 0x68000000, 0x68000000);
+                int stringWidth = client.textRenderer.getStringWidth(text);
+                fillGradient(8, 9, 20 + stringWidth, 14 + client.textRenderer.fontHeight, 0x68000000, 0x68000000);
             }
-            blit(10, 10, 0, 54, 3, 11);
-            drawString(minecraft.textRenderer, text, 18, 12, -1);
+            drawTexture(10, 10, 0, 54, 3, 11);
+            drawString(client.textRenderer, text, 18, 12, -1);
         }
         super.render(int_1, int_2, float_1);
         queuedTooltips.forEach(queuedTooltip -> renderTooltip(queuedTooltip.getText(), queuedTooltip.getX(), queuedTooltip.getY()));
@@ -479,7 +479,7 @@ public abstract class ClothConfigScreen extends Screen {
             return;
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();
-        minecraft.getTextureManager().bindTexture(getBackgroundLocation());
+        client.getTextureManager().bindTexture(getBackgroundLocation());
         RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
         float f = 32.0F;
         buffer.begin(7, VertexFormats.POSITION_TEXTURE_COLOR);
@@ -602,9 +602,9 @@ public abstract class ClothConfigScreen extends Screen {
             return true;
         if (int_1 == 256 && this.shouldCloseOnEsc()) {
             if (confirmSave && edited)
-                minecraft.openScreen(new ConfirmScreen(new QuitSaveConsumer(), new TranslatableText("text.cloth-config.quit_config"), new TranslatableText("text.cloth-config.quit_config_sure"), I18n.translate("text.cloth-config.quit_discard"), I18n.translate("gui.cancel")));
+                client.openScreen(new ConfirmScreen(new QuitSaveConsumer(), new TranslatableText("text.cloth-config.quit_config"), new TranslatableText("text.cloth-config.quit_config_sure"), I18n.translate("text.cloth-config.quit_discard"), I18n.translate("gui.cancel")));
             else
-                minecraft.openScreen(parent);
+                client.openScreen(parent);
             return true;
         }
         return super.keyPressed(int_1, int_2, int_3);
@@ -626,9 +626,9 @@ public abstract class ClothConfigScreen extends Screen {
         @Override
         public void accept(boolean t) {
             if (!t)
-                minecraft.openScreen(ClothConfigScreen.this);
+                client.openScreen(ClothConfigScreen.this);
             else
-                minecraft.openScreen(parent);
+                client.openScreen(parent);
         }
     }
     

src/main/java/me/shedaniel/clothconfig2/gui/entries/BaseListEntry.java

@@ -197,10 +197,10 @@ public abstract class BaseListEntry<T, C extends BaseListCell, SELF extends Base
         BaseListCell focused = !expanded || getFocused() == null || !(getFocused() instanceof BaseListCell) ? null : (BaseListCell) getFocused();
         boolean insideCreateNew = isInsideCreateNew(mouseX, mouseY);
         boolean insideDelete = isInsideDelete(mouseX, mouseY);
-        blit(x - 15, y + 4, 24 + 9, (labelWidget.rectangle.contains(mouseX, mouseY) && !insideCreateNew && !insideDelete ? 18 : 0) + (expanded ? 9 : 0), 9, 9);
-        blit(x - 15 + 13, y + 4, 24 + 18, insideCreateNew ? 9 : 0, 9, 9);
+        drawTexture(x - 15, y + 4, 24 + 9, (labelWidget.rectangle.contains(mouseX, mouseY) && !insideCreateNew && !insideDelete ? 18 : 0) + (expanded ? 9 : 0), 9, 9);
+        drawTexture(x - 15 + 13, y + 4, 24 + 18, insideCreateNew ? 9 : 0, 9, 9);
         if (isDeleteButtonEnabled())
-            blit(x - 15 + 26, y + 4, 24 + 27, focused == null ? 0 : insideDelete ? 18 : 9, 9, 9);
+            drawTexture(x - 15 + 26, y + 4, 24 + 27, focused == null ? 0 : insideDelete ? 18 : 9, 9, 9);
         resetWidget.x = x + entryWidth - resetWidget.getWidth();
         resetWidget.y = y;
         resetWidget.active = isEditable() && getDefaultValue().isPresent();

src/main/java/me/shedaniel/clothconfig2/gui/entries/MultiElementListEntry.java

@@ -79,7 +79,7 @@ public class MultiElementListEntry<T> extends TooltipListEntry<T> {
         MinecraftClient.getInstance().getTextureManager().bindTexture(CONFIG_TEX);
         DiffuseLighting.disable();
         RenderSystem.color4f(1, 1, 1, 1);
-        blit(x - 15, y + 4, 24, (widget.rectangle.contains(mouseX, mouseY) ? 18 : 0) + (expanded ? 9 : 0), 9, 9);
+        drawTexture(x - 15, y + 4, 24, (widget.rectangle.contains(mouseX, mouseY) ? 18 : 0) + (expanded ? 9 : 0), 9, 9);
         MinecraftClient.getInstance().textRenderer.drawWithShadow(I18n.translate(categoryName), x, y + 5, widget.rectangle.contains(mouseX, mouseY) ? 0xffe6fe16 : -1);
         for (AbstractConfigListEntry<?> entry : entries) {
             entry.setParent(getParent());

src/main/java/me/shedaniel/clothconfig2/gui/entries/SubCategoryListEntry.java

@@ -75,7 +75,7 @@ public class SubCategoryListEntry extends TooltipListEntry<List<AbstractConfigLi
         MinecraftClient.getInstance().getTextureManager().bindTexture(CONFIG_TEX);
         DiffuseLighting.disable();
         RenderSystem.color4f(1, 1, 1, 1);
-        blit(x - 15, y + 4, 24, (widget.rectangle.contains(mouseX, mouseY) ? 18 : 0) + (expanded ? 9 : 0), 9, 9);
+        drawTexture(x - 15, y + 4, 24, (widget.rectangle.contains(mouseX, mouseY) ? 18 : 0) + (expanded ? 9 : 0), 9, 9);
         MinecraftClient.getInstance().textRenderer.drawWithShadow(I18n.translate(categoryName), x, y + 5, widget.rectangle.contains(mouseX, mouseY) ? 0xffe6fe16 : -1);
         for (AbstractConfigListEntry<?> entry : entries) {
             entry.setParent(getParent());

src/main/java/me/shedaniel/clothconfig2/impl/ConfigBuilderImpl.java

@@ -31,7 +31,7 @@ public class ConfigBuilderImpl implements ConfigBuilder {
     private boolean doesProcessErrors = true;
     private boolean doesConfirmSave = true;
     private boolean transparentBackground = false;
-    private Identifier defaultBackground = DrawableHelper.BACKGROUND_LOCATION;
+    private Identifier defaultBackground = DrawableHelper.BACKGROUND_TEXTURE;
     private Consumer<Screen> afterInitConsumer = screen -> {};
     private final Map<String, Identifier> categoryBackground = Maps.newHashMap();
     private final Map<String, List<Pair<String, Object>>> dataMap = Maps.newLinkedHashMap();

src/main/java/me/shedaniel/clothconfig2/mixin/MixinControlsOptionsScreen.java

@@ -26,7 +26,7 @@ public class MixinControlsOptionsScreen extends GameOptionsScreen {
     @Inject(method = "init()V", at = @At("HEAD"))
     private void initHead(CallbackInfo info) {
         List<KeyBinding> newKeysAll = new ArrayList<>();
-        KeyBinding[] var3 = minecraft.options.keysAll;
+        KeyBinding[] var3 = client.options.keysAll;
         
         for (KeyBinding binding : var3) {
             if (!(binding instanceof FakeKeyBindings)) {
@@ -35,18 +35,18 @@ public class MixinControlsOptionsScreen extends GameOptionsScreen {
         }
         
         newKeysAll.addAll(FakeModifierKeyCodeAdder.INSTANCE.getFakeBindings());
-        ((GameOptionsHooks) minecraft.options).cloth_setKeysAll(newKeysAll.toArray(new KeyBinding[0]));
+        ((GameOptionsHooks) client.options).cloth_setKeysAll(newKeysAll.toArray(new KeyBinding[0]));
     }
     
     @Inject(method = "init()V", at = @At("RETURN"))
     private void initReturn(CallbackInfo info) {
         List<KeyBinding> newKeysAll = new ArrayList<>();
-        KeyBinding[] var3 = minecraft.options.keysAll;
+        KeyBinding[] var3 = client.options.keysAll;
         for (KeyBinding binding : var3) {
             if (!(binding instanceof FakeKeyBindings)) {
                 newKeysAll.add(binding);
             }
         }
-        ((GameOptionsHooks) minecraft.options).cloth_setKeysAll(newKeysAll.toArray(new KeyBinding[0]));
+        ((GameOptionsHooks) client.options).cloth_setKeysAll(newKeysAll.toArray(new KeyBinding[0]));
     }
 }