diff --git a/build.gradle b/build.gradle index c03547b..fad2be9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' + id 'fabric-loom' version '0.8-SNAPSHOT' id 'maven-publish' } @@ -16,7 +16,7 @@ repositories { url = "https://server.bbkr.space/artifactory/libs-release" } maven { - url = "http://4thline.org/m2/" + url = "https://4thline.org/m2/" } mavenCentral() } @@ -30,8 +30,8 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "io.github.cottonmc:LibGui:3.3.3+1.16.5" - include "io.github.cottonmc:LibGui:3.3.3+1.16.5" + modImplementation "io.github.cottonmc:LibGui:4.0.0+1.17" + include "io.github.cottonmc:LibGui:4.0.0+1.17" modImplementation "org.bitlet:weupnp:0.1.4" // modimplementation because of loom bug include "org.bitlet:weupnp:0.1.4" } @@ -39,14 +39,9 @@ dependencies { processResources { inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching("fabric.mod.json") { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } // ensure that the encoding is set to UTF-8, no matter what the system default is diff --git a/gradle.properties b/gradle.properties index 5db8d18..e99ff38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,14 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.16.5 -yarn_mappings=1.16.5+build.3 -loader_version=0.11.1 +minecraft_version=1.17 +yarn_mappings=1.17+build.7 +loader_version=0.11.3 + # Mod Properties mod_version=1.0.0 maven_group=io.github.theglitch76 archives_base_name=mcpnp # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.30.0+1.16 +fabric_version=0.35.0+1.17 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 25d3265..29e4134 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.8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/glitchieproductions/mcpnp/client/OpenToLanGui.java b/src/main/java/glitchieproductions/mcpnp/client/OpenToLanGui.java index 9f6f100..7e7509c 100644 --- a/src/main/java/glitchieproductions/mcpnp/client/OpenToLanGui.java +++ b/src/main/java/glitchieproductions/mcpnp/client/OpenToLanGui.java @@ -1,7 +1,6 @@ package glitchieproductions.mcpnp.client; import glitchieproductions.mcpnp.common.Mcpnp; -import glitchieproductions.mcpnp.mixin.common.PlayerManagerAccess; import io.github.cottonmc.cotton.gui.client.CottonClientScreen; import io.github.cottonmc.cotton.gui.client.LightweightGuiDescription; import io.github.cottonmc.cotton.gui.widget.WButton; @@ -14,10 +13,8 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.integrated.IntegratedServer; import net.minecraft.text.LiteralText; -import net.minecraft.world.GameMode; public class OpenToLanGui extends LightweightGuiDescription { private final Screen parent; diff --git a/src/main/java/glitchieproductions/mcpnp/mixin/common/PlayerManagerAccess.java b/src/main/java/glitchieproductions/mcpnp/mixin/common/PlayerManagerAccess.java deleted file mode 100644 index 2b9f390..0000000 --- a/src/main/java/glitchieproductions/mcpnp/mixin/common/PlayerManagerAccess.java +++ /dev/null @@ -1,13 +0,0 @@ -package glitchieproductions.mcpnp.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import net.minecraft.server.PlayerManager; -import net.minecraft.world.GameMode; - -@Mixin(PlayerManager.class) -public interface PlayerManagerAccess { - @Accessor("gameMode") - GameMode mcpnp$getGameMode(); -} diff --git a/src/main/resources/mcpnp.mixins.json b/src/main/resources/mcpnp.mixins.json index 3e3a211..0235e77 100644 --- a/src/main/resources/mcpnp.mixins.json +++ b/src/main/resources/mcpnp.mixins.json @@ -3,9 +3,6 @@ "minVersion": "0.8", "package": "glitchieproductions.mcpnp.mixin", "compatibilityLevel": "JAVA_8", - "mixins": [ - "common.PlayerManagerAccess" - ], "client": [ "client.MixinGameMenuScreen" ],