From 6a3dafc82494ed33f6c771999bf39e0a1ed23ddc Mon Sep 17 00:00:00 2001 From: Mysticpasta1 Date: Sun, 31 Dec 2023 01:22:50 -0600 Subject: [PATCH] 1.20.1 port --- build.gradle | 14 ++++++-------- gradle.properties | 18 ++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../{modid => holographic_renders}/icon.png | Bin src/main/resources/fabric.mod.json | 6 +++--- 5 files changed, 18 insertions(+), 22 deletions(-) rename src/main/resources/assets/{modid => holographic_renders}/icon.png (100%) diff --git a/build.gradle b/build.gradle index 80a323e..1d4e658 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.7-SNAPSHOT' + id 'fabric-loom' version '0.11-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 @@ -34,12 +34,10 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "com.glisco:worldmesher-0.1-dev" - include "com.glisco:worldmesher-0.1" + modImplementation 'com.github.gliscowo:worldmesher:7d93ceb64b' + include 'com.github.gliscowo:worldmesher:7d93ceb64b' implementation 'com.madgag:animated-gif-lib:1.4' include 'com.madgag:animated-gif-lib:1.4' - - modImplementation "com.teamwizardry.librarianlib:facade:1.17-quilt-SNAPSHOT" } processResources { @@ -60,7 +58,7 @@ tasks.withType(JavaCompile).configureEach { // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. // We'll use that if it's available, but otherwise we'll use the older option. - def targetVersion = 8 + def targetVersion = 17 if (JavaVersion.current().isJava9Compatible()) { it.options.release = targetVersion } diff --git a/gradle.properties b/gradle.properties index f97e6d4..d123301 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,15 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx2G +org.gradle.daemon=false -# Fabric Properties - # check these on https://fabricmc.net/versions.html - minecraft_version=1.17.1 - yarn_mappings=1.17.1+build.61 - loader_version=0.11.7 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.15.3 + +#Fabric api +fabric_version=0.91.0+1.20.1 # Mod Properties - mod_version = 1.0.2 + mod_version = 1.0.0 maven_group = com.mystic archives_base_name = holographic-renders - -# Dependencies - # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api (or https://fabricmc.net/versions.html) - fabric_version=0.40.1+1.17 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..e750102 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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/holographic_renders/icon.png similarity index 100% rename from src/main/resources/assets/modid/icon.png rename to src/main/resources/assets/holographic_renders/icon.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e967005..e3288e7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -14,7 +14,7 @@ }, "license": "MIT", - "icon": "assets/modid/icon.png", + "icon": "assets/holographic_renders/icon.png", "environment": "*", "entrypoints": { @@ -30,9 +30,9 @@ ], "depends": { - "fabricloader": ">=0.11.3", + "fabricloader": ">=0.15.3", "fabric": "*", - "minecraft": "1.17.x" + "minecraft": "1.20.x" }, "suggests": { "another-mod": "*"