Merge pull request #15 from Asis2019/main

Micaxs · web-flow · commit c3fe881129e2 · 2024-05-19T20:22:24.000+02:00
Implemented weed gummy
diff --git a/src/generated/resources/assets/smokeleafindustry/models/item/blue_ice_gummy.json b/src/generated/resources/assets/smokeleafindustry/models/item/blue_ice_gummy.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "smokeleafindustry:item/blue_ice_gummy"
+  }
+}
diff --git a/src/generated/resources/assets/smokeleafindustry/models/item/bubble_kush_gummy.json b/src/generated/resources/assets/smokeleafindustry/models/item/bubble_kush_gummy.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "smokeleafindustry:item/bubble_kush_gummy"
+  }
+}
diff --git a/src/generated/resources/assets/smokeleafindustry/models/item/bubblegum_gummy.json b/src/generated/resources/assets/smokeleafindustry/models/item/bubblegum_gummy.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "smokeleafindustry:item/bubblegum_gummy"
+  }
+}
diff --git a/src/generated/resources/assets/smokeleafindustry/models/item/lemon_haze_gummy.json b/src/generated/resources/assets/smokeleafindustry/models/item/lemon_haze_gummy.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "smokeleafindustry:item/lemon_haze_gummy"
+  }
+}
diff --git a/src/generated/resources/assets/smokeleafindustry/models/item/purple_haze_gummy.json b/src/generated/resources/assets/smokeleafindustry/models/item/purple_haze_gummy.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "smokeleafindustry:item/purple_haze_gummy"
+  }
+}
diff --git a/src/generated/resources/assets/smokeleafindustry/models/item/sour_diesel_gummy.json b/src/generated/resources/assets/smokeleafindustry/models/item/sour_diesel_gummy.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "smokeleafindustry:item/sour_diesel_gummy"
+  }
+}
diff --git a/src/generated/resources/assets/smokeleafindustry/models/item/white_widow_gummy.json b/src/generated/resources/assets/smokeleafindustry/models/item/white_widow_gummy.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "smokeleafindustry:item/white_widow_gummy"
+  }
+}
diff --git a/src/main/java/net/micaxs/smokeleafindustry/datagen/ModItemModelProvider.java b/src/main/java/net/micaxs/smokeleafindustry/datagen/ModItemModelProvider.java
@@ -98,6 +98,14 @@ protected void registerModels() {
         simpleItem(ModItems.HASH_BROWNIE);
         simpleItem(ModItems.WEED_COOKIE);
 
+        simpleItem(ModItems.WHITE_WIDOW_GUMMY);
+        simpleItem(ModItems.SOUR_DIESEL_GUMMY);
+        simpleItem(ModItems.PURPLE_HAZE_GUMMY);
+        simpleItem(ModItems.LEMON_HAZE_GUMMY);
+        simpleItem(ModItems.BUBBLE_KUSH_GUMMY);
+        simpleItem(ModItems.BLUE_ICE_GUMMY);
+        simpleItem(ModItems.BUBBLEGUM_GUMMY);
+
         simpleItem(ModItems.HASH_OIL_BUCKET);
 
         trimmedArmorItem(ModItems.HEMP_HELMET_RED);
diff --git a/src/main/java/net/micaxs/smokeleafindustry/item/ModCreativeModTabs.java b/src/main/java/net/micaxs/smokeleafindustry/item/ModCreativeModTabs.java
@@ -93,6 +93,14 @@ public class ModCreativeModTabs {
                         pOutput.accept(ModItems.HASH_BROWNIE.get());
                         pOutput.accept(ModItems.WEED_COOKIE.get());
 
+                        pOutput.accept(ModItems.WHITE_WIDOW_GUMMY.get());
+                        pOutput.accept(ModItems.SOUR_DIESEL_GUMMY.get());
+                        pOutput.accept(ModItems.PURPLE_HAZE_GUMMY.get());
+                        pOutput.accept(ModItems.LEMON_HAZE_GUMMY.get());
+                        pOutput.accept(ModItems.BUBBLE_KUSH_GUMMY.get());
+                        pOutput.accept(ModItems.BLUE_ICE_GUMMY.get());
+                        pOutput.accept(ModItems.BUBBLEGUM_GUMMY.get());
+
                         pOutput.accept(ModBlocks.HEMP_STONE.get());
                         pOutput.accept(ModBlocks.HEMP_PLANKS.get());
                         pOutput.accept(ModBlocks.HEMP_WOOL.get());
diff --git a/src/main/java/net/micaxs/smokeleafindustry/item/ModFoods.java b/src/main/java/net/micaxs/smokeleafindustry/item/ModFoods.java
@@ -20,4 +20,9 @@ public class ModFoods {
             .saturationMod(0.1f)
             .fast()
             .build();
+    public static final FoodProperties WEED_GUMMY = new FoodProperties.Builder()
+            .alwaysEat()
+            .nutrition(4)
+            .saturationMod(0.4f)
+            .build();
 }
diff --git a/src/main/java/net/micaxs/smokeleafindustry/item/ModItems.java b/src/main/java/net/micaxs/smokeleafindustry/item/ModItems.java
@@ -105,11 +105,27 @@ public class ModItems {
     public static final RegistryObject<Item> JOINT = ITEMS.register("joint",
             () -> new WeedDerivedItem(new Item.Properties().stacksTo(64), 1, 0.5f, UseAnim.BOW));
     public static final RegistryObject<Item> HERB_CAKE = ITEMS.register("herb_cake",
-            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.HERB_CAKE), 1.5f, 1f, UseAnim.EAT));
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.HERB_CAKE), 1.5f, 1f, UseAnim.EAT, 50));
     public static final RegistryObject<Item> HASH_BROWNIE = ITEMS.register("hash_brownie",
             () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.HASH_BROWNIE), 1.5f, 1f, UseAnim.EAT));
     public static final RegistryObject<Item> WEED_COOKIE = ITEMS.register("weed_cookie",
-            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_COOKIE), 0.125f, 0.25f, UseAnim.EAT));
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_COOKIE), 0.125f, 0.25f, UseAnim.EAT, 15));
+
+    // Gummies
+    public static final RegistryObject<Item> WHITE_WIDOW_GUMMY = ITEMS.register("white_widow_gummy",
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_GUMMY), 1.5f, 1f, UseAnim.EAT, 40));
+    public static final RegistryObject<Item> SOUR_DIESEL_GUMMY = ITEMS.register("sour_diesel_gummy",
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_GUMMY), 1.5f, 1f, UseAnim.EAT, 40));
+    public static final RegistryObject<Item> PURPLE_HAZE_GUMMY = ITEMS.register("purple_haze_gummy",
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_GUMMY), 1.5f, 1f, UseAnim.EAT, 40));
+    public static final RegistryObject<Item> LEMON_HAZE_GUMMY = ITEMS.register("lemon_haze_gummy",
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_GUMMY), 1.5f, 1f, UseAnim.EAT, 40));
+    public static final RegistryObject<Item> BUBBLE_KUSH_GUMMY = ITEMS.register("bubble_kush_gummy",
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_GUMMY), 1.5f, 1f, UseAnim.EAT, 40));
+    public static final RegistryObject<Item> BLUE_ICE_GUMMY = ITEMS.register("blue_ice_gummy",
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_GUMMY), 1.5f, 1f, UseAnim.EAT, 40));
+    public static final RegistryObject<Item> BUBBLEGUM_GUMMY = ITEMS.register("bubblegum_gummy",
+            () -> new WeedDerivedItem(new Item.Properties().food(ModFoods.WEED_GUMMY), 1.5f, 1f, UseAnim.EAT, 40));
 
     /* Other Items */
     public static final RegistryObject<Item> HASH_OIL_BUCKET = ITEMS.register("hash_oil_bucket",
diff --git a/src/main/java/net/micaxs/smokeleafindustry/item/custom/WeedDerivedItem.java b/src/main/java/net/micaxs/smokeleafindustry/item/custom/WeedDerivedItem.java
@@ -28,12 +28,18 @@ public class WeedDerivedItem extends Item {
     private final float effectDurationMultiplier;
     private final float stonedChance;
     private final UseAnim useAnimation;
+    private final int useDuration;
 
     public WeedDerivedItem(Properties pProperties, float effectDurationMultiplier, float stonedChance, UseAnim useAnimation) {
+        this(pProperties, effectDurationMultiplier, stonedChance, useAnimation, 20);
+    }
+
+    public WeedDerivedItem(Properties pProperties, float effectDurationMultiplier, float stonedChance, UseAnim useAnimation, int useDuration) {
         super(pProperties);
         this.effectDurationMultiplier = effectDurationMultiplier;
         this.stonedChance = stonedChance;
         this.useAnimation = useAnimation;
+        this.useDuration = useDuration;
     }
 
     @Override
@@ -43,7 +49,7 @@ public UseAnim getUseAnimation(ItemStack pStack) {
 
     @Override
     public int getUseDuration(ItemStack pStack) {
-        return 20;
+        return this.useDuration;
     }
 
     @Override
diff --git a/src/main/resources/assets/smokeleafindustry/lang/en_us.json b/src/main/resources/assets/smokeleafindustry/lang/en_us.json
@@ -55,6 +55,14 @@
   "item.smokeleafindustry.hash_brownie": "Hash Brownie",
   "item.smokeleafindustry.weed_cookie": "Cookie",
 
+  "item.smokeleafindustry.white_widow_gummy": "Gummy",
+  "item.smokeleafindustry.sour_diesel_gummy": "Gummy",
+  "item.smokeleafindustry.purple_haze_gummy": "Gummy",
+  "item.smokeleafindustry.lemon_haze_gummy": "Gummy",
+  "item.smokeleafindustry.bubble_kush_gummy": "Gummy",
+  "item.smokeleafindustry.blue_ice_gummy": "Gummy",
+  "item.smokeleafindustry.bubblegum_gummy": "Gummy",
+
   "item.smokeleafindustry.hemp_helmet_red": "Red Hemp Baja Hat",
   "item.smokeleafindustry.hemp_chestplate_red": "Red Hemp Baja Shirt",
   "item.smokeleafindustry.hemp_leggings_red": "Red Hemp Baja Pants",
diff --git a/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/bg_gummy_recipe.json b/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/bg_gummy_recipe.json
@@ -0,0 +1,18 @@
+{
+  "type": "smokeleafindustry:shapeless_weed_crafting",
+  "ingredients": [
+    {
+      "item": "minecraft:sugar"
+    }, {
+      "item": "minecraft:glow_berries"
+    }, {
+      "item": "minecraft:honey_bottle"
+    }, {
+      "tag": "smokeleafindustry:bubblegum_strain"
+    }
+  ],
+  "result": {
+    "item": "smokeleafindustry:bubblegum_gummy",
+    "count": 1
+  }
+}
diff --git a/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/bi_gummy_recipe.json b/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/bi_gummy_recipe.json
@@ -0,0 +1,18 @@
+{
+  "type": "smokeleafindustry:shapeless_weed_crafting",
+  "ingredients": [
+    {
+      "item": "minecraft:sugar"
+    }, {
+      "item": "minecraft:glow_berries"
+    }, {
+      "item": "minecraft:honey_bottle"
+    }, {
+      "tag": "smokeleafindustry:blue_ice_strain"
+    }
+  ],
+  "result": {
+    "item": "smokeleafindustry:blue_ice_gummy",
+    "count": 1
+  }
+}
diff --git a/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/bk_gummy_recipe.json b/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/bk_gummy_recipe.json
@@ -0,0 +1,18 @@
+{
+  "type": "smokeleafindustry:shapeless_weed_crafting",
+  "ingredients": [
+    {
+      "item": "minecraft:sugar"
+    }, {
+      "item": "minecraft:glow_berries"
+    }, {
+      "item": "minecraft:honey_bottle"
+    }, {
+      "tag": "smokeleafindustry:bubble_kush_strain"
+    }
+  ],
+  "result": {
+    "item": "smokeleafindustry:bubble_kush_gummy",
+    "count": 1
+  }
+}
diff --git a/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/lh_cookie_recipe.json b/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/lh_cookie_recipe.json
@@ -0,0 +1,18 @@
+{
+  "type": "smokeleafindustry:shapeless_weed_crafting",
+  "ingredients": [
+    {
+      "item": "minecraft:wheat"
+    }, {
+      "item": "minecraft:cocoa_beans"
+    }, {
+      "item": "minecraft:wheat"
+    }, {
+      "tag": "smokeleafindustry:lemon_haze_strain"
+    }
+  ],
+  "result": {
+    "item": "smokeleafindustry:weed_cookie",
+    "count": 8
+  }
+}
diff --git a/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/lh_gummy_recipe.json b/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/lh_gummy_recipe.json
@@ -0,0 +1,18 @@
+{
+  "type": "smokeleafindustry:shapeless_weed_crafting",
+  "ingredients": [
+    {
+      "item": "minecraft:sugar"
+    }, {
+      "item": "minecraft:glow_berries"
+    }, {
+      "item": "minecraft:honey_bottle"
+    }, {
+      "tag": "smokeleafindustry:lemon_haze_strain"
+    }
+  ],
+  "result": {
+    "item": "smokeleafindustry:lemon_haze_gummy",
+    "count": 1
+  }
+}
diff --git a/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/ph_gummy_recipe.json b/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/ph_gummy_recipe.json
@@ -0,0 +1,18 @@
+{
+  "type": "smokeleafindustry:shapeless_weed_crafting",
+  "ingredients": [
+    {
+      "item": "minecraft:sugar"
+    }, {
+      "item": "minecraft:glow_berries"
+    }, {
+      "item": "minecraft:honey_bottle"
+    }, {
+      "tag": "smokeleafindustry:purple_haze_strain"
+    }
+  ],
+  "result": {
+    "item": "smokeleafindustry:purple_haze_gummy",
+    "count": 1
+  }
+}
diff --git a/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/sd_gummy_recipe.json b/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/sd_gummy_recipe.json
@@ -0,0 +1,18 @@
+{
+  "type": "smokeleafindustry:shapeless_weed_crafting",
+  "ingredients": [
+    {
+      "item": "minecraft:sugar"
+    }, {
+      "item": "minecraft:glow_berries"
+    }, {
+      "item": "minecraft:honey_bottle"
+    }, {
+      "tag": "smokeleafindustry:sour_diesel_strain"
+    }
+  ],
+  "result": {
+    "item": "smokeleafindustry:sour_diesel_gummy",
+    "count": 1
+  }
+}
diff --git a/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/ww_gummy_recipe.json b/src/main/resources/data/smokeleafindustry/recipes/shapeless_weed_crafting/weed_gummies/ww_gummy_recipe.json
@@ -0,0 +1,18 @@
+{
+  "type": "smokeleafindustry:shapeless_weed_crafting",
+  "ingredients": [
+    {
+      "item": "minecraft:sugar"
+    }, {
+      "item": "minecraft:glow_berries"
+    }, {
+      "item": "minecraft:honey_bottle"
+    }, {
+      "tag": "smokeleafindustry:white_widow_strain"
+    }
+  ],
+  "result": {
+    "item": "smokeleafindustry:white_widow_gummy",
+    "count": 1
+  }
+}
