From c945843038c0cceff79b613d70f644b91ff610dc Mon Sep 17 00:00:00 2001
From: Michael Hillcox <michaelhillcox@gmail.com>
Date: Sun, 20 Sep 2020 11:14:48 +0100
Subject: [PATCH] Moved Recipes to the common package...

---
 .../recipes/AtomicReconstructorBlockRecipe.java       |  2 +-
 .../AtomicReconstructorBlockRecipeFactory.java        | 11 ++++++-----
 .../recipes/AtomicReconstructorItemRecipe.java        |  2 +-
 .../recipes/AtomicReconstructorItemRecipeFactory.java | 11 ++++++-----
 .../{ => common}/recipes/CoffeeMachineIngredient.java |  2 +-
 .../recipes/CoffeeMachineIngredientFactory.java       |  2 +-
 .../{ => common}/recipes/IDummyRecipe.java            |  2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)
 rename src/main/java/de/ellpeck/actuallyadditions/{ => common}/recipes/AtomicReconstructorBlockRecipe.java (97%)
 rename src/main/java/de/ellpeck/actuallyadditions/{ => common}/recipes/AtomicReconstructorBlockRecipeFactory.java (91%)
 rename src/main/java/de/ellpeck/actuallyadditions/{ => common}/recipes/AtomicReconstructorItemRecipe.java (97%)
 rename src/main/java/de/ellpeck/actuallyadditions/{ => common}/recipes/AtomicReconstructorItemRecipeFactory.java (89%)
 rename src/main/java/de/ellpeck/actuallyadditions/{ => common}/recipes/CoffeeMachineIngredient.java (96%)
 rename src/main/java/de/ellpeck/actuallyadditions/{ => common}/recipes/CoffeeMachineIngredientFactory.java (98%)
 rename src/main/java/de/ellpeck/actuallyadditions/{ => common}/recipes/IDummyRecipe.java (95%)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorBlockRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorBlockRecipe.java
similarity index 97%
rename from src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorBlockRecipe.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorBlockRecipe.java
index 81b0bd51b..babad16c0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorBlockRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorBlockRecipe.java
@@ -1,4 +1,4 @@
-package de.ellpeck.actuallyadditions.recipes;
+package de.ellpeck.actuallyadditions.common.recipes;
 
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import net.minecraft.block.BlockState;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorBlockRecipeFactory.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorBlockRecipeFactory.java
similarity index 91%
rename from src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorBlockRecipeFactory.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorBlockRecipeFactory.java
index 0fcfb77d5..569e43e38 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorBlockRecipeFactory.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorBlockRecipeFactory.java
@@ -1,9 +1,10 @@
-package de.ellpeck.actuallyadditions.recipes;
+package de.ellpeck.actuallyadditions.common.recipes;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import com.mojang.datafixers.Dynamic;
 import com.mojang.datafixers.types.JsonOps;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.common.items.lens.Lenses;
@@ -33,8 +34,8 @@ public class AtomicReconstructorBlockRecipeFactory extends ForgeRegistryEntry<IR
         
         if(json.has("lens") && json.get("lens").isJsonObject()){
             ResourceLocation lensId = new ResourceLocation(json.get("lens").getAsString());
-            if(ActuallyAdditions.LENS_REGISTRY.containsKey(lensId)){
-                lens = ActuallyAdditions.LENS_REGISTRY.getValue(lensId);
+            if(ActuallyAdditionsAPI.LENS_REGISTRY.containsKey(lensId)){
+                lens = ActuallyAdditionsAPI.LENS_REGISTRY.getValue(lensId);
             } else {
                 throw new JsonSyntaxException(String.format("Lens type is given, but no lens could be found with id '%s'!", lensId));
             }
@@ -68,8 +69,8 @@ public class AtomicReconstructorBlockRecipeFactory extends ForgeRegistryEntry<IR
         int energyConsumption = buffer.readVarInt();
     
         Lens lens;
-        if(ActuallyAdditions.LENS_REGISTRY.containsKey(lensId)){
-            lens = ActuallyAdditions.LENS_REGISTRY.getValue(lensId);
+        if(ActuallyAdditionsAPI.LENS_REGISTRY.containsKey(lensId)){
+            lens = ActuallyAdditionsAPI.LENS_REGISTRY.getValue(lensId);
         } else {
             System.out.println(String.format("Lens is not possible to get while reading packet! '%s'", lensId));
             return null;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorItemRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorItemRecipe.java
similarity index 97%
rename from src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorItemRecipe.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorItemRecipe.java
index 440f35b2d..67626bf61 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorItemRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorItemRecipe.java
@@ -1,4 +1,4 @@
-package de.ellpeck.actuallyadditions.recipes;
+package de.ellpeck.actuallyadditions.common.recipes;
 
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorItemRecipeFactory.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorItemRecipeFactory.java
similarity index 89%
rename from src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorItemRecipeFactory.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorItemRecipeFactory.java
index 306f6e0e3..77efd5e25 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/recipes/AtomicReconstructorItemRecipeFactory.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/AtomicReconstructorItemRecipeFactory.java
@@ -1,7 +1,8 @@
-package de.ellpeck.actuallyadditions.recipes;
+package de.ellpeck.actuallyadditions.common.recipes;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.common.items.lens.Lenses;
@@ -30,8 +31,8 @@ public class AtomicReconstructorItemRecipeFactory extends ForgeRegistryEntry<IRe
         
         if(json.has("lens") && json.get("lens").isJsonObject()){
             ResourceLocation lensId = new ResourceLocation(json.get("lens").getAsString());
-            if(ActuallyAdditions.LENS_REGISTRY.containsKey(lensId)){
-                lens = ActuallyAdditions.LENS_REGISTRY.getValue(lensId);
+            if(ActuallyAdditionsAPI.LENS_REGISTRY.containsKey(lensId)){
+                lens = ActuallyAdditionsAPI.LENS_REGISTRY.getValue(lensId);
             } else {
                 throw new JsonSyntaxException(String.format("Lens type is given, but no lens could be found with id '%s'!", lensId));
             }
@@ -65,8 +66,8 @@ public class AtomicReconstructorItemRecipeFactory extends ForgeRegistryEntry<IRe
         int energyConsumption = buffer.readVarInt();
         
         Lens lens;
-        if(ActuallyAdditions.LENS_REGISTRY.containsKey(lensId)){
-            lens = ActuallyAdditions.LENS_REGISTRY.getValue(lensId);
+        if(ActuallyAdditionsAPI.LENS_REGISTRY.containsKey(lensId)){
+            lens = ActuallyAdditionsAPI.LENS_REGISTRY.getValue(lensId);
         } else {
             System.out.println(String.format("Lens is not possible to get while reading packet! '%s'", lensId));
             return null;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipes/CoffeeMachineIngredient.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/CoffeeMachineIngredient.java
similarity index 96%
rename from src/main/java/de/ellpeck/actuallyadditions/recipes/CoffeeMachineIngredient.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/recipes/CoffeeMachineIngredient.java
index 3d497e351..fdc02d823 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/recipes/CoffeeMachineIngredient.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/CoffeeMachineIngredient.java
@@ -1,4 +1,4 @@
-package de.ellpeck.actuallyadditions.recipes;
+package de.ellpeck.actuallyadditions.common.recipes;
 
 import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.item.crafting.IRecipeType;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipes/CoffeeMachineIngredientFactory.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/CoffeeMachineIngredientFactory.java
similarity index 98%
rename from src/main/java/de/ellpeck/actuallyadditions/recipes/CoffeeMachineIngredientFactory.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/recipes/CoffeeMachineIngredientFactory.java
index 15c13a7ba..dce89b22c 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/recipes/CoffeeMachineIngredientFactory.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/CoffeeMachineIngredientFactory.java
@@ -1,4 +1,4 @@
-package de.ellpeck.actuallyadditions.recipes;
+package de.ellpeck.actuallyadditions.common.recipes;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/de/ellpeck/actuallyadditions/recipes/IDummyRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/IDummyRecipe.java
similarity index 95%
rename from src/main/java/de/ellpeck/actuallyadditions/recipes/IDummyRecipe.java
rename to src/main/java/de/ellpeck/actuallyadditions/common/recipes/IDummyRecipe.java
index cee64c989..e480a93b2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/recipes/IDummyRecipe.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/recipes/IDummyRecipe.java
@@ -1,4 +1,4 @@
-package de.ellpeck.actuallyadditions.recipes;
+package de.ellpeck.actuallyadditions.common.recipes;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;