aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSHsuperCM <shsupercm@gmail.com>2023-03-25 09:15:11 +0300
committerSHsuperCM <shsupercm@gmail.com>2023-03-25 09:15:11 +0300
commitd7a667c8598125a0f7692414750945f36c83b651 (patch)
treeb7b9985b5f6dc90d94a9006b66c6e6075dc86eb7 /src
parent0ce49cfb37fb6e2fb254721e07044f68888f2dd6 (diff)
downloadCITResewn-d7a667c8598125a0f7692414750945f36c83b651.tar.gz
CITResewn-d7a667c8598125a0f7692414750945f36c83b651.tar.bz2
CITResewn-d7a667c8598125a0f7692414750945f36c83b651.zip
Removed usage of jankson
Diffstat (limited to 'src')
-rw-r--r--src/main/java/shcm/shsupercm/fabric/citresewn/api/CITGlobalProperties.java4
-rw-r--r--src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITContext.java4
2 files changed, 2 insertions, 6 deletions
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;