Added Nebu Hammer

Added Quail meat
TeamMetallurgy · Nov 28, 2020 · 06b1982 · 06b1982
1 parent 28771c9
commit 06b1982
Show file tree

Hide file tree

Showing 22 changed files with 121 additions and 16 deletions.
diff --git a/src/main/java/com/teammetallurgy/atum/init/AtumItems.java b/src/main/java/com/teammetallurgy/atum/init/AtumItems.java
@@ -87,6 +87,7 @@ public class AtumItems {
     public static final Item LIMESTONE_AXE = registerItem(new AxeItem(AtumMats.LIMESTONE, 7.0F, -3.2F, new Item.Properties().group(Atum.GROUP)), "limestone_axe");
     public static final Item LIMESTONE_SWORD = registerItem(new SwordItem(AtumMats.LIMESTONE, 3, -2.4F, new Item.Properties().group(Atum.GROUP)), "limestone_sword");
     public static final Item LIMESTONE_HOE = registerItem(new HoeItem(AtumMats.LIMESTONE, -1, -1.8F, new Item.Properties().group(Atum.GROUP)), "limestone_hoe");
+    public static final Item NEBU_HAMMER = registerItem(new SimpleItem(), "nebu_hammer");
     public static final Item DAGGER_IRON = registerItem(new DaggerItem(ItemTier.IRON), "iron_dagger");
     public static final Item POISON_DAGGER = registerItem(new PoisonDaggerItem(), "dagger_poison");
     public static final Item SCIMITAR_IRON = registerItem(new SwordItem(ItemTier.IRON, 3, -2.4F, new Item.Properties().group(Atum.GROUP)), "iron_scimitar");
@@ -194,8 +195,10 @@ public class AtumItems {
     public static final Item EMMER_DOUGH = registerItem(new SimpleItem(), "emmer_dough");
     public static final Item EMMER_BREAD = registerItem(new Item(new Item.Properties().food(AtumFoods.EMMER_BREAD).group(Atum.GROUP)), "emmer_bread");
     public static final Item QUAIL_EGG = registerItem(new QuailEggItem(), "quail_egg");
-    public static final Item CAMEL_RAW = registerItem(new Item(new Item.Properties().food(AtumFoods.CAMEL_RAW).group(Atum.GROUP)), "camel_raw");
+    public static final Item CAMEL_RAW = registerItem(new Item(new Item.Properties().food(AtumFoods.CAMEL_RAW).group(Atum.GROUP)), "camel");
     public static final Item CAMEL_COOKED = registerItem(new Item(new Item.Properties().food(AtumFoods.CAMEL_COOKED).group(Atum.GROUP)), "camel_cooked");
+    public static final Item QUAIL_RAW = registerItem(new Item(new Item.Properties().food(AtumFoods.QUAIL_RAW).group(Atum.GROUP)), "quail");
+    public static final Item QUAIL_COOKED = registerItem(new Item(new Item.Properties().food(AtumFoods.QUAIL_COOKED).group(Atum.GROUP)), "quail_cooked");
     public static final Item DATE = registerItem(new Item(new Item.Properties().food(Foods.APPLE).group(Atum.GROUP)), "date");
     public static final Item GLISTERING_DATE = registerItem(new SimpleItem(), "glistering_date");
     public static final Item GOLDEN_DATE = registerItem(new Item(new Item.Properties().food(AtumFoods.GOLDEN_DATE).group(Atum.GROUP)), "golden_date");
@@ -216,8 +219,10 @@ public static class AtumFoods {
         public static final Food EMMER_BREAD = new Food.Builder().hunger(4).saturation(0.9F).build();
         public static final Food CAMEL_RAW = new Food.Builder().hunger(3).saturation(0.2F).meat().build();
         public static final Food CAMEL_COOKED = new Food.Builder().hunger(9).saturation(0.7F).meat().build();
-        public static final Food GOLDEN_DATE = new Food.Builder().hunger(5).saturation(1.5F).effect(new EffectInstance(Effects.REGENERATION, 100, 1), 1.0F).effect(new EffectInstance(Effects.ABSORPTION, 2400, 0), 1.0F).setAlwaysEdible().build();
-        public static final Food ENCHANTED_GOLDEN_DATE = new Food.Builder().hunger(5).saturation(1.5F).effect(new EffectInstance(Effects.REGENERATION, 400, 1), 1.0F).effect(new EffectInstance(Effects.RESISTANCE, 6000, 0), 1.0F).effect(new EffectInstance(Effects.FIRE_RESISTANCE, 6000, 0), 1.0F).effect(new EffectInstance(Effects.ABSORPTION, 2400, 3), 1.0F).setAlwaysEdible().build();
+        public static final Food QUAIL_RAW = new Food.Builder().hunger(1).saturation(0.4F).meat().build();
+        public static final Food QUAIL_COOKED = new Food.Builder().hunger(5).saturation(0.8F).meat().build();
+        public static final Food GOLDEN_DATE = new Food.Builder().hunger(5).saturation(1.5F).effect(() -> new EffectInstance(Effects.REGENERATION, 100, 1), 1.0F).effect(new EffectInstance(Effects.ABSORPTION, 2400, 0), 1.0F).setAlwaysEdible().build();
+        public static final Food ENCHANTED_GOLDEN_DATE = new Food.Builder().hunger(5).saturation(1.5F).effect(() -> new EffectInstance(Effects.REGENERATION, 400, 1), 1.0F).effect(() -> new EffectInstance(Effects.RESISTANCE, 6000, 0), 1.0F).effect(() -> new EffectInstance(Effects.FIRE_RESISTANCE, 6000, 0), 1.0F).effect(() -> new EffectInstance(Effects.ABSORPTION, 2400, 3), 1.0F).setAlwaysEdible().build();
         public static final Food CRUNCHY_SCARAB = new Food.Builder().hunger(3).saturation(0.1F).meat().build();
         public static final Food CRUNCHY_GOLD_SCARAB = new Food.Builder().hunger(6).saturation(1.3F).meat().build();
     }

diff --git a/src/main/resources/assets/atum/lang/en_us.json b/src/main/resources/assets/atum/lang/en_us.json
@@ -501,6 +501,7 @@
   "item.atum.limestone_axe": "Limestone Axe",
   "item.atum.limestone_sword": "Limestone Sword",
   "item.atum.limestone_hoe": "Limestone Hoe",
+  "item.atum.nebu_hammer": "Nebu Hammer",
   "item.atum.mummy_helmet": "Mummy Helmet",
   "item.atum.mummy_chest": "Mummy Chestplate",
   "item.atum.mummy_legs": "Mummy Leggings",
@@ -546,8 +547,10 @@
   "item.atum.emmer_dough": "Emmer Dough",
   "item.atum.emmer_flour": "Emmer Flour",
   "item.atum.emmer_bread": "Emmer Bread",
-  "item.atum.camel_raw": "Raw Camel",
+  "item.atum.camel": "Raw Camel",
   "item.atum.camel_cooked": "Cooked Camel",
+  "item.atum.quail": "Raw Quail",
+  "item.atum.quail_cooked": "Cooked Quail",
   "item.atum.quail_egg": "Quail Egg",
   "item.atum.fish_forsaken": "Forsaken Fish",
   "item.atum.fish_mummified": "Mummified Fish",
@@ -632,7 +635,7 @@
   "item.atum.crunchy_scarab": "Crunchy Scarab",
   "item.atum.crunchy_golden_scarab": "Crunchy Golden Scarab",
 
-  "_comment": "Artifacts",
+  "_comment": "Tooltips",
   "atum.gebs_grounding.tooltip.line1": "Slows enemies",
   "atum.gebs_grounding.tooltip.line2": "on hit",
   "atum.gebs_grounding.tooltip.title": "Pinning Arrow",
@@ -798,7 +801,11 @@
   "atum.anputs_hunger.tooltip.line2": "but feel fuller when you strike enemies",
   "atum.anputs_hunger.tooltip.title": "Feast & Famine",
 
-  "_comment": "Misc",
+  "atum.nebu_hammer.tooltip.line1": "Can break",
+  "atum.nebu_hammer.tooltip.line2": "godforged blocks",
+  "atum.nebu_hammer.tooltip.title": "Godbreaker",
+
+  "_comment": "Misc Tooltip",
   "atum.tooltip.shift": "[SHIFT]",
   "atum.tooltip.minutes_remaining": "%d Minutes Remaining",
   "atum.tooltip.uses_remaining": "%d Uses Remaining",
@@ -891,7 +898,8 @@
 
   "_comment": "Biomes",
   "biome.atum.dead_oasis": "Dead Oasis",
-  "biome.atum.deadwood_forest": "Deadwood Forest",
+  "biome.atum.dense_woods": "Dense Woods",
+  "biome.atum.sparse_woods": "Sparse Woods",
   "biome.atum.dried_river": "Dried River",
   "biome.atum.limestone_crags": "Limestone Crags",
   "biome.atum.limestone_mountains": "Limestone Mountains",

diff --git a/src/main/resources/assets/atum/lang/fr_fr.json b/src/main/resources/assets/atum/lang/fr_fr.json
@@ -427,7 +427,7 @@
   "item.atum.emmer_dough": "Pâte d'amidonnier",
   "item.atum.emmer_flour": "Farine d'amidonnier",
   "item.atum.emmer_bread": "Pain d'amidonnier",
-  "item.atum.camel_raw": "Chameau cru",
+  "item.atum.camel": "Chameau cru",
   "item.atum.camel_cooked": "Chameau cuit",
   "item.atum.fish_forsaken": "Poisson Forsaken",
   "item.atum.fish_mummified": "Poisson momifié",

diff --git a/src/main/resources/assets/atum/lang/ru_ru.json b/src/main/resources/assets/atum/lang/ru_ru.json
@@ -427,7 +427,7 @@
   "item.atum.emmer_dough": "Тесто из двузерновой пшеницы",
   "item.atum.emmer_flour": "Мука из двузерновой пшеницы",
   "item.atum.emmer_bread": "Хлеб из двузерновой пшеницы",
-  "item.atum.camel_raw": "Сырое мясо верблюда",
+  "item.atum.camel": "Сырое мясо верблюда",
   "item.atum.camel_cooked": "Приготовленное мясо верблюда",
   "item.atum.fish_forsaken": "Забытая рыба",
   "item.atum.fish_mummified": "Мумифицированная рыба",

diff --git a/src/main/resources/assets/atum/lang/zh_cn.json b/src/main/resources/assets/atum/lang/zh_cn.json
@@ -427,7 +427,7 @@
   "item.atum.emmer_dough": "小麦面团",
   "item.atum.emmer_flour": "小麦面粉",
   "item.atum.emmer_bread": "小麦面包",
-  "item.atum.camel_raw": "生骆驼肉",
+  "item.atum.camel": "生骆驼肉",
   "item.atum.camel_cooked": "熟骆驼肉",
   "item.atum.fish_forsaken": "被遗忘的鱼",
   "item.atum.fish_mummified": "木乃伊鱼",

diff --git a/...es/assets/atum/models/item/camel_raw.json → ...ources/assets/atum/models/item/camel.json b/...es/assets/atum/models/item/camel_raw.json → ...ources/assets/atum/models/item/camel.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "atum:item/camel_raw"
+    "layer0": "atum:item/camel"
   }
 }
diff --git a/src/main/resources/assets/atum/models/item/nebu_hammer.json b/src/main/resources/assets/atum/models/item/nebu_hammer.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/handheld",
+  "textures": {
+    "layer0": "atum:item/nebu_hammer"
+  }
+}
diff --git a/src/main/resources/assets/atum/models/item/quail.json b/src/main/resources/assets/atum/models/item/quail.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "atum:item/quail"
+  }
+}
diff --git a/src/main/resources/assets/atum/models/item/quail_cooked.json b/src/main/resources/assets/atum/models/item/quail_cooked.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "atum:item/quail_cooked"
+  }
+}
diff --git a/...s/assets/atum/textures/item/camel_raw.png → ...urces/assets/atum/textures/item/camel.png b/...s/assets/atum/textures/item/camel_raw.png → ...urces/assets/atum/textures/item/camel.png
diff --git a/...s/assets/atum/textures/item/quail_raw.png → ...urces/assets/atum/textures/item/quail.png b/...s/assets/atum/textures/item/quail_raw.png → ...urces/assets/atum/textures/item/quail.png
diff --git a/src/main/resources/assets/atum/textures/models/armor/atem_armor.png b/src/main/resources/assets/atum/textures/models/armor/atem_armor.png
diff --git a/src/main/resources/data/atum/loot_tables/entities/camel.json b/src/main/resources/data/atum/loot_tables/entities/camel.json
@@ -63,7 +63,7 @@
               }
             }
           ],
-          "name": "atum:camel_raw"
+          "name": "atum:camel"
         }
       ]
     }

diff --git a/src/main/resources/data/atum/loot_tables/entities/quail.json b/src/main/resources/data/atum/loot_tables/entities/quail.json
@@ -24,6 +24,33 @@
             }
           ],
           "name": "minecraft:feather"
+        },
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:furnace_smelt",
+              "conditions": [
+                {
+                  "condition": "minecraft:entity_properties",
+                  "predicate": {
+                    "flags": {
+                      "is_on_fire": true
+                    }
+                  },
+                  "entity": "this"
+                }
+              ]
+            },
+            {
+              "function": "minecraft:looting_enchant",
+              "count": {
+                "min": 0.0,
+                "max": 1.0
+              }
+            }
+          ],
+          "name": "atum:quail"
         }
       ]
     }

diff --git a/src/main/resources/data/atum/recipes/cooked_camel.json b/src/main/resources/data/atum/recipes/cooked_camel.json
@@ -1,7 +1,7 @@
 {
   "type": "minecraft:smelting",
   "ingredient": {
-    "item": "atum:camel_raw"
+    "item": "atum:camel"
   },
   "result": "atum:camel_cooked",
   "experience": 0.35,

diff --git a/src/main/resources/data/atum/recipes/cooked_camel_from_campfire_cooking.json b/src/main/resources/data/atum/recipes/cooked_camel_from_campfire_cooking.json
@@ -1,7 +1,7 @@
 {
   "type": "minecraft:campfire_cooking",
   "ingredient": {
-    "item": "atum:camel_raw"
+    "item": "atum:camel"
   },
   "result": "atum:camel_cooked",
   "experience": 0.35,

diff --git a/src/main/resources/data/atum/recipes/cooked_camel_from_smoking.json b/src/main/resources/data/atum/recipes/cooked_camel_from_smoking.json
@@ -1,7 +1,7 @@
 {
   "type": "minecraft:smoking",
   "ingredient": {
-    "item": "atum:camel_raw"
+    "item": "atum:camel"
   },
   "result": "atum:camel_cooked",
   "experience": 0.35,

diff --git a/src/main/resources/data/atum/recipes/cooked_quail.json b/src/main/resources/data/atum/recipes/cooked_quail.json
@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smelting",
+  "ingredient": {
+    "item": "atum:quail"
+  },
+  "result": "atum:quail_cooked",
+  "experience": 0.35,
+  "cookingtime": 200
+}
diff --git a/src/main/resources/data/atum/recipes/cooked_quail_from_campfire_cooking.json b/src/main/resources/data/atum/recipes/cooked_quail_from_campfire_cooking.json
@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:campfire_cooking",
+  "ingredient": {
+    "item": "atum:quail"
+  },
+  "result": "atum:quail_cooked",
+  "experience": 0.35,
+  "cookingtime": 600
+}
diff --git a/src/main/resources/data/atum/recipes/cooked_quail_from_smoking.json b/src/main/resources/data/atum/recipes/cooked_quail_from_smoking.json
@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smoking",
+  "ingredient": {
+    "item": "atum:quail"
+  },
+  "result": "atum:quail_cooked",
+  "experience": 0.35,
+  "cookingtime": 100
+}
diff --git a/src/main/resources/data/atum/recipes/nebu_hammer.json b/src/main/resources/data/atum/recipes/nebu_hammer.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "NNN",
+    " S ",
+    " S "
+  ],
+  "key": {
+    "S": {
+      "tag": "forge:rods/wooden"
+    },
+    "N": {
+      "tag": "forge:ingots/nebu"
+    }
+  },
+  "result": {
+    "item": "atum:nebu_hammer"
+  }
+}
diff --git a/src/main/resources/data/atum/tags/items/tooltip.json b/src/main/resources/data/atum/tags/items/tooltip.json
@@ -37,6 +37,7 @@
     "atum:shus_swiftness",
     "atum:tefnuts_blessing",
     "atum:tefnuts_call",
-    "atum:tefnuts_rain"
+    "atum:tefnuts_rain",
+    "atum:nebu_hammer"
   ]
 }