Update for 1.21

AlurienFlame · Jul 25, 2024 · ea2a142 · ea2a142
1 parent 00d8224
commit ea2a142
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
-# gradle
+remappedSrc/
 
+# gradle
 .gradle/
 build/
 out/

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -27,16 +27,16 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
-  sourceCompatibility = JavaVersion.VERSION_17
-  targetCompatibility = JavaVersion.VERSION_17
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

diff --git a/gradle.properties b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.20
-yarn_mappings=1.20+build.1
-loader_version=0.14.21
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
+loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.0.8
+mod_version=1.0.9
 maven_group=net.torchkey
 archives_base_name=torchkey
 
 # Dependencies
-fabric_version=0.83.0+1.20
+fabric_version=0.100.7+1.21
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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/net/torchkey/Torchkey.java b/src/main/java/net/torchkey/Torchkey.java
@@ -40,8 +40,8 @@ public void onInitializeClient() {
 
 	// TODO: Find a more reliable/extensible way of detecting item type
 	private void placeTorch(MinecraftClient client) {
-		PlayerInventory inv = client.player.getInventory();
-
+        PlayerInventory inv = client.player.getInventory();
+        
 		// Find target
 		HitResult target = client.crosshairTarget;
 		if (target.getType() != HitResult.Type.BLOCK) {

diff --git a/src/main/java/net/torchkey/TorchkeyConfig.java b/src/main/java/net/torchkey/TorchkeyConfig.java
@@ -21,7 +21,7 @@ public class TorchkeyConfig {
   static Path configDir = FabricLoader.getInstance().getConfigDir();
   static Path configPath = configDir.resolve(configFilename);
   static File configFile = configPath.toFile();
-  static String defaultConfig = "{\"validTorches\": [\"torch\", \"redstone_torch\", \"stone_torch\", \"soul_torch\"]}";
+  static String defaultConfig = "{\"validTorches\": [\"minecraft:torch\", \"minecraft:redstone_torch\", \"minecraft:stone_torch\", \"minecraft:soul_torch\"]}";
 
   public TorchkeyConfig() {
     if (!Files.exists(configPath)) {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "torchkey",
-  "version": "1.0.8",
+  "version": "1.0.9",
 
   "name": "Torchkey",
   "description": "Adds a hotkey to place a torch from your hotbar.",
@@ -27,9 +27,9 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.11.3",
+    "fabricloader": ">=0.15.11",
     "fabric": "*",
-    "minecraft": "1.20.*",
+    "minecraft": ">=1.21",
     "java": ">=17"
   },
   "suggests": {