Bottle Two: The Rebottling

src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java

@@ -11,7 +11,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
 import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -35,7 +34,7 @@ public class ItemAuraBottle extends ItemImpl implements IColorProvidingItem {
         super("aura_bottle");
         MinecraftForge.EVENT_BUS.register(this);
 
-        BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.GLASS_BOTTLE, new BehaviorDefaultDispenseItem() {
+        BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.BOTTLE_TWO, new BehaviorDefaultDispenseItem() {
             @Override
             protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
                 World world = source.getWorld();
@@ -63,7 +62,7 @@ public class ItemAuraBottle extends ItemImpl implements IColorProvidingItem {
     @SubscribeEvent
     public void onRightClick(PlayerInteractEvent.RightClickItem event) {
         ItemStack held = event.getItemStack();
-        if (held.isEmpty() || held.getItem() != Items.GLASS_BOTTLE)
+        if (held.isEmpty() || held.getItem() != ModItems.BOTTLE_TWO)
             return;
         EntityPlayer player = event.getEntityPlayer();
         RayTraceResult ray = this.rayTrace(player.world, player, true);

src/main/java/de/ellpeck/naturesaura/items/ModItems.java

@@ -26,6 +26,7 @@ public final class ModItems {
     public static final Item AURA_CACHE = new ItemAuraCache();
     public static final Item SHOCKWAVE_CREATOR = new ItemShockwaveCreator();
     public static final Item MULTIBLOCK_MAKER = new ItemMultiblockMaker();
+    public static final Item BOTTLE_TWO = new ItemImpl("bottle_two_the_rebottling");
     public static final Item AURA_BOTTLE = new ItemAuraBottle();
     public static final Item FARMING_STENCIL = new ItemImpl("farming_stencil");
 }

src/main/resources/assets/naturesaura/lang/en_US.lang

@@ -53,6 +53,7 @@ item.naturesaura.aura_bottle.naturesaura:nether.name=Bottled Ghosts
 item.naturesaura.aura_bottle.naturesaura:end.name=Bottled Darkness
 item.naturesaura.aura_bottle.naturesaura:other.name=Bottled Substance
 item.naturesaura.farming_stencil.name=Farming Stencil
+item.naturesaura.bottle_two_the_rebottling.name=Bottle and Cork
 
 container.naturesaura.tree_ritual.name=Ritual of the Forest
 container.naturesaura.altar.name=Natural Altar Infusion

src/main/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "naturesaura:items/bottle_two_the_rebottling"
+    }
+}

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/collecting/aura_bottle.json

@@ -6,17 +6,22 @@
     "pages": [
         {
             "type": "text",
-            "text": "$(aura) and its presence in the world has been a conundrum to researchers for decades. As such, they needed a way to better be able to analyze it, which is why $(item)Bottles$() were invented.$(br)While this might not be the full story of their conception, they can still be used to collect $(aura) in its purest form by simply interacting with the air directly while holding one in your hand."
+            "text": "$(aura) and its presence in the world has been a conundrum to researchers for a long time now. Back in the day, they used to use $(item)Bottles$() to collect $(aura) and to be able to analyze it in greater detail as it becomes visible to the naked eye that way. Soon after, complaints from uninformed civilians started troubling them: \"Other scientists already have a use for bottles, this will cause issues\", they said."
+        },
+        {
+            "type": "crafting",
+            "text": "As such, and to shut out all the incoherent blabber, they created the $(item)Bottle and Cork$(): A similar, yet slightly different utensil to the bottle that can be used exclusively to collect $(aura) by simply interacting with the air while holding it.",
+            "recipe": "naturesaura:bottle_two_the_rebottling"
         },
         {
             "type": "spotlight",
             "item": "naturesaura:aura_bottle{stored_type:'naturesaura:overworld'}",
             "link_recipe": true,
-            "text": "Of course, based on the world that you are currently in, the type of $(aura) collected will slightly vary. For instance, in the normal world, $(aura) can be gathered in the form of sunlight, while in the Nether realm, $(aura) can be gathered in the form of ghosts."
+            "text": "Of course, based on the world that you are currently in, the type of $(aura) collected will slightly vary. For instance, in the normal world, $(aura) can be gathered in the form of sunlight, while in the Nether realm, $(aura) can be gathered in the form of ghosts, and in the End realm, $(aura) is present in the form of an overabundance of darkness."
         },
         {
             "type": "text",
-            "text": "Additionally, the collection of $(aura) in this manner can be automated easily using $(item)Dispensers$(): Putting empty bottles into them will cause them to be shot out with the cork slightly unscrewed, making them fill up with $(aura) in the process. As they are not sucked up by the Dispenser again afterwards, an additional tool like a $(item)Hopper$() is required."
+            "text": "Additionally, the collection of $(aura) in this manner can be automated easily using $(item)Dispensers$(): Putting empty $(item)Bottles and Corks$() into them will cause them to be shot out open, making them fill up with $(aura) in the process. As they are not sucked up by the Dispenser again afterwards, an additional tool like a $(item)Hopper$() is required."
         }
     ]
 }

src/main/resources/assets/naturesaura/recipes/bottle_two_the_rebottling.json

@@ -0,0 +1,15 @@
+{
+    "type": "forge:ore_shapeless",
+    "ingredients": [
+        {
+            "item": "minecraft:glass_bottle"
+        },
+        {
+            "type": "forge:ore_dict",
+            "ore": "plankWood"
+        }
+    ],
+    "result": {
+        "item": "naturesaura:bottle_two_the_rebottling"
+    }
+}