packetadder wip

3 files changed, 20 insertions, 21 deletions

diff --git a/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java b/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java
index 1c37ed292..dec94db05 100755
--- a/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java
+++ b/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java
@@ -1,14 +1,13 @@
 package me.shedaniel.plugin.crafting;
 
 import me.shedaniel.api.IDisplayCategory;
-import me.shedaniel.gui.widget.REISlot;
 import me.shedaniel.gui.widget.Control;
+import me.shedaniel.gui.widget.REISlot;
 import me.shedaniel.gui.widget.WidgetArrow;
-import net.minecraft.client.MainWindow;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.Window;
 import net.minecraft.item.ItemStack;
 
 import java.util.ArrayList;
@@ -16,7 +15,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 public class VanillaCraftingCategory implements IDisplayCategory<VanillaCraftingRecipe> {
-    MainWindow mainWindow = Minecraft.getInstance().mainWindow;
+    Window mainWindow = MinecraftClient.getInstance().window;
     private List<VanillaCraftingRecipe> recipes;
     
     @Override
@@ -26,7 +25,7 @@ public class VanillaCraftingCategory implements IDisplayCategory<VanillaCrafting
     
     @Override
     public String getDisplayName() {
-        return I18n.format("category.rei.crafting");
+        return I18n.translate("category.rei.crafting");
     }
     
     @Override
@@ -109,7 +108,7 @@ public class VanillaCraftingCategory implements IDisplayCategory<VanillaCrafting
     
     @Override
     public ItemStack getCategoryIcon() {
-        return new ItemStack(Blocks.CRAFTING_TABLE.asItem());
+        return new ItemStack(Blocks.CRAFTING_TABLE.getItem());
     }
     
 }
diff --git a/src/main/java/me/shedaniel/plugin/crafting/VanillaShapedCraftingRecipe.java b/src/main/java/me/shedaniel/plugin/crafting/VanillaShapedCraftingRecipe.java
index 1c537b2a7..3f830f381 100755
--- a/src/main/java/me/shedaniel/plugin/crafting/VanillaShapedCraftingRecipe.java
+++ b/src/main/java/me/shedaniel/plugin/crafting/VanillaShapedCraftingRecipe.java
@@ -1,8 +1,8 @@
 package me.shedaniel.plugin.crafting;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.item.crafting.ShapedRecipe;
+import net.minecraft.recipe.Ingredient;
+import net.minecraft.recipe.crafting.ShapedRecipe;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -34,7 +34,7 @@ public class VanillaShapedCraftingRecipe extends VanillaCraftingRecipe {
     @Override
     public List<ItemStack> getOutput() {
         List<ItemStack> output = new LinkedList<>();
-        output.add(recipe.getRecipeOutput());
+        output.add(recipe.getOutput());
         return output;
     }
     
@@ -42,9 +42,9 @@ public class VanillaShapedCraftingRecipe extends VanillaCraftingRecipe {
     public List<List<ItemStack>> getInput() {
         List<List<ItemStack>> input = new LinkedList<>();
         int count = 0;
-        for(Ingredient ingredient : recipe.getIngredients()) {
+        for(Ingredient ingredient : recipe.getPreviewInputs()) {
             List<ItemStack> ingList = new LinkedList<>();
-            for(ItemStack matchingStack : ingredient.getMatchingStacks()) {
+            for(ItemStack matchingStack : ingredient.getStackArray()) {
                 ingList.add(matchingStack);
             }
             input.add(ingList);
diff --git a/src/main/java/me/shedaniel/plugin/crafting/VanillaShapelessCraftingRecipe.java b/src/main/java/me/shedaniel/plugin/crafting/VanillaShapelessCraftingRecipe.java
index 034ac77b0..7b04e9901 100755
--- a/src/main/java/me/shedaniel/plugin/crafting/VanillaShapelessCraftingRecipe.java
+++ b/src/main/java/me/shedaniel/plugin/crafting/VanillaShapelessCraftingRecipe.java
@@ -1,8 +1,8 @@
 package me.shedaniel.plugin.crafting;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.item.crafting.ShapelessRecipe;
+import net.minecraft.recipe.Ingredient;
+import net.minecraft.recipe.crafting.ShapelessRecipe;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -24,16 +24,16 @@ public class VanillaShapelessCraftingRecipe extends VanillaCraftingRecipe {
     @Override
     public List<ItemStack> getOutput() {
         List<ItemStack> output = new LinkedList<>();
-        output.add(recipe.getRecipeOutput());
+        output.add(recipe.getOutput());
         return output;
     }
     
     @Override
     public List<List<ItemStack>> getInput() {
         List<List<ItemStack>> input = new LinkedList<>();
-        for(Ingredient ingredient : recipe.getIngredients()) {
+        for(Ingredient ingredient : recipe.getPreviewInputs()) {
             List<ItemStack> ingList = new LinkedList<>();
-            for(ItemStack matchingStack : ingredient.getMatchingStacks()) {
+            for(ItemStack matchingStack : ingredient.getStackArray()) {
                 ingList.add(matchingStack);
             }
             input.add(ingList);
@@ -43,14 +43,14 @@ public class VanillaShapelessCraftingRecipe extends VanillaCraftingRecipe {
     
     @Override
     public int getWidth() {
-        if (recipe.getIngredients().size() > 4)
+        if (recipe.getPreviewInputs().size() > 4)
             return 3;
         return 2;
     }
     
     @Override
     public int getHeight() {
-        if (recipe.getIngredients().size() > 4)
+        if (recipe.getPreviewInputs().size() > 4)
             return 3;
         return 2;
     }