Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated to 1.18.1! #17

Open
wants to merge 1 commit into
base: 1.17
Choose a base branch
from
Open

Updated to 1.18.1! #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
mod_menu_version=3.0.0
smoothboot_version=1.18-1.7.0
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/main/java/io/github/ultimateboomer/resolutioncontrol/ResolutionControlMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
});

Expand Down Expand Up @@ -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));
}

Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/io/github/ultimateboomer/resolutioncontrol/client/gui/screen/SettingsScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -94,7 +94,7 @@ protected void init() {
new TranslatableText("gui.done"),
button -> {
applySettingsAndCleanup();
client.openScreen(this.parent);
client.setScreen(this.parent);
}
);
this.addDrawableChild(doneButton);
Expand Down Expand Up @@ -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 {
Expand Down