Add popcorn chicken

brandonlou · Sep 12, 2020 · af27f00 · af27f00
1 parent 659b536
commit af27f00
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 14 deletions.
diff --git a/src/main/java/com/blou/bobacraft/blockitems/BobaItemBase.java b/src/main/java/com/blou/bobacraft/blockitems/BobaItemBase.java
@@ -1,6 +1,5 @@
 package com.blou.bobacraft.blockitems;
 
-import com.blou.bobacraft.BobaCraft;
 import net.minecraft.block.Block;
 import net.minecraft.item.*;
 import net.minecraft.potion.EffectInstance;
@@ -20,7 +19,7 @@ public BobaItemBase(Block block, Supplier<EffectInstance> effectInstance, ItemGr
         super(block, new Item.Properties()
                 .group(itemGroup)
                 .maxStackSize(maxStackSize)
-                .rarity(Rarity.UNCOMMON)
+                .rarity(Rarity.COMMON)
                 .food(new Food.Builder()
                         .hunger(health)
                         .saturation(saturation)

diff --git a/src/main/java/com/blou/bobacraft/blockitems/CassavaSeedItem.java b/src/main/java/com/blou/bobacraft/blockitems/CassavaSeedItem.java
@@ -14,7 +14,7 @@ public CassavaSeedItem(Block block, ItemGroup itemGroup) {
         super(block, new Item.Properties()
             .group(itemGroup)
             .maxStackSize(maxStackSize)
-            .rarity(Rarity.UNCOMMON));
+            .rarity(Rarity.COMMON));
     }
 
 }
diff --git a/src/main/java/com/blou/bobacraft/events/ModClientEvents.java b/src/main/java/com/blou/bobacraft/events/ModClientEvents.java
@@ -0,0 +1,32 @@
+//package com.blou.bobacraft.events;
+//
+//import net.minecraft.block.Block;
+//import net.minecraft.block.Blocks;
+//import net.minecraft.world.biome.Biome;
+//import net.minecraft.world.biome.Biomes;
+//import net.minecraftforge.api.distmarker.Dist;
+//import net.minecraftforge.event.world.BlockEvent;
+//import net.minecraftforge.eventbus.api.SubscribeEvent;
+//import net.minecraftforge.fml.common.Mod;
+//import net.minecraftforge.registries.ForgeRegistries;
+//
+//@Mod.EventBusSubscriber(modid="bobacraft", bus=Mod.EventBusSubscriber.Bus.FORGE, value=Dist.CLIENT)
+//public class ModClientEvents {
+//
+//    @SubscribeEvent
+//    public static void onBreakGrassInJungle(BlockEvent.BreakEvent event) {
+//
+//        Block currentBlock = event.getState().getBlock();
+//        Biome currentBiome = event.getWorld().getBiome(event.getPos());
+//
+//        boolean isGrassBlock = (currentBlock == Blocks.TALL_GRASS);
+//        boolean inJungle = (currentBiome == ForgeRegistries.BIOMES.getValue(Biomes.JUNGLE.getRegistryName()));
+//
+//        if(isGrassBlock && inJungle) {
+////            ItemStack stack =
+////            currentBlock.spawnAdditionalDrops(event.getState(), , event.getPos(), stack);
+//        }
+//
+//    }
+//
+//}
diff --git a/src/main/java/com/blou/bobacraft/init/ModItems.java b/src/main/java/com/blou/bobacraft/init/ModItems.java
@@ -1,11 +1,7 @@
 package com.blou.bobacraft.init;
 
 import com.blou.bobacraft.blockitems.*;
-import com.blou.bobacraft.items.BobaBallItem;
-import com.blou.bobacraft.items.BobaPopsicleItem;
-import com.blou.bobacraft.items.CassavaRootItem;
-import com.blou.bobacraft.items.TapiocaStarchItem;
-import net.minecraft.item.BlockItem;
+import com.blou.bobacraft.items.*;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.util.IItemProvider;
@@ -23,8 +19,7 @@ public static ModItems getInstance(ItemGroup itemGroup, String modID) {
 
     private final ModBlocks modBlocks;
     private final DeferredRegister<Item> items;
-    private final RegistryObject<BlockItem> blackMilkTeaBlockItem;
-    private final RegistryObject<Item> cassavaSeedItem;
+    private final RegistryObject<Item> bobaBallItem, cassavaSeedItem;
 
     private ModItems(ItemGroup itemGroup, String modID) {
 
@@ -35,12 +30,13 @@ private ModItems(ItemGroup itemGroup, String modID) {
 
         items.register("cassava_root_item", () -> new CassavaRootItem(itemGroup));
         items.register("tapioca_starch_item", () -> new TapiocaStarchItem(itemGroup));
-        items.register("boba_ball_item", () -> new BobaBallItem(itemGroup));
+        bobaBallItem = items.register("boba_ball_item", () -> new BobaBallItem(itemGroup));
         items.register("boba_popsicle_item", () -> new BobaPopsicleItem(itemGroup));
+        items.register("popcorn_chicken_item", () -> new PopcornChickenItem(itemGroup));
 
         // Block items
 
-        blackMilkTeaBlockItem = items.register("black_milk_tea_block",
+        items.register("black_milk_tea_block",
                 () -> new BlackMilkTeaItem(modBlocks.getBlackMilkTeaBlock(), itemGroup));
 
         items.register("jasmine_milk_tea_block",
@@ -68,7 +64,7 @@ public DeferredRegister<Item> getItemsRegister() {
     }
 
     public IItemProvider getCreativeTabIcon() {
-        return blackMilkTeaBlockItem.get();
+        return bobaBallItem.get();
     }
 
     public IItemProvider getCassavaSeedItem() {

diff --git a/src/main/java/com/blou/bobacraft/items/BobaBallItem.java b/src/main/java/com/blou/bobacraft/items/BobaBallItem.java
@@ -16,7 +16,7 @@ public BobaBallItem(ItemGroup itemGroup) {
         super(new Item.Properties()
                 .group(itemGroup)
                 .maxStackSize(maxStackSize)
-                .rarity(Rarity.UNCOMMON)
+                .rarity(Rarity.COMMON)
                 .food(new Food.Builder()
                         .hunger(hunger)
                         .saturation(saturation)

diff --git a/src/main/java/com/blou/bobacraft/items/PopcornChickenItem.java b/src/main/java/com/blou/bobacraft/items/PopcornChickenItem.java
@@ -0,0 +1,29 @@
+package com.blou.bobacraft.items;
+
+import net.minecraft.item.Food;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.Rarity;
+
+public class PopcornChickenItem extends Item {
+
+    private static final int maxStackSize = 16;
+    private static final int hunger = 8; // Restores 4 hearts.
+    private static final float saturation = 1.0f;
+
+    public PopcornChickenItem(ItemGroup itemGroup) {
+
+        super(new Item.Properties()
+            .group(itemGroup)
+            .maxStackSize(maxStackSize)
+            .rarity(Rarity.COMMON)
+            .food(new Food.Builder()
+                .hunger(hunger)
+                .saturation(saturation)
+                .meat()
+                .setAlwaysEdible()
+                .build()));
+
+    }
+
+}
diff --git a/src/main/resources/assets/bobacraft/lang/en_us.json b/src/main/resources/assets/bobacraft/lang/en_us.json
@@ -6,6 +6,7 @@
   "item.bobacraft.cassava_root_item": "Cassava Root",
   "item.bobacraft.tapioca_starch_item": "Tapioca Starch",
   "item.bobacraft.boba_popsicle_item": "Boba Popsicle",
+  "item.bobacraft.popcorn_chicken_item": "Popcorn Chicken",
 
   "block.bobacraft.cassava_crop_block": "Cassava Seeds",
   "block.bobacraft.black_milk_tea_block": "Black Milk Tea",

diff --git a/src/main/resources/assets/bobacraft/models/item/popcorn_chicken_item.json b/src/main/resources/assets/bobacraft/models/item/popcorn_chicken_item.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "bobacraft:items/popcorn_chicken_item"
+  }
+}
diff --git a/src/main/resources/assets/bobacraft/textures/items/popcorn_chicken_item.png b/src/main/resources/assets/bobacraft/textures/items/popcorn_chicken_item.png
diff --git a/src/main/resources/data/bobacraft/recipes/popcorn_chicken_item.json b/src/main/resources/data/bobacraft/recipes/popcorn_chicken_item.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "minecraft:cooked_chicken"
+    },
+    {
+      "item": "minecraft:wheat"
+    },
+    {
+      "item": "minecraft:stick"
+    }
+  ],
+  "result":
+  {
+    "item": "bobacraft:popcorn_chicken_item",
+    "count": 2
+  }
+}