From ca56474b2ba41bbcafad641e5007aa2fc63940c7 Mon Sep 17 00:00:00 2001 From: Shrey Pasricha Date: Fri, 10 Dec 2021 11:47:58 -0500 Subject: [PATCH] Updated to 1.18.1 --- build.gradle | 13 +++++++------ gradle.properties | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../resolutioncontrol/ResolutionControlMod.java | 4 ++-- .../client/gui/screen/SettingsScreen.java | 6 +++--- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 30710dd..fd67ed1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,17 @@ plugins { - id 'fabric-loom' version '0.8-SNAPSHOT' + id 'fabric-loom' version '0.10-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_16 -targetCompatibility = JavaVersion.VERSION_16 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group -minecraft { - accessWidener "src/main/resources/${project.mod_name}.accesswidener" +loom { + accessWidenerPath = file("src/main/resources/${project.mod_name}.accesswidener") } repositories { @@ -33,7 +33,8 @@ dependencies { //modCompile "com.jamieswhiteshirt:developer-mode:${project.developer_mode_version}" modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}" - modRuntime "com.github.ultimateboomer:mc-smoothboot:${project.smoothboot_version}" + // Disable smoothbot in dev environment until 1.18-1.7.0 is published? + // modRuntime "com.github.ultimateboomer:mc-smoothboot:${project.smoothboot_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index c01264b..01c7c64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.17 -yarn_mappings=1.17+build.12 -loader_version=0.11.3 +minecraft_version=1.18.1 +yarn_mappings=1.18.1+build.2 +loader_version=0.12.9 # Mod Properties mod_name=resolutioncontrol @@ -15,7 +15,7 @@ archives_base_name=resolution-control-plus # Dependencies # https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api/ -fabric_version=0.35.2+1.17 +fabric_version=0.44.0+1.18 #developer_mode_version=1.0.15 -mod_menu_version=2.0.2 -smoothboot_version=1.16.5-1.6.0 \ No newline at end of file +mod_menu_version=3.0.0 +smoothboot_version=1.18-1.7.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/io/github/ultimateboomer/resolutioncontrol/ResolutionControlMod.java b/src/main/java/io/github/ultimateboomer/resolutioncontrol/ResolutionControlMod.java index 06e876f..22cc583 100644 --- a/src/main/java/io/github/ultimateboomer/resolutioncontrol/ResolutionControlMod.java +++ b/src/main/java/io/github/ultimateboomer/resolutioncontrol/ResolutionControlMod.java @@ -94,7 +94,7 @@ public void onInitialize() { ClientTickEvents.END_CLIENT_TICK.register(client -> { while (settingsKey.wasPressed()) { - client.openScreen(SettingsScreen.getScreen(lastSettingsScreen)); + client.setScreen(SettingsScreen.getScreen(lastSettingsScreen)); } }); @@ -129,7 +129,7 @@ && getWindow().getX() != -32000) { private void saveScreenshot(Framebuffer fb) { ScreenshotRecorder.saveScreenshot(client.runDirectory, RCUtil.getScreenshotFilename(client.runDirectory).toString(), - fb.textureWidth, fb.textureHeight, fb, + fb, text -> client.player.sendMessage(text, false)); } diff --git a/src/main/java/io/github/ultimateboomer/resolutioncontrol/client/gui/screen/SettingsScreen.java b/src/main/java/io/github/ultimateboomer/resolutioncontrol/client/gui/screen/SettingsScreen.java index 6ad7988..f8c2cb9 100644 --- a/src/main/java/io/github/ultimateboomer/resolutioncontrol/client/gui/screen/SettingsScreen.java +++ b/src/main/java/io/github/ultimateboomer/resolutioncontrol/client/gui/screen/SettingsScreen.java @@ -76,7 +76,7 @@ protected void init() { startX - menuButtonWidth - 20, startY + o.getValue(), menuButtonWidth, menuButtonHeight, r.getTitle(), - button -> client.openScreen(constructor.apply(this.parent)) + button -> client.setScreen(constructor.apply(this.parent)) ); if (this.getClass().equals(c)) @@ -94,7 +94,7 @@ protected void init() { new TranslatableText("gui.done"), button -> { applySettingsAndCleanup(); - client.openScreen(this.parent); + client.setScreen(this.parent); } ); this.addDrawableChild(doneButton); @@ -132,7 +132,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { public boolean keyPressed(int keyCode, int scanCode, int modifiers) { if ((ResolutionControlMod.getInstance().getSettingsKey().matchesKey(keyCode, scanCode))) { this.applySettingsAndCleanup(); - this.client.openScreen(this.parent); + this.client.setScreen(this.parent); this.client.mouse.lockCursor(); return true; } else {