Remove bad usages of ClientWorld

Pepperoni-Jabroni · Jan 25, 2021 · ce3a35f · ce3a35f
1 parent ad238aa
commit ce3a35f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/pepjebs/mapatlases/recipe/MapAtlasesAddRecipe.java b/src/main/java/pepjebs/mapatlases/recipe/MapAtlasesAddRecipe.java
@@ -1,8 +1,6 @@
 package pepjebs.mapatlases.recipe;
 
 import com.google.common.primitives.Ints;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.world.ClientWorld;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -19,12 +17,16 @@
 import java.util.*;
 
 public class MapAtlasesAddRecipe extends SpecialCraftingRecipe {
+
+    private World world = null;
+
     public MapAtlasesAddRecipe(Identifier id) {
         super(id);
     }
 
     @Override
     public boolean matches(CraftingInventory inv, World world) {
+        this.world = world;
         List<ItemStack> itemStacks = MapAtlasesAccessUtils.getItemStacksFromGrid(inv);
         ItemStack atlas = MapAtlasesAccessUtils.getAtlasFromItemStacks(itemStacks);
 
@@ -52,7 +54,7 @@ public boolean matches(CraftingInventory inv, World world) {
 
     @Override
     public ItemStack craft(CraftingInventory inv) {
-        ClientWorld world = MinecraftClient.getInstance().world;
+        if (world == null) return ItemStack.EMPTY;
         List<ItemStack> itemStacks = MapAtlasesAccessUtils.getItemStacksFromGrid(inv);
         // Grab the Atlas in the Grid
         ItemStack atlas = MapAtlasesAccessUtils.getAtlasFromItemStacks(itemStacks);

diff --git a/src/main/java/pepjebs/mapatlases/utils/MapAtlasesAccessUtils.java b/src/main/java/pepjebs/mapatlases/utils/MapAtlasesAccessUtils.java
@@ -1,6 +1,5 @@
 package pepjebs.mapatlases.utils;
 
-import net.minecraft.client.world.ClientWorld;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
@@ -85,7 +84,7 @@ public static List<MapState> getMapStatesFromItemStacks(World world, List<ItemSt
                 .collect(Collectors.toList());
     }
 
-    public static Set<Integer> getMapIdsFromItemStacks(ClientWorld world, List<ItemStack> itemStacks) {
+    public static Set<Integer> getMapIdsFromItemStacks(World world, List<ItemStack> itemStacks) {
         return getMapStatesFromItemStacks(world, itemStacks).stream()
                 .map(MapAtlasesAccessUtils::getMapIntFromState).collect(Collectors.toSet());
     }