From d7a667c8598125a0f7692414750945f36c83b651 Mon Sep 17 00:00:00 2001
From: SHsuperCM <shsupercm@gmail.com>
Date: Sat, 25 Mar 2023 09:15:11 +0300
Subject: Removed usage of jankson
---
.../java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java | 4 +---
src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITContext.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
(limited to 'src/main/java')
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;
--
cgit