Account for no food properties on items

Signed-off-by: TheSilkMiner <thesilkminer@outlook.com>
CraftTweaker · Jul 29, 2022 · 8824f75 · 8824f75
1 parent 4aa0ded
commit 8824f75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.../src/api/java/com/blamejared/contenttweaker/core/api/zen/bracket/ReferenceExpression.java b/.../src/api/java/com/blamejared/contenttweaker/core/api/zen/bracket/ReferenceExpression.java
@@ -66,7 +66,7 @@ private List<IParsedType> generics() throws CompileException {
         final IZenClassRegistry classes = CraftTweakerAPI.getRegistry().getZenClassRegistry();
 
         final Class<?> objectType = this.objectType.type();
-        final String objectName = classes.getNameFor(loader, this.objectType.type()).orElseThrow();
+        final String objectName = classes.getNameFor(loader, objectType).orElseThrow();
 
         final String referenceName = this.buildGenericReferenceName(loader, classes, objectType);
 

diff --git a/...ava/com/blamejared/contenttweaker/vanilla/api/zen/object/property/FoodItemProperties.java b/...ava/com/blamejared/contenttweaker/vanilla/api/zen/object/property/FoodItemProperties.java
@@ -7,6 +7,8 @@
 import net.minecraft.world.food.FoodProperties;
 import org.openzen.zencode.java.ZenCodeType;
 
+import java.util.Objects;
+
 @ZenCodeType.Name(ContentTweakerVanillaConstants.VANILLA_OBJECT_PACKAGE + ".property.FoodItemProperties")
 @ZenRegister(loaders = ContentTweakerConstants.CONTENT_LOADER_ID)
 public final class FoodItemProperties extends ItemProperties {
@@ -37,6 +39,6 @@ public boolean fastFood() {
     // TODO("Effects")
 
     private FoodProperties resolveProperties() {
-        return this.resolve().getFoodProperties();
+        return Objects.requireNonNull(this.resolve().getFoodProperties(), () -> "The item " + this.reference().id() + " is not a food");
     }
 }