Removed usage of jankson

4 files changed, 3 insertions, 9 deletions

diff --git a/build.gradle b/build.gradle
index 6cc73e1..1d89958 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,6 @@ allprojects {
         modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api}"
         //fletchingTable.fungible project.fungible
 
-        modCompileOnly "blue.endless:jankson:1.2.2"
         modCompileOnly fabricApi.module("fabric-api-base", "${project.fabric_api}")
         modCompileOnly fabricApi.module("fabric-resource-loader-v0", "${project.fabric_api}")
         modCompileOnly fabricApi.module("fabric-command-api-v2", "${project.fabric_api}")
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 329f117..1c56b44 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
@@ -21,7 +21,6 @@ import shcm.shsupercm.fabric.citresewn.pack.format.PropertyKey;
 import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
 import shcm.shsupercm.util.logic.Loops;
 
-import blue.endless.jankson.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.function.Consumer;
@@ -151,7 +150,7 @@ public class TypeEnchantment extends CITType {
         }
 
         @Override
-        public void globalProperty(String key, @Nullable PropertyValue value) throws Exception {
+        public void globalProperty(String key, PropertyValue value) throws Exception {
             switch (key) {
                 case "useGlint" -> {
                     globalUseGlint = value == null ? true : Boolean.parseBoolean(value.value());
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 6a6ec22..824c481 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java
@@ -2,8 +2,6 @@ package shcm.shsupercm.fabric.citresewn.api;
 
 import shcm.shsupercm.fabric.citresewn.pack.format.PropertyValue;
 
-import blue.endless.jankson.annotation.Nullable;
-
 /**
  * @see #globalProperty(String, PropertyValue)
  */
@@ -22,5 +20,5 @@ public interface CITGlobalProperties {
 	 * @param key name of the property key stripped of its modid
 	 * @param value the value it's been set to or null if resetting
      */
-    void globalProperty(String key, @Nullable PropertyValue value) throws Exception;
+    void globalProperty(String key, PropertyValue value) throws Exception;
 }
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 0a44915..b2df80a 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,6 @@ import net.minecraft.nbt.NbtElement;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 
-import blue.endless.jankson.annotation.Nullable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -33,7 +32,6 @@ public class CITContext {
     /**
      * The item's associated living entity if present. (null if not relevant)
      */
-    @Nullable
     public final LivingEntity entity;
 
     /**
@@ -42,7 +40,7 @@ public class CITContext {
      */
     private Map<Identifier, Integer> enchantments = null;
 
-    public CITContext(ItemStack stack, @Nullable World world, @Nullable LivingEntity entity) {
+    public CITContext(ItemStack stack, World world, LivingEntity entity) {
         this.stack = stack;
         this.world = world == null ? MinecraftClient.getInstance().world : world;
         this.entity = entity;