From 5c54abb1775be282d8c94e43fe0292b2bf06038d Mon Sep 17 00:00:00 2001 From: James Mason Date: Sat, 29 Jul 2023 11:03:12 +0100 Subject: [PATCH 1/4] Updated Gradle --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 4113dac..3d03d4e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.12.54' + id 'fabric-loom' version '1.2-SNAPSHOT' id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.1.0' } @@ -84,7 +84,7 @@ tasks.withType(JavaCompile) { // if it is present. // If you remove this task, sources will not be generated. task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" + archiveClassifier = "sources" from sourceSets.main.allSource } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..84a0b92 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..c53aefa 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # From 4ff15892363d3dc2839387eecf6176d7e6124204 Mon Sep 17 00:00:00 2001 From: James Mason Date: Sat, 29 Jul 2023 12:17:43 +0100 Subject: [PATCH 2/4] Port to 1.20.1 --- build.gradle | 4 +- gradle.properties | 10 ++-- .../minegasm/mixin/ClientWorldMixins.java | 4 +- src/main/resources/fabric.mod.json | 48 +++++++++---------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 3d03d4e..720a524 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.3-SNAPSHOT' id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.1.0' } @@ -29,7 +29,7 @@ dependencies { mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "com.terraformersmc:modmenu:4.0.6" + modImplementation "com.terraformersmc:modmenu:7.2.1" modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } diff --git a/gradle.properties b/gradle.properties index a2b14fa..6eed890 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ org.gradle.jvmargs = -Xmx1G #Fabric properties -minecraft_version = 1.19.2 -yarn_mappings = 1.19.2+build.4 -loader_version = 0.14.9 -fabric_version = 0.60.0+1.19.2 +minecraft_version = 1.20.1 +yarn_mappings = 1.20.1+build.10 +loader_version = 0.14.21 +fabric_version = 0.86.1+1.20.1 #Mod properties mod_version = 2.1.1 @@ -12,4 +12,4 @@ maven_group = me.vinceh121.minegasm archives_base_name = minegasm -cloth_config_version= 8.0.75 +cloth_config_version= 11.1.106 diff --git a/src/main/java/me/vinceh121/minegasm/mixin/ClientWorldMixins.java b/src/main/java/me/vinceh121/minegasm/mixin/ClientWorldMixins.java index 1e75348..7223c78 100644 --- a/src/main/java/me/vinceh121/minegasm/mixin/ClientWorldMixins.java +++ b/src/main/java/me/vinceh121/minegasm/mixin/ClientWorldMixins.java @@ -16,8 +16,8 @@ import net.minecraft.client.world.ClientWorld.Properties; import net.minecraft.entity.Entity; import net.minecraft.util.profiler.Profiler; -import net.minecraft.util.registry.RegistryEntry; -import net.minecraft.util.registry.RegistryKey; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.RegistryKey; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 424c8c7..253546f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,30 +1,30 @@ { - "schemaVersion" : 1, - "id" : "minegasm", - "version" : "2.1.1", - "name" : "Minegasm", - "description" : "minegasm-fabric = Fabric + teledildonics", - "authors" : [ "RainbowVille", "vinceh121" ], - "contributors" : [ ], - "contact" : { - "homepage" : "https://github.com/vinceh121/minegasm-fabric", - "sources" : "https://github.com/vinceh121/minegasm-fabric" + "schemaVersion": 1, + "id": "minegasm", + "version": "2.1.1", + "name": "Minegasm", + "description": "minegasm-fabric = Fabric + teledildonics", + "authors": ["RainbowVille", "vinceh121"], + "contributors": [], + "contact": { + "homepage": "https://github.com/vinceh121/minegasm-fabric", + "sources": "https://github.com/vinceh121/minegasm-fabric" }, - "license" : "AGPL-3.0", - "icon" : "assets/minegasm/icon.png", - "environment" : "*", - "entrypoints" : { - "main" : [ "com.therainbowville.minegasm.common.Minegasm" ], - "client" : [ ], - "server" : [ ], - "modmenu": [ "com.therainbowville.minegasm.config.MinegasmModMenu" ] + "license": "AGPL-3.0", + "icon": "assets/minegasm/icon.png", + "environment": "*", + "entrypoints": { + "main": ["com.therainbowville.minegasm.common.Minegasm"], + "client": [], + "server": [], + "modmenu": ["com.therainbowville.minegasm.config.MinegasmModMenu"] }, - "mixins" : [ "minegasm.mixins.json" ], - "depends" : { - "fabricloader" : ">=0.14.9", + "mixins": ["minegasm.mixins.json"], + "depends": { + "fabricloader": ">=0.14.21", "fabric": "*", - "minecraft": "1.19.2", + "minecraft": "1.20.1", "java": ">=17", - "modmenu": "4.x.x" + "modmenu": "7.x.x" } -} \ No newline at end of file +} From 40f1c22877c3f35c6ee5c6aea473c4da3fcf1de1 Mon Sep 17 00:00:00 2001 From: vinceh121 Date: Wed, 2 Aug 2023 06:28:12 +0200 Subject: [PATCH 3/4] chore: upgrade fabric-loom --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 720a524..0a9b66a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.3.8' id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.1.0' } From 6e0cd635c0678a5573b147adabe418800786e36e Mon Sep 17 00:00:00 2001 From: vinceh121 Date: Wed, 2 Aug 2023 06:29:03 +0200 Subject: [PATCH 4/4] chore: dos2unix line endings --- gradle.properties | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6eed890..f21ce81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,14 @@ -org.gradle.jvmargs = -Xmx1G - -#Fabric properties -minecraft_version = 1.20.1 -yarn_mappings = 1.20.1+build.10 -loader_version = 0.14.21 -fabric_version = 0.86.1+1.20.1 - -#Mod properties -mod_version = 2.1.1 -maven_group = me.vinceh121.minegasm -archives_base_name = minegasm - - -cloth_config_version= 11.1.106 +org.gradle.jvmargs = -Xmx1G + +#Fabric properties +minecraft_version = 1.20.1 +yarn_mappings = 1.20.1+build.10 +loader_version = 0.14.21 +fabric_version = 0.86.1+1.20.1 + +#Mod properties +mod_version = 2.1.1 +maven_group = me.vinceh121.minegasm +archives_base_name = minegasm + +cloth_config_version= 11.1.106