From 26a7d7424768dcc3c7b7d2dd28f57282edf6bb2b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 27 Jun 2016 20:49:26 +0200 Subject: [PATCH] Updated forge, fixed some storage crate related stuff --- build.gradle | 4 ++-- .../actuallyadditions/mod/blocks/BlockGiantChest.java | 4 +++- .../de/ellpeck/actuallyadditions/mod/items/InitItems.java | 2 +- .../mod/jei/booklet/BookletRecipeHandler.java | 5 +++++ .../mod/jei/coffee/CoffeeMachineRecipeHandler.java | 5 +++++ .../mod/jei/crusher/CrusherRecipeHandler.java | 6 ++++++ .../mod/jei/reconstructor/ReconstructorRecipeHandler.java | 8 ++++++-- 7 files changed, 28 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index adf20d56a..7e5fd36e5 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ group = "de.ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" minecraft { - version = "1.10-12.18.0.1983-1.10.0" + version = "1.10-12.18.0.2000-1.10.0" runDir = "idea" mappings = "snapshot_20160519" @@ -48,7 +48,7 @@ dependencies { //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24" - deobfCompile "mezz.jei:jei_1.9.4:3.4.0.202" + deobfCompile "mezz.jei:jei_1.10:3.7.1.219" } processResources { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java index 7541fe4d2..a2f76b152 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java @@ -115,9 +115,11 @@ public class BlockGiantChest extends BlockContainerBase{ for(int i = 0; i < slots.length; i++){ //Destroy the keeper if(i != place){ + NBTTagCompound compound = new NBTTagCompound(); if(slots[i] != null){ - list.appendTag(slots[i].writeToNBT(new NBTTagCompound())); + slots[i].writeToNBT(compound); } + list.appendTag(compound); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index d038ba384..6ed36ad59 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java @@ -215,7 +215,7 @@ public final class InitItems{ itemWaterBowl = new ItemWaterBowl("itemWaterBowl"); itemSpawnerChanger = new ItemSpawnerChanger("itemSpawnerChanger"); itemMisc = new ItemMisc("itemMisc"); - itemCrateKeeper = new ItemGeneric("itemCrateKeeper"); + itemCrateKeeper = new ItemGeneric("itemCrateKeeper").setMaxStackSize(1); itemColorLens = new ItemLens("itemColorLens", ActuallyAdditionsAPI.lensColor); itemExplosionLens = new ItemLens("itemExplosionLens", ActuallyAdditionsAPI.lensDetonation); itemDamageLens = new ItemLens("itemDamageLens", ActuallyAdditionsAPI.lensDeath); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java index 02707e27f..63066054c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java @@ -11,6 +11,7 @@ package de.ellpeck.actuallyadditions.mod.jei.booklet; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; +import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; @@ -23,6 +24,10 @@ public class BookletRecipeHandler implements IRecipeHandler{ return BookletPage.class; } + @Override + public String getRecipeCategoryUid(BookletPage recipe){ + return this.getRecipeCategoryUid(); + } @Override public String getRecipeCategoryUid(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java index 564afd5b5..39615477e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java @@ -10,6 +10,7 @@ package de.ellpeck.actuallyadditions.mod.jei.coffee; +import de.ellpeck.actuallyadditions.api.booklet.BookletPage; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; import de.ellpeck.actuallyadditions.mod.nei.NEICoffeeMachineRecipe; import mezz.jei.api.recipe.IRecipeHandler; @@ -23,6 +24,10 @@ public class CoffeeMachineRecipeHandler implements IRecipeHandler{ return CrusherRecipeCategory.NAME; } + @Override + public String getRecipeCategoryUid(CrusherRecipe recipe){ + return this.getRecipeCategoryUid(); + } + @Override public IRecipeWrapper getRecipeWrapper(CrusherRecipe recipe){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java index 7082944b4..d25c5e39f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java @@ -15,20 +15,24 @@ import de.ellpeck.actuallyadditions.mod.nei.NEIReconstructorRecipe; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; -public class ReconstructorRecipeHandler implements IRecipeHandler{ +import javax.annotation.Nonnull; +public class ReconstructorRecipeHandler implements IRecipeHandler{ @Override public Class getRecipeClass(){ return LensConversionRecipe.class; } - @Override public String getRecipeCategoryUid(){ return NEIReconstructorRecipe.NAME; } + @Override + public String getRecipeCategoryUid(LensConversionRecipe recipe){ + return this.getRecipeCategoryUid(); + } @Override public IRecipeWrapper getRecipeWrapper(LensConversionRecipe recipe){