From 0177865737da4067927851ef5b76407388b7e869 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 29 Jan 2023 11:00:12 +0000
Subject: Update fabric/forge versions

---
 spark-fabric/build.gradle                                         | 8 ++++----
 .../main/java/me/lucko/spark/fabric/FabricClassSourceLookup.java  | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'spark-fabric')

diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
index 8b6d030..0421f68 100644
--- a/spark-fabric/build.gradle
+++ b/spark-fabric/build.gradle
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'fabric-loom' version '0.12.+'
+    id 'fabric-loom' version '1.1-SNAPSHOT'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
@@ -29,8 +29,8 @@ configurations {
 dependencies {
     // https://modmuss50.me/fabric.html
     minecraft 'com.mojang:minecraft:1.19.3'
-    mappings 'net.fabricmc:yarn:1.19.3+build.2:v2'
-    modImplementation 'net.fabricmc:fabric-loader:0.14.11'
+    mappings 'net.fabricmc:yarn:1.19.3+build.5:v2'
+    modImplementation 'net.fabricmc:fabric-loader:0.14.13'
 
     Set<String> apiModules = [
             "fabric-api-base",
@@ -40,7 +40,7 @@ dependencies {
 
     // Add each module as a dependency
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.68.1+1.19.3'))
+        modImplementation(fabricApi.module(it, '0.73.0+1.19.3'))
     }
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.1-SNAPSHOT'))
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClassSourceLookup.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClassSourceLookup.java
index 51834fc..0ad05b9 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClassSourceLookup.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClassSourceLookup.java
@@ -31,7 +31,6 @@ import me.lucko.spark.fabric.smap.SourceMapProvider;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.objectweb.asm.Type;
 import org.spongepowered.asm.mixin.FabricUtil;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfig;
@@ -73,7 +72,7 @@ public class FabricClassSourceLookup extends ClassSourceLookup.ByCodeSource {
     }
 
     @Override
-    public @Nullable String identify(MethodCall methodCall) throws Exception {
+    public String identify(MethodCall methodCall) throws Exception {
         String className = methodCall.getClassName();
         String methodName = methodCall.getMethodName();
         String methodDesc = methodCall.getMethodDescriptor();
@@ -99,7 +98,7 @@ public class FabricClassSourceLookup extends ClassSourceLookup.ByCodeSource {
     }
 
     @Override
-    public @Nullable String identify(MethodCallByLine methodCall) throws Exception {
+    public String identify(MethodCallByLine methodCall) throws Exception {
         String className = methodCall.getClassName();
         String methodName = methodCall.getMethodName();
         int lineNumber = methodCall.getLineNumber();
-- 
cgit