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.

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

Update to 1.17 #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 5 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.5-SNAPSHOT'
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -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()
}
Expand All @@ -30,23 +30,18 @@ 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"
}

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
Expand Down
9 changes: 5 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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-6.8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions src/main/resources/mcpnp.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"minVersion": "0.8",
"package": "glitchieproductions.mcpnp.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
"common.PlayerManagerAccess"
],
"client": [
"client.MixinGameMenuScreen"
],
Expand Down