diff options
Diffstat (limited to 'src')
4 files changed, 4 insertions, 7 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; diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITRegistry.java b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITRegistry.java index f9512ee..2037e5e 100644 --- a/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITRegistry.java +++ b/src/main/java/shcm/shsupercm/fabric/citresewn/cit/CITRegistry.java @@ -1,6 +1,7 @@ package shcm.shsupercm.fabric.citresewn.cit; import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.entrypoint.EntrypointContainer; import net.minecraft.util.Identifier; import shcm.shsupercm.fabric.citresewn.api.CITConditionContainer; import shcm.shsupercm.fabric.citresewn.api.CITTypeContainer; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 66bd512..96d8759 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ "depends": { "fabric": "*", "fabricloader": "*", - "minecraft": "~1.19.3" + "minecraft": "~1.19.4" }, "recommends": { "modmenu": "*", |