diff --git a/build.gradle b/build.gradle index 50f12d7..1766af9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'fabric-loom' version '0.9.9' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 archivesBaseName = project.archives_base_name version = project.mod_version @@ -14,6 +14,7 @@ repositories { maven { name = "CottonMC" url = "http://server.bbkr.space:8081/artifactory/libs-release" + allowInsecureProtocol = true } } @@ -29,13 +30,14 @@ dependencies { // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. - modImplementation include("io.github.cottonmc:LibGui:3.2.2+1.16.3") + modImplementation include("io.github.cottonmc:LibGui:4.0.0+1.17") } processResources { inputs.property "version", project.version - + duplicatesStrategy = 'warn' + from(sourceSets.main.resources.srcDirs) { include "fabric.mod.json" expand "version": project.version diff --git a/gradle.properties b/gradle.properties index 4241803..68cdc88 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.16.5 - yarn_mappings=1.16.5+build.5 - loader_version=0.11.2 + minecraft_version=1.17 + yarn_mappings=1.17+build.1 + loader_version=0.11.3 # Mod Properties mod_version = 1.0.0 @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api #Fabric api - fabric_version=0.31.0+1.16 + fabric_version=0.34.9+1.17 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1..490fda8 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b4429..69a9715 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-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 5b60df3..27e3d10 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { repositories { - jcenter() + mavenCentral() maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' diff --git a/src/main/java/com/gmail/nystromjp/CoordinateMod.java b/src/main/java/com/gmail/nystromjp/CoordinateMod.java index bed6bf9..ee624bf 100644 --- a/src/main/java/com/gmail/nystromjp/CoordinateMod.java +++ b/src/main/java/com/gmail/nystromjp/CoordinateMod.java @@ -7,7 +7,7 @@ import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.option.KeyBinding; import org.lwjgl.glfw.GLFW; import java.io.File; diff --git a/src/main/java/com/gmail/nystromjp/gui/CoordinateGui.java b/src/main/java/com/gmail/nystromjp/gui/CoordinateGui.java index 9ed9a6f..3a8908c 100644 --- a/src/main/java/com/gmail/nystromjp/gui/CoordinateGui.java +++ b/src/main/java/com/gmail/nystromjp/gui/CoordinateGui.java @@ -1,6 +1,7 @@ package com.gmail.nystromjp.gui; import com.gmail.nystromjp.CoordinateMod; +import io.github.cottonmc.cotton.gui.widget.data.Insets; import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription; import io.github.cottonmc.cotton.gui.widget.WButton; import io.github.cottonmc.cotton.gui.widget.WLabel; @@ -27,6 +28,7 @@ public class CoordinateGui extends LightweightGuiDescription { public CoordinateGui() { //create root panel WPlainPanel root = new WPlainPanel(); + root.setInsets(Insets.ROOT_PANEL); setRootPanel(root); root.setSize(320, 180); diff --git a/src/main/java/com/gmail/nystromjp/gui/EditItemGui.java b/src/main/java/com/gmail/nystromjp/gui/EditItemGui.java index 90b0206..e40f38e 100644 --- a/src/main/java/com/gmail/nystromjp/gui/EditItemGui.java +++ b/src/main/java/com/gmail/nystromjp/gui/EditItemGui.java @@ -5,6 +5,7 @@ import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription; import io.github.cottonmc.cotton.gui.widget.*; import io.github.cottonmc.cotton.gui.widget.data.HorizontalAlignment; +import io.github.cottonmc.cotton.gui.widget.data.Insets; import net.minecraft.client.MinecraftClient; import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; @@ -35,6 +36,7 @@ public EditItemGui(int i, String oldName) { System.out.println(oldName); WPlainPanel root = new WPlainPanel(); + root.setInsets(Insets.ROOT_PANEL); setRootPanel(root); root.setSize(300, 60); @@ -83,6 +85,7 @@ public EditItemGui(){ listItemArray = SavesGui.listItemArray; WPlainPanel root = new WPlainPanel(); + root.setInsets(Insets.ROOT_PANEL); setRootPanel(root); root.setSize(300, 60); @@ -127,6 +130,7 @@ public EditItemGui(int x, int y, int z){ listItemArray = SavesGui.listItemArray; WPlainPanel root = new WPlainPanel(); + root.setInsets(Insets.ROOT_PANEL); setRootPanel(root); root.setSize(300, 60); diff --git a/src/main/java/com/gmail/nystromjp/gui/SavesGui.java b/src/main/java/com/gmail/nystromjp/gui/SavesGui.java index a7e86d4..cb78255 100644 --- a/src/main/java/com/gmail/nystromjp/gui/SavesGui.java +++ b/src/main/java/com/gmail/nystromjp/gui/SavesGui.java @@ -3,6 +3,7 @@ import com.gmail.nystromjp.CoordinateMod; import com.gmail.nystromjp.ListItem; import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription; +import io.github.cottonmc.cotton.gui.widget.data.Insets; import io.github.cottonmc.cotton.gui.widget.WButton; import io.github.cottonmc.cotton.gui.widget.WListPanel; import io.github.cottonmc.cotton.gui.widget.WPlainPanel; @@ -42,6 +43,7 @@ public SavesGui() { //create root panel WPlainPanel root = new WPlainPanel(); + root.setInsets(Insets.ROOT_PANEL); setRootPanel(root); root.setSize(320, 180); diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/modid.mixins.json index 90f6c10..54192c3 100644 --- a/src/main/resources/modid.mixins.json +++ b/src/main/resources/modid.mixins.json @@ -1,8 +1,8 @@ { "required": true, "minVersion": "0.8", - "package": "com.gmail.nystromjp", - "compatibilityLevel": "JAVA_8", + "package": "com.gmail.nystromjp.mixins", + "compatibilityLevel": "JAVA_16", "mixins": [ ], "client": [