Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafael Orman authored Dec 23, 2018
1 parent 10f0bab commit 220bd71
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 32 deletions.
5 changes: 2 additions & 3 deletions src/main/java/com/theundertaker11/moreavaritia/RecipeUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import morph.avaritia.Avaritia;
import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.AvaritiaRecipeManager;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import morph.avaritia.recipe.extreme.ExtremeShapedRecipe;
import morph.avaritia.recipe.extreme.IExtremeRecipe;
import net.minecraft.item.ItemStack;
Expand All @@ -27,8 +26,8 @@ public static void addRecipe(ItemStack result, Object...objects) {
}

public static void addCatalystInput(ItemStack in) {
ResourceLocation loc = new ResourceLocation(Avaritia.MOD_ID, "infinity_catalyst");
IExtremeRecipe recipe = ExtremeCraftingManager.REGISTRY.getObject(loc);
ResourceLocation loc = new ResourceLocation(Avaritia.MOD_ID, "items/infinity_catalyst");
IExtremeRecipe recipe = AvaritiaRecipeManager.EXTREME_RECIPES.get(loc);

if(recipe != null)
recipe.getIngredients().add(CraftingHelper.getIngredient(in));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/theundertaker11/moreavaritia/Reference.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

public class Reference {
public static final String MODID = "moreavaritia";
public static final String VERSION = "2.3";
public static final String VERSION = "2.4";
public static final String NAME = "More Avaritia";
public static final String MCVersions = "1.10.2";
public static final String MCVersions = "1.12.2";
public static final String CLIENTPROXY = "com.theundertaker11.moreavaritia.proxy.ClientProxy";
public static final String SERVERPROXY = "com.theundertaker11.moreavaritia.proxy.CommonProxy";

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/appliedenergistics/AERecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.theundertaker11.moreavaritia.Reference;

import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/botania/BotaniaRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.theundertaker11.moreavaritia.RecipeUtil;
import com.theundertaker11.moreavaritia.Reference;

import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.Optional;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/cyberware/CyberwearRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.theundertaker11.moreavaritia.Reference;

import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;
Expand Down
1 change: 0 additions & 1 deletion ...a/com/theundertaker11/moreavaritia/compat/draconicevolution/DraconicEvolutionRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import morph.avaritia.init.ModBlocks;
import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.Optional;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/enderio/EnderIORecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import morph.avaritia.init.ModBlocks;
import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/extrautils2/ExtraUtilitiesRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import morph.avaritia.init.ModBlocks;
import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/psi/PSIRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.theundertaker11.moreavaritia.Reference;

import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/quantumflux/QuantumFluxRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import morph.avaritia.init.ModBlocks;
import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;

Expand Down
17 changes: 1 addition & 16 deletions ...in/java/com/theundertaker11/moreavaritia/compat/refinedstorage/RefinedStorageRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,12 @@

import morph.avaritia.init.ModBlocks;
import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;

import net.minecraftforge.fml.common.Optional;

public class RefinedStorageRecipes {
/* For copy pasting
ExtremeCraftingManager.getInstance().addRecipe(
new ItemStack(),
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
);
*/

@Optional.Method(modid = Reference.RefinedStorageModID)
public static void init()
{
Expand Down
1 change: 0 additions & 1 deletion ...in/java/com/theundertaker11/moreavaritia/compat/storagedrawers/StorageDrawersRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.theundertaker11.moreavaritia.RecipeUtil;
import com.theundertaker11.moreavaritia.Reference;

import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/thermal/ThermalRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import morph.avaritia.init.ModBlocks;
import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.Optional;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/theundertaker11/moreavaritia/compat/tinkers/TinkersRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.theundertaker11.moreavaritia.Reference;

import morph.avaritia.init.ModItems;
import morph.avaritia.recipe.extreme.ExtremeCraftingManager;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;
Expand Down

0 comments on commit 220bd71

Please sign in to comment.