diff --git a/src/main/java/biomesoplenty/common/init/ModCrafting.java b/src/main/java/biomesoplenty/common/init/ModCrafting.java index f4b718426..f7b948a0b 100644 --- a/src/main/java/biomesoplenty/common/init/ModCrafting.java +++ b/src/main/java/biomesoplenty/common/init/ModCrafting.java @@ -212,6 +212,7 @@ public class ModCrafting //Plants GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.shroompowder), new Object[] {new ItemStack(BOPBlocks.mushroom, 1, BlockBOPMushroom.MushroomType.TOADSTOOL.ordinal())}); GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.jar_filled, 1, ItemJarFilled.JarContents.POISON.ordinal()), new Object[] {BlockBOPPlant.paging.getVariantItem(BOPPlants.POISONIVY), new ItemStack(BOPItems.jar_empty)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.jar_filled, 1, ItemJarFilled.JarContents.TERRARIUM.ordinal()), new Object[] {new ItemStack(BOPBlocks.moss), new ItemStack(BOPItems.jar_empty)}); GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.ricebowl), new Object[] {Items.bowl, BlockBOPPlant.paging.getVariantItem(BOPPlants.WILDRICE)}); GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.saladfruit), new Object[] {Items.bowl, BOPItems.berries, Items.apple, Items.melon}); GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.saladveggie), new Object[] {Items.bowl, BOPItems.wildcarrots, Items.carrot, Items.potato}); diff --git a/src/main/java/biomesoplenty/common/item/ItemJarFilled.java b/src/main/java/biomesoplenty/common/item/ItemJarFilled.java index 52446abb2..c7ab3dcb5 100644 --- a/src/main/java/biomesoplenty/common/item/ItemJarFilled.java +++ b/src/main/java/biomesoplenty/common/item/ItemJarFilled.java @@ -31,7 +31,7 @@ public class ItemJarFilled extends Item public enum JarContents implements IStringSerializable { - HONEY, POISON, PIXIE; + HONEY, POISON, PIXIE, TERRARIUM; @Override public String getName() @@ -151,7 +151,7 @@ public class ItemJarFilled extends Item } return stack; - case HONEY: case POISON: default: + case HONEY: case POISON: case TERRARIUM: default: return stack; } } @@ -173,7 +173,7 @@ public class ItemJarFilled extends Item return this.releasePixie(stack, world, player, releasePoint); // TODO: are you supposed to be able to pour out honey? How much should you get? Why don't we just use buckets? - case HONEY: case POISON: default: + case HONEY: case POISON: case TERRARIUM: default: return false; } } diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 0b9d2f46c..3c99f18ae 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -125,6 +125,7 @@ item.jar_empty.name=Empty Jar item.jar_filled_honey.name=Honey Jar item.jar_filled_pixie.name=Pixie Jar item.jar_filled_poison.name=Poison Extract Jar +item.jar_filled_terrarium.name=Terrarium Jar item.lush_flower_band.name=Lush Flower Band item.magic_door.name=Magic Door item.mahogany_door.name=Mahogany Door diff --git a/src/main/resources/assets/biomesoplenty/models/item/jar_filled_terrarium.json b/src/main/resources/assets/biomesoplenty/models/item/jar_filled_terrarium.json new file mode 100644 index 000000000..37d55e9c9 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/jar_filled_terrarium.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/jar_filled_terrarium" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/textures/items/jar_filled_terrarium.png b/src/main/resources/assets/biomesoplenty/textures/items/jar_filled_terrarium.png new file mode 100644 index 000000000..22b6f647d Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/jar_filled_terrarium.png differ