fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Most of the 1.8 Port.

Browse Source
This commit is contained in:
AlgorithmX2
2015-06-15 19:44:59 -05:00
parent 17465e68e8
commit 38afde724b
824 changed files with 12120 additions and 9158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/AEItemResolver.java
-1
View File
@@ -20,7 +20,6 @@ package appeng.recipes;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IItems;
src/main/java/appeng/recipes/GroupIngredient.java
-1
View File
@@ -25,7 +25,6 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/Ingredient.java
+1 -3
View File
@@ -25,10 +25,8 @@ import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.registry.GameRegistry;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
src/main/java/appeng/recipes/IngredientSet.java
-1
View File
@@ -24,7 +24,6 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.recipes.IIngredient;
src/main/java/appeng/recipes/RecipeHandler.java
+8 -9
View File
@@ -30,18 +30,14 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import javax.annotation.Nonnull;
import com.google.common.base.Optional;
import com.google.common.collect.HashMultimap;
import javax.annotation.Nonnull;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.LoaderState;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
import net.minecraftforge.fml.common.LoaderState;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier;
import appeng.api.AEApi;
import appeng.api.definitions.IBlocks;
import appeng.api.definitions.IDefinitions;
@@ -64,6 +60,9 @@ import appeng.items.parts.ItemMultiPart;
import appeng.recipes.handlers.IWebsiteSerializer;
import appeng.recipes.handlers.OreRegistration;
import com.google.common.base.Optional;
import com.google.common.collect.HashMultimap;
/**
* @author AlgorithmX2
@@ -357,7 +356,7 @@ public class RecipeHandler implements IRecipeHandler
@Override
public void injectRecipes()
{
if( cpw.mods.fml.common.Loader.instance().hasReachedState( LoaderState.POSTINITIALIZATION ) )
if( net.minecraftforge.fml.common.Loader.instance().hasReachedState( LoaderState.POSTINITIALIZATION ) )
{
throw new IllegalStateException( "Recipes must now be loaded in Init." );
}
src/main/java/appeng/recipes/game/DisassembleRecipe.java
+10 -3
View File
@@ -25,14 +25,12 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.common.base.Optional;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import appeng.api.AEApi;
import appeng.api.definitions.IBlocks;
import appeng.api.definitions.IDefinitions;
@@ -44,6 +42,8 @@ import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import com.google.common.base.Optional;
public final class DisassembleRecipe implements IRecipe
{
@@ -173,4 +173,11 @@ public final class DisassembleRecipe implements IRecipe
{
return null;
}
@Override
public ItemStack[] getRemainingItems(
InventoryCrafting inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
}
}
src/main/java/appeng/recipes/game/FacadeRecipe.java
+11 -3
View File
@@ -21,20 +21,20 @@ package appeng.recipes.game;
import javax.annotation.Nullable;
import com.google.common.base.Optional;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import appeng.api.AEApi;
import appeng.api.definitions.IComparableDefinition;
import appeng.api.definitions.IDefinitions;
import appeng.items.parts.ItemFacade;
import com.google.common.base.Optional;
public final class FacadeRecipe implements IRecipe
{
@@ -97,4 +97,12 @@ public final class FacadeRecipe implements IRecipe
{
return null;
}
@Override
public ItemStack[] getRemainingItems(
InventoryCrafting inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
}
}
src/main/java/appeng/recipes/game/ShapedRecipe.java
+9 -1
View File
@@ -27,8 +27,8 @@ import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.recipes.IIngredient;
@@ -325,4 +325,12 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
this.disable = true;
}
}
@Override
public ItemStack[] getRemainingItems(
InventoryCrafting inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
}
}
src/main/java/appeng/recipes/game/ShapelessRecipe.java
+9 -1
View File
@@ -25,8 +25,8 @@ import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.api.recipes.IIngredient;
@@ -179,4 +179,12 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
this.disable = true;
}
}
@Override
public ItemStack[] getRemainingItems(
InventoryCrafting inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
}
}
src/main/java/appeng/recipes/handlers/Crusher.java
-1
View File
@@ -22,7 +22,6 @@ package appeng.recipes.handlers;
import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/Grind.java
-1
View File
@@ -22,7 +22,6 @@ package appeng.recipes.handlers;
import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
src/main/java/appeng/recipes/handlers/GrindFZ.java
-1
View File
@@ -22,7 +22,6 @@ package appeng.recipes.handlers;
import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/HCCrusher.java
+1 -3
View File
@@ -23,9 +23,7 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/IWebsiteSerializer.java
-1
View File
@@ -20,7 +20,6 @@ package appeng.recipes.handlers;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
import appeng.recipes.RecipeHandler;
src/main/java/appeng/recipes/handlers/Inscribe.java
-1
View File
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/InscriberProcess.java
-1
View File
@@ -6,7 +6,6 @@ import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/Macerator.java
-1
View File
@@ -22,7 +22,6 @@ package appeng.recipes.handlers;
import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/MekCrusher.java
-1
View File
@@ -22,7 +22,6 @@ package appeng.recipes.handlers;
import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/MekEnrichment.java
-1
View File
@@ -22,7 +22,6 @@ package appeng.recipes.handlers;
import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/OreRegistration.java
-1
View File
@@ -23,7 +23,6 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/Press.java
-1
View File
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/Pulverizer.java
+1 -3
View File
@@ -23,9 +23,7 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/Shaped.java
+1 -3
View File
@@ -23,9 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/Shapeless.java
+1 -3
View File
@@ -23,9 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/handlers/Smelt.java
+1 -3
View File
@@ -22,9 +22,7 @@ package appeng.recipes.handlers;
import java.util.List;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
import appeng.api.exceptions.MissingIngredientError;
import appeng.api.exceptions.RecipeError;
import appeng.api.exceptions.RegistrationError;
src/main/java/appeng/recipes/loader/ConfigLoader.java
+3 -2
View File
@@ -23,12 +23,13 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import javax.annotation.Nonnull;
import com.google.common.base.Preconditions;
import appeng.api.recipes.IRecipeLoader;
import com.google.common.base.Preconditions;
public final class ConfigLoader implements IRecipeLoader
{
src/main/java/appeng/recipes/loader/JarLoader.java
+3 -2
View File
@@ -21,12 +21,13 @@ package appeng.recipes.loader;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import javax.annotation.Nonnull;
import com.google.common.base.Preconditions;
import appeng.api.recipes.IRecipeLoader;
import com.google.common.base.Preconditions;
public class JarLoader implements IRecipeLoader
{
src/main/java/appeng/recipes/loader/RecipeResourceCopier.java
+3 -2
View File
@@ -31,12 +31,13 @@ import java.util.HashSet;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import com.google.common.base.Preconditions;
import org.apache.commons.io.FileUtils;
import com.google.common.base.Preconditions;
/**
* copies recipes in jars onto file system
src/main/java/appeng/recipes/ores/OreDictionaryHandler.java
+1 -3
View File
@@ -24,10 +24,8 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import appeng.core.AELog;
import appeng.recipes.game.IRecipeBakeable;