Merge branch 'release/1.0.11'

NatoBoram · Jun 8, 2023 · 8f0df31 · 8f0df31
2 parents 15657d1 + 8c8550c
commit 8f0df31
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 46 deletions.
diff --git a/.minepkg-lock.toml b/.minepkg-lock.toml
@@ -4,41 +4,41 @@
 lockfileVersion = 1
 
 [fabric]
-  minecraft = "1.19.4"
-  fabricLoader = "0.14.17"
-  mapping = "1.19.4+build.1"
+  minecraft = "1.20"
+  fabricLoader = "0.14.21"
+  mapping = "1.20+build.1"
 
 [dependencies]
 
   [dependencies.cloth-config]
     name = "cloth-config"
-    version = "7.0.69+mpkg.1"
+    version = "10.0.96+mpkg.1"
     versionName = ""
     type = "mod"
-    ipfsHash = "QmUN6Uno6umgW8KmVZyYowhFkkAb1uwggvv3jpoZEJvEwe"
-    Sha256 = "35fe7b75fa1541832a97e3b1a62850756965bd669ec4c06aaacd6372fa5644ae"
-    url = "https://api.preview.minepkg.io/v1/releases/fabric/cloth-config@7.0.69+mpkg.1/download"
+    ipfsHash = "QmTJ3V8DBARmP9KdYSnviAF1g4E3iCosbDRft22YRBxLik"
+    Sha256 = "0d67f0004e501b9d9be1c75ef5b218d48ef8e1b0e2374310a915a826519575b9"
+    url = "https://api.preview.minepkg.io/v1/releases/fabric/cloth-config@10.0.96+mpkg.1/download"
     provider = "minepkg"
     dependent = ""
 
   [dependencies.fabric]
     name = "fabric"
-    version = "0.55.3+1.19.mpkg.1"
+    version = "0.76.0+1.19.4.mpkg.1"
     versionName = ""
     type = "mod"
-    ipfsHash = "QmQ9UmDMgnQLa8zUmXdH8N4pfGb9HPeNRw1JmFF9k5PbwF"
-    Sha256 = "25f101fd22fba2e9078e43ea0ddc3e45017d9db0aa58f857b871b973631c0a85"
-    url = "https://api.preview.minepkg.io/v1/releases/fabric/fabric@0.55.3+1.19.mpkg.1/download"
+    ipfsHash = "QmPkXR4psTFUZXWTKFhcZsZtjE1BGpB99uS3yad1zHkLMq"
+    Sha256 = "63f4afaebc91dfaa40102294b24309397c18c4c2f824920613f435d23b3b04c0"
+    url = "https://api.preview.minepkg.io/v1/releases/fabric/fabric@0.76.0+1.19.4.mpkg.1/download"
     provider = "minepkg"
     dependent = ""
 
   [dependencies.minepkg-companion]
     name = "minepkg-companion"
-    version = "0.5.1"
+    version = "0.7.0"
     versionName = ""
     type = "mod"
-    ipfsHash = "QmTEXDsrpysTEUJQRzBqMn5pZZ8Jwt8kmgrmvv4yRXmq7x"
-    Sha256 = "1184592fc170f13cce5e3b3bcae87282ed1a743b22b4e70e8f0d6beb082032db"
-    url = "https://api.preview.minepkg.io/v1/releases/fabric/minepkg-companion@0.5.1/download"
+    ipfsHash = "QmeEMaQt17m6u1ynFMKqVxa6tBx7wyHtHPrQn3g8DQ2Yww"
+    Sha256 = "e81e923c709140cdfc6f4532c9574abfedc771ca8979e71f5fa90fafc0a4d1ee"
+    url = "https://api.preview.minepkg.io/v1/releases/fabric/minepkg-companion@0.7.0/download"
     provider = "minepkg"
     dependent = ""
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/) and this
 
 ### Security
 
+## [1.0.11] - 2023-06-07
+
+- Updated to Minecraft 1.20.0
+
 ## [1.0.10] - 2023-03-19
 
 - Updated to Minecraft 1.19.4

diff --git a/README.md b/README.md
@@ -41,9 +41,9 @@ to attack entities.
 
 ## Installation
 
-[![cloth-config2](https://img.shields.io/badge/Cloth%20Config%20API-10.0.96-9cff55)](https://github.com/shedaniel/cloth-config)
-[![fabric](https://img.shields.io/badge/Fabric%20API-0.76.0-dbd0b4)](https://github.com/FabricMC/fabric)
-[![modmenu](https://img.shields.io/badge/Mod%20Menu-6.1.0--rc.4-134bff)](https://github.com/TerraformersMC/ModMenu)
+[![cloth-config2](https://img.shields.io/badge/Cloth%20Config%20API-11.0.98-9cff55)](https://github.com/shedaniel/cloth-config)
+[![fabric](https://img.shields.io/badge/Fabric%20API-0.83.0-dbd0b4)](https://github.com/FabricMC/fabric)
+[![modmenu](https://img.shields.io/badge/Mod%20Menu-7.0.0-134bff)](https://github.com/TerraformersMC/ModMenu)
 
 Downloads are available in [Releases](https://gitlab.com/NatoBoram/fabric-switcheroo/-/releases). You can also test
 development builds by downloading them form the [Pipelines](https://gitlab.com/NatoBoram/fabric-switcheroo/-/pipelines).

diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,16 @@
 plugins {
-	id 'fabric-loom' version '1.1-SNAPSHOT'
+	id 'fabric-loom' version '1.2-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
 archivesBaseName = project.archives_base_name
 version = "${project.mod_version}+${project.minecraft_version}"
 group = project.maven_group
 
+base {
+	archivesName = project.archives_base_name
+}
+
 repositories {
 	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because
@@ -71,6 +72,9 @@ java {
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {

diff --git a/gradle.properties b/gradle.properties
@@ -4,18 +4,18 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.1
-loader_version=0.14.17
+minecraft_version=1.20
+yarn_mappings=1.20+build.1
+loader_version=0.14.21
 
 #Fabric api
-fabric_version=0.76.0+1.19.4
+fabric_version=0.83.0+1.20
 
 # Mod Properties
-mod_version=1.0.10
+mod_version=1.0.11
 maven_group=com.natoboram
 archives_base_name=switcheroo
 
 # Dependencies
-clothconfig_version=10.0.96
-modmenu_version=6.1.0-rc.4
+clothconfig_version=11.0.98
+modmenu_version=7.0.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

diff --git a/minepkg.toml b/minepkg.toml
@@ -6,7 +6,7 @@ manifestVersion = 0
 type = "mod"
 name = "switcheroo"
 description = "Switch your currently held item for an effective item when clicking on a block."
-version = "1.0.10"
+version = "1.0.11"
 platform = "fabric"
 license = "GPL-3.0-or-later"
 source = "https://gitlab.com/NatoBoram/fabric-switcheroo"
@@ -15,12 +15,13 @@ author = "Nato Boram"
 
 # These are global requirements
 [requirements]
-minecraft = ">=1.19.4"
-fabricLoader = ">=0.14.17"
+minecraft = ">=1.20"
+fabricLoader = ">=0.14.21"
 
 [dependencies]
-cloth-config = ">=10.0.96+mpkg.1"
-fabric = ">=0.76.0+1.19.4"
+cloth-config = ">=11.0.98+mpkg.1"
+fabric = ">=0.83.0+1.20"
+modmenu = ">=7.0.0+mpkg.1"
 
 [dev]
 buildCommand = "./gradlew build"
diff --git a/scripts/clean.sh b/scripts/clean.sh
@@ -2,4 +2,4 @@
 
 rm -rf .classpath .factorypath .gradle .project .settings .vscode/launch.json bin build run switcheroo_client.launch switcheroo_server.launch
 
-gradle clean cleanEclipse downloadAssets genSources eclipse vscode
+./gradlew clean cleanEclipse downloadAssets genSources eclipse vscode
diff --git a/src/main/java/com/natoboram/switcheroo/SwitcherooConfig.java b/src/main/java/com/natoboram/switcheroo/SwitcherooConfig.java
@@ -12,7 +12,7 @@ public static class Blacklist {
 		public String blocks = "budding_amethyst farmland";
 
 		@ConfigEntry.Gui.Tooltip()
-		public String mobs = "axolotl bat cat donkey fox horse mule ocelot parrot skeleton_horse snow_golem strider villager wandering_trader";
+		public String mobs = "allay axolotl bat cat donkey fox horse mule ocelot parrot skeleton_horse sniffer snow_golem strider villager wandering_trader";
 	}
 
 	public static class Prefer {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
 	"schemaVersion": 1,
 	"id": "switcheroo",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"name": "Switcheroo",
 	"description": "Switch your currently held item for an effective item when clicking on a block.",
 	"authors": ["Nato Boram"],
@@ -20,13 +20,13 @@
 	},
 	"mixins": [],
 	"depends": {
-		"cloth-config2": ">=10.0.96",
-		"fabric": ">=0.76.0+1.19.4",
-		"fabricloader": ">=0.14.17",
+		"cloth-config2": ">=11.0.98",
+		"fabric": ">=0.83.0+1.20",
+		"fabricloader": ">=0.14.21",
 		"java": ">=17",
-		"minecraft": ">=1.19.4"
+		"minecraft": ">=1.20"
 	},
 	"suggests": {
-		"modmenu": ">=6.1.0-rc.4"
+		"modmenu": ">=7.0.0"
 	}
 }