mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 15:18:34 +01:00
Updated forge, fixed some storage crate related stuff
This commit is contained in:
parent
2c4bb5adca
commit
26a7d74247
7 changed files with 28 additions and 6 deletions
|
@ -19,7 +19,7 @@ group = "de.ellpeck.actuallyadditions"
|
||||||
archivesBaseName = "ActuallyAdditions"
|
archivesBaseName = "ActuallyAdditions"
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.10-12.18.0.1983-1.10.0"
|
version = "1.10-12.18.0.2000-1.10.0"
|
||||||
runDir = "idea"
|
runDir = "idea"
|
||||||
|
|
||||||
mappings = "snapshot_20160519"
|
mappings = "snapshot_20160519"
|
||||||
|
@ -48,7 +48,7 @@ dependencies {
|
||||||
//compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev"
|
//compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev"
|
||||||
|
|
||||||
compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24"
|
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 {
|
processResources {
|
||||||
|
|
|
@ -115,9 +115,11 @@ public class BlockGiantChest extends BlockContainerBase{
|
||||||
for(int i = 0; i < slots.length; i++){
|
for(int i = 0; i < slots.length; i++){
|
||||||
//Destroy the keeper
|
//Destroy the keeper
|
||||||
if(i != place){
|
if(i != place){
|
||||||
|
NBTTagCompound compound = new NBTTagCompound();
|
||||||
if(slots[i] != null){
|
if(slots[i] != null){
|
||||||
list.appendTag(slots[i].writeToNBT(new NBTTagCompound()));
|
slots[i].writeToNBT(compound);
|
||||||
}
|
}
|
||||||
|
list.appendTag(compound);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -215,7 +215,7 @@ public final class InitItems{
|
||||||
itemWaterBowl = new ItemWaterBowl("itemWaterBowl");
|
itemWaterBowl = new ItemWaterBowl("itemWaterBowl");
|
||||||
itemSpawnerChanger = new ItemSpawnerChanger("itemSpawnerChanger");
|
itemSpawnerChanger = new ItemSpawnerChanger("itemSpawnerChanger");
|
||||||
itemMisc = new ItemMisc("itemMisc");
|
itemMisc = new ItemMisc("itemMisc");
|
||||||
itemCrateKeeper = new ItemGeneric("itemCrateKeeper");
|
itemCrateKeeper = new ItemGeneric("itemCrateKeeper").setMaxStackSize(1);
|
||||||
itemColorLens = new ItemLens("itemColorLens", ActuallyAdditionsAPI.lensColor);
|
itemColorLens = new ItemLens("itemColorLens", ActuallyAdditionsAPI.lensColor);
|
||||||
itemExplosionLens = new ItemLens("itemExplosionLens", ActuallyAdditionsAPI.lensDetonation);
|
itemExplosionLens = new ItemLens("itemExplosionLens", ActuallyAdditionsAPI.lensDetonation);
|
||||||
itemDamageLens = new ItemLens("itemDamageLens", ActuallyAdditionsAPI.lensDeath);
|
itemDamageLens = new ItemLens("itemDamageLens", ActuallyAdditionsAPI.lensDeath);
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
package de.ellpeck.actuallyadditions.mod.jei.booklet;
|
package de.ellpeck.actuallyadditions.mod.jei.booklet;
|
||||||
|
|
||||||
import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
|
import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
|
||||||
|
import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
|
||||||
import de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe;
|
import de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
|
@ -23,6 +24,10 @@ public class BookletRecipeHandler implements IRecipeHandler<BookletPage>{
|
||||||
return BookletPage.class;
|
return BookletPage.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getRecipeCategoryUid(BookletPage recipe){
|
||||||
|
return this.getRecipeCategoryUid();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRecipeCategoryUid(){
|
public String getRecipeCategoryUid(){
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
package de.ellpeck.actuallyadditions.mod.jei.coffee;
|
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.api.recipe.CoffeeIngredient;
|
||||||
import de.ellpeck.actuallyadditions.mod.nei.NEICoffeeMachineRecipe;
|
import de.ellpeck.actuallyadditions.mod.nei.NEICoffeeMachineRecipe;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
|
@ -23,6 +24,10 @@ public class CoffeeMachineRecipeHandler implements IRecipeHandler<CoffeeIngredie
|
||||||
return CoffeeIngredient.class;
|
return CoffeeIngredient.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getRecipeCategoryUid(CoffeeIngredient recipe){
|
||||||
|
return this.getRecipeCategoryUid();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRecipeCategoryUid(){
|
public String getRecipeCategoryUid(){
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
package de.ellpeck.actuallyadditions.mod.jei.crusher;
|
package de.ellpeck.actuallyadditions.mod.jei.crusher;
|
||||||
|
|
||||||
import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
|
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.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
|
|
||||||
|
@ -28,6 +29,11 @@ public class CrusherRecipeHandler implements IRecipeHandler<CrusherRecipe>{
|
||||||
return CrusherRecipeCategory.NAME;
|
return CrusherRecipeCategory.NAME;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getRecipeCategoryUid(CrusherRecipe recipe){
|
||||||
|
return this.getRecipeCategoryUid();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IRecipeWrapper getRecipeWrapper(CrusherRecipe recipe){
|
public IRecipeWrapper getRecipeWrapper(CrusherRecipe recipe){
|
||||||
|
|
|
@ -15,20 +15,24 @@ import de.ellpeck.actuallyadditions.mod.nei.NEIReconstructorRecipe;
|
||||||
import mezz.jei.api.recipe.IRecipeHandler;
|
import mezz.jei.api.recipe.IRecipeHandler;
|
||||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||||
|
|
||||||
public class ReconstructorRecipeHandler implements IRecipeHandler<LensConversionRecipe>{
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
|
public class ReconstructorRecipeHandler implements IRecipeHandler<LensConversionRecipe>{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Class getRecipeClass(){
|
public Class getRecipeClass(){
|
||||||
return LensConversionRecipe.class;
|
return LensConversionRecipe.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRecipeCategoryUid(){
|
public String getRecipeCategoryUid(){
|
||||||
return NEIReconstructorRecipe.NAME;
|
return NEIReconstructorRecipe.NAME;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getRecipeCategoryUid(LensConversionRecipe recipe){
|
||||||
|
return this.getRecipeCategoryUid();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IRecipeWrapper getRecipeWrapper(LensConversionRecipe recipe){
|
public IRecipeWrapper getRecipeWrapper(LensConversionRecipe recipe){
|
||||||
|
|
Loading…
Reference in a new issue