Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-22 19:39:24 +01:00
Code Issues Projects Releases Wiki Activity

Updated forge, fixed some storage crate related stuff

Browse source
This commit is contained in:
Ellpeck 2016-06-27 20:49:26 +02:00
parent 2c4bb5adca
commit 26a7d74247
7 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -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 {

4
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
View file

@ -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);
}
}

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java
View file

@ -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);

5
src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeHandler.java
View file

@ -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<BookletPage>{
return BookletPage.class;
}
@Override
public String getRecipeCategoryUid(BookletPage recipe){
return this.getRecipeCategoryUid();
}
@Override
public String getRecipeCategoryUid(){

5
src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeHandler.java
View file

@ -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<CoffeeIngredie
return CoffeeIngredient.class;
}
@Override
public String getRecipeCategoryUid(CoffeeIngredient recipe){
return this.getRecipeCategoryUid();
}
@Override
public String getRecipeCategoryUid(){

6
src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeHandler.java
View file

@ -11,6 +11,7 @@
package de.ellpeck.actuallyadditions.mod.jei.crusher;
import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
import mezz.jei.api.recipe.IRecipeHandler;
import mezz.jei.api.recipe.IRecipeWrapper;
@ -28,6 +29,11 @@ public class CrusherRecipeHandler implements IRecipeHandler<CrusherRecipe>{
return CrusherRecipeCategory.NAME;
}
@Override
public String getRecipeCategoryUid(CrusherRecipe recipe){
return this.getRecipeCategoryUid();
}
@Override
public IRecipeWrapper getRecipeWrapper(CrusherRecipe recipe){

8
src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeHandler.java
View file

@ -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<LensConversionRecipe>{
import javax.annotation.Nonnull;
public class ReconstructorRecipeHandler implements IRecipeHandler<LensConversionRecipe>{
@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){