Fixes missing get calls on RegisterSupplier<Item>

Fixes #446
AntiqueAtlasTeam · Dec 4, 2022 · 6aa1010 · 6aa1010
1 parent 6bc38ec
commit 6aa1010
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/common/src/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java b/common/src/main/java/hunternif/mc/impl/atlas/client/OverlayRenderer.java
@@ -53,7 +53,7 @@ public void drawOverlay(MatrixStack matrices, VertexConsumerProvider vertexConsu
         this.player = MinecraftClient.getInstance().player;
         this.world = MinecraftClient.getInstance().world;
 
-        if (!atlas.isEmpty() && atlas.getItem() == RegistrarAntiqueAtlas.ATLAS.getOrNull()) {
+        if (!atlas.isEmpty() && atlas.getItem() == RegistrarAntiqueAtlas.ATLAS.get()) {
             int atlasID = AtlasItem.getAtlasID(atlas);
             drawMinimap(matrices, atlasID, vertexConsumer, light);
         }

diff --git a/common/src/main/java/hunternif/mc/impl/atlas/item/ItemEmptyAtlas.java b/common/src/main/java/hunternif/mc/impl/atlas/item/ItemEmptyAtlas.java
@@ -29,7 +29,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity player,
         }
 
         int atlasID = AntiqueAtlasMod.getGlobalAtlasData(world).getNextAtlasId();
-        ItemStack atlasStack = new ItemStack(RegistrarAntiqueAtlas.ATLAS.getOrNull());
+        ItemStack atlasStack = new ItemStack(RegistrarAntiqueAtlas.ATLAS.get());
 
         atlasStack.getOrCreateTag().putInt("atlasID", atlasID);
 

diff --git a/common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java b/common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCloning.java
@@ -33,13 +33,13 @@ public boolean matches(CraftingInventory inv, World world) {
             ItemStack stack = inv.getStack(j);
 
             if (!stack.isEmpty()) {
-                if (stack.getItem() == RegistrarAntiqueAtlas.ATLAS) {
+                if (stack.getItem() == RegistrarAntiqueAtlas.ATLAS.get()) {
                     if (!filledAtlas.isEmpty()) {
                         return false;
                     }
                     filledAtlas = stack;
                 } else {
-                    if (stack.getItem() != RegistrarAntiqueAtlas.EMPTY_ATLAS) {
+                    if (stack.getItem() != RegistrarAntiqueAtlas.EMPTY_ATLAS.get()) {
                         return false;
                     }
                     i++;
@@ -59,13 +59,13 @@ public ItemStack craft(CraftingInventory inv) {
             ItemStack stack = inv.getStack(j);
 
             if (!stack.isEmpty()) {
-                if (stack.getItem() == RegistrarAntiqueAtlas.ATLAS) {
+                if (stack.getItem() == RegistrarAntiqueAtlas.ATLAS.get()) {
                     if (!filledAtlas.isEmpty()) {
                         return ItemStack.EMPTY;
                     }
                     filledAtlas = stack;
                 } else {
-                    if (stack.getItem() != RegistrarAntiqueAtlas.EMPTY_ATLAS) {
+                    if (stack.getItem() != RegistrarAntiqueAtlas.EMPTY_ATLAS.get()) {
                         return ItemStack.EMPTY;
                     }
                     i++;
@@ -74,7 +74,7 @@ public ItemStack craft(CraftingInventory inv) {
         }
 
         if (!filledAtlas.isEmpty() && i >= 1) {
-            ItemStack newAtlas = new ItemStack(RegistrarAntiqueAtlas.ATLAS.getOrNull(), i + 1);
+            ItemStack newAtlas = new ItemStack(RegistrarAntiqueAtlas.ATLAS.get(), i + 1);
             newAtlas.getOrCreateTag().putInt("atlasID", AtlasItem.getAtlasID(filledAtlas));
 
             if (filledAtlas.hasCustomName()) {

diff --git a/common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java b/common/src/main/java/hunternif/mc/impl/atlas/item/RecipeAtlasCombining.java
@@ -48,7 +48,7 @@ private boolean matches(CraftingInventory inv) {
         for (int i = 0; i < inv.size(); ++i) {
             ItemStack stack = inv.getStack(i);
             if (!stack.isEmpty()) {
-                if (stack.getItem() == RegistrarAntiqueAtlas.ATLAS) {
+                if (stack.getItem() == RegistrarAntiqueAtlas.ATLAS.get()) {
                     atlasesFound++;
                 }
             }
@@ -82,7 +82,7 @@ public boolean fits(int width, int height) {
 
     @Override
     public ItemStack getOutput() {
-        return new ItemStack(RegistrarAntiqueAtlas.ATLAS.getOrNull());
+        return new ItemStack(RegistrarAntiqueAtlas.ATLAS.get());
     }
 
     @Override

diff --git a/common/src/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java b/common/src/main/java/hunternif/mc/impl/atlas/mixin/HeldItemRendererMixin.java
@@ -48,7 +48,7 @@ public abstract class HeldItemRendererMixin {
 
     @Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isEmpty()Z", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
     private void renderAtlas(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack item, float equipProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci, boolean bl, Arm arm) {
-        if (item.getItem() == RegistrarAntiqueAtlas.ATLAS.getOrNull()) {
+        if (item.getItem() == RegistrarAntiqueAtlas.ATLAS.get()) {
             if (bl && this.offHand.isEmpty()) {
                 renderAtlasInBothHands(matrices, vertexConsumers, light, pitch, equipProgress, swingProgress);
             } else {