From 8f3f1ac7189b79e147f6fb367ad9b3d87e6918d2 Mon Sep 17 00:00:00 2001
From: SHsuperCM <shsupercm@gmail.com>
Date: Mon, 2 Jan 2023 14:48:38 +0200
Subject: Updated loom to 1.0

---
 build.gradle                                                        | 6 +-----
 .../fabric/citresewn/defaults/cit/types/TypeEnchantment.java        | 2 +-
 .../shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java    | 2 +-
 src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITContext.java   | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 510e698..b64bf84 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 import java.nio.file.Files
 
 plugins {
-    id 'fabric-loom' version '0.12-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.0-SNAPSHOT' apply false
     id 'io.shcm.shsupercm.fabric.fletchingtable' version '1.5' apply false
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
@@ -67,10 +67,6 @@ allprojects {
             rename { "${it}_${project.archivesBaseName}" }
         }
     }
-
-    loom {
-        shareRemapCaches = true
-    }
 }
 
 apply plugin: 'com.modrinth.minotaur'
diff --git a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java
index 8b49e6a..6e20ad8 100644
--- a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java
+++ b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/types/TypeEnchantment.java
@@ -22,7 +22,7 @@ import shcm.shsupercm.fabric.citresewn.pack.format.PropertyKey;
 import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
 import shcm.shsupercm.util.logic.Loops;
 
-import javax.annotation.Nullable;
+import blue.endless.jankson.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.function.Consumer;
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java
index 05495af..6a6ec22 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java
@@ -2,7 +2,7 @@ package shcm.shsupercm.fabric.citresewn.api;
 
 import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
 
-import javax.annotation.Nullable;
+import blue.endless.jankson.annotation.Nullable;
 
 /**
  * @see #globalProperty(String, PropertyValue)
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITContext.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITContext.java
index cfc10f8..0a44915 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITContext.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITContext.java
@@ -11,7 +11,7 @@ import net.minecraft.nbt.NbtElement;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 
-import javax.annotation.Nullable;
+import blue.endless.jankson.annotation.Nullable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
-- 
cgit