diff --git a/build.gradle b/build.gradle index 33f316459..691ab961c 100644 --- a/build.gradle +++ b/build.gradle @@ -38,9 +38,9 @@ repositories { } dependencies { - compile "codechicken:CodeChickenLib:1.8-1.1.2.139:dev" - compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev" - compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" + //compile "codechicken:CodeChickenLib:1.8-1.1.2.139:dev" + //compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev" + //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" deobfCompile "mezz.jei:jei_1.8.9:2.19.0.93" } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java index 646910642..37d43ec4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIActuallyAdditionsConfig.java @@ -10,18 +10,9 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import codechicken.nei.recipe.DefaultOverlayHandler; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCrafter; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.Util; -import net.minecraft.item.ItemStack; +public class NEIActuallyAdditionsConfig/* implements IConfigureNEI*/{ -public class NEIActuallyAdditionsConfig implements IConfigureNEI{ - - @Override + /*@Override public void loadConfig(){ ModUtil.LOGGER.info("Initializing Not Enough Items Plugin..."); @@ -80,6 +71,5 @@ public class NEIActuallyAdditionsConfig implements IConfigureNEI{ @Override public String getVersion(){ return ModUtil.VERSION; - } - + }*/ } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java index dcffa7320..839347ae2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java @@ -10,33 +10,11 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - -public class NEIBookletRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ +public class NEIBookletRecipe/* extends TemplateRecipeHandler implements INEIRecipeHandler*/{ public static final String NAME = "actuallyadditions.booklet"; - public NEIBookletRecipe(){ + /*public NEIBookletRecipe(){ RecipeInfo.setGuiOffset(this.getGuiClass(), 0, 0); } @@ -169,5 +147,5 @@ public class NEIBookletRecipe extends TemplateRecipeHandler implements INEIRecip } return null; } - } + }*/ } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java index c4235ef86..cd92dceee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java @@ -10,38 +10,11 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing; -import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class NEICoffeeMachineRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ +public class NEICoffeeMachineRecipe/* extends TemplateRecipeHandler implements INEIRecipeHandler*/{ public static final String NAME = "actuallyadditions.coffee"; - public NEICoffeeMachineRecipe(){ + /*public NEICoffeeMachineRecipe(){ super(); RecipeInfo.setGuiOffset(this.getGuiClass(), 35, 3); } @@ -178,5 +151,5 @@ public class NEICoffeeMachineRecipe extends TemplateRecipeHandler implements INE list.add(this.coffeeBeans); return list; } - } + }*/ } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java index fc7eab9e5..4dff5ca4e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java @@ -10,31 +10,11 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; - -import java.awt.*; -import java.util.Collections; - -public class NEICompostRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ +public class NEICompostRecipe/* extends TemplateRecipeHandler implements INEIRecipeHandler*/{ public static final String NAME = "actuallyadditions.compost"; - public NEICompostRecipe(){ + /*public NEICompostRecipe(){ super(); RecipeInfo.setGuiOffset(this.getGuiClass(), 0, 0); } @@ -127,5 +107,5 @@ public class NEICompostRecipe extends TemplateRecipeHandler implements INEIRecip public PositionedStack getIngredient(){ return input; } - } + }*/ } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java index 23e12ffd9..6b4569946 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java @@ -10,31 +10,9 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiGrinder; -import de.ellpeck.actuallyadditions.mod.util.ItemUtil; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; +public class NEICrusherRecipe/* extends TemplateRecipeHandler implements INEIRecipeHandler*/{ -import java.awt.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class NEICrusherRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ - - public NEICrusherRecipe(){ + /*public NEICrusherRecipe(){ RecipeInfo.setGuiOffset(this.getGuiClass(), 0, 0); } @@ -204,5 +182,5 @@ public class NEICrusherRecipe extends TemplateRecipeHandler implements INEIRecip } return list; } - } + }*/ } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java index fd65dcc97..df2d1e05a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java @@ -10,32 +10,11 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFurnaceDouble; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; - -import java.awt.*; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -public class NEIFurnaceDoubleRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ +public class NEIFurnaceDoubleRecipe /*extends TemplateRecipeHandler implements INEIRecipeHandler*/{ public static final String NAME = "actuallyadditions.furnaceDouble"; - public NEIFurnaceDoubleRecipe(){ + /*public NEIFurnaceDoubleRecipe(){ RecipeInfo.setGuiOffset(this.getGuiClass(), 0, 0); } @@ -145,5 +124,5 @@ public class NEIFurnaceDoubleRecipe extends TemplateRecipeHandler implements INE public List getIngredients(){ return getCycledIngredients(cycleticks/48, Collections.singletonList(ingredient)); } - } + }*/ } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java index f25599559..5091b2962 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java @@ -10,31 +10,11 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; - -import java.awt.*; -import java.util.Collections; -import java.util.List; - -public class NEIHairyBallRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ +public class NEIHairyBallRecipe/* extends TemplateRecipeHandler implements INEIRecipeHandler*/{ public static final String NAME = "actuallyadditions.ballOfHair"; - public NEIHairyBallRecipe(){ + /*public NEIHairyBallRecipe(){ super(); RecipeInfo.setGuiOffset(this.getGuiClass(), 0, 0); } @@ -148,5 +128,5 @@ public class NEIHairyBallRecipe extends TemplateRecipeHandler implements INEIRec public PositionedStack getIngredient(){ return input; } - } + }*/ } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java index 2abe18254..5618b8e40 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java @@ -10,35 +10,11 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.items.lens.LensColor; -import de.ellpeck.actuallyadditions.mod.util.*; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ +public class NEIReconstructorRecipe/* extends TemplateRecipeHandler implements INEIRecipeHandler*/{ public static final String NAME = "actuallyadditions.reconstructor"; - public NEIReconstructorRecipe(){ + /*public NEIReconstructorRecipe(){ super(); RecipeInfo.setGuiOffset(this.getGuiClass(), 0, 0); } @@ -192,5 +168,5 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE list.addAll(this.getCycledIngredients(cycleticks/48, Collections.singletonList(this.result))); return list; } - } + }*/ } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java index 99f2729ac..e18599c9f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java @@ -10,25 +10,14 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.IRecipeHandler; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.Minecraft; -import net.minecraftforge.client.event.GuiScreenEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class NEIScreenEvents{ private static final int NEI_BUTTON_ID = 123782; private TexturedButton neiButton; - @SuppressWarnings("unchecked") + /*@SuppressWarnings("unchecked") @SubscribeEvent public void onInitGuiForNEI(GuiScreenEvent.InitGuiEvent event){ if(event.gui instanceof GuiRecipe){ @@ -75,5 +64,5 @@ public class NEIScreenEvents{ } } } - } + }*/ } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java index 58486bd8d..4c21fddd2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java @@ -10,31 +10,11 @@ package de.ellpeck.actuallyadditions.mod.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; -import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; -import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot; -import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; -import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; - -import java.awt.*; -import java.util.Collections; -import java.util.List; - -public class NEITreasureChestRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ +public class NEITreasureChestRecipe/* extends TemplateRecipeHandler implements INEIRecipeHandler*/{ public static final String NAME = "actuallyadditions.treasureChest"; - public NEITreasureChestRecipe(){ + /*public NEITreasureChestRecipe(){ super(); RecipeInfo.setGuiOffset(this.getGuiClass(), 0, 0); } @@ -150,5 +130,5 @@ public class NEITreasureChestRecipe extends TemplateRecipeHandler implements INE public PositionedStack getIngredient(){ return input; } - } + }*/ } \ No newline at end of file