Merge pull request AechtRob#2 from nqwebasaurus/master

Skewer
hampop · Jan 25, 2023 · 6776a41 · 6776a41
2 parents 71e36df + 1f050a0
commit 6776a41
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 1 deletion.
diff --git a/src/main/java/net/prehistoricdiner/RegistrationHandler.java b/src/main/java/net/prehistoricdiner/RegistrationHandler.java
@@ -17,7 +17,10 @@ public RegistrationHandler() {
     @SubscribeEvent
     public static void registerItems(RegistryEvent.Register<Item> event) {
         Item[] items = new Item[]{
-                ((Item)(new ItemFood(2, 2F, false)).setRegistryName("prehistoricdiner", "food_item")).setTranslationKey("prehistoricdiner.food_item").setCreativeTab(PrehistoricDiner.CREATIVE_TAB),
+                ((Item)(new ItemFood(2, 1F, false)).setRegistryName("prehistoricdiner", "food_item")).setTranslationKey("prehistoricdiner.food_item").setCreativeTab(PrehistoricDiner.CREATIVE_TAB),
+                ((Item)(new ItemFood(3, 1F, false)).setRegistryName("prehistoricdiner", "grilled_fish_skewer")).setTranslationKey("prehistoricdiner.grilled_fish_skewer").setCreativeTab(PrehistoricDiner.CREATIVE_TAB),
+
+
                 ((Item)(new ItemDamageableCrafted()).setRegistryName("prehistoricdiner", "skillet")).setTranslationKey("prehistoricdiner.skillet").setCreativeTab(PrehistoricDiner.CREATIVE_TAB),
                 ((Item)(new ItemDamageableCrafted()).setRegistryName("prehistoricdiner", "pot")).setTranslationKey("prehistoricdiner.pot").setCreativeTab(PrehistoricDiner.CREATIVE_TAB),
                 ((Item)(new ItemDamageableCrafted()).setRegistryName("prehistoricdiner", "knife")).setTranslationKey("prehistoricdiner.knife").setCreativeTab(PrehistoricDiner.CREATIVE_TAB),

diff --git a/src/main/java/net/prehistoricdiner/client/ModelRegistrationHandler.java b/src/main/java/net/prehistoricdiner/client/ModelRegistrationHandler.java
@@ -20,6 +20,7 @@ public ModelRegistrationHandler() {
     @SubscribeEvent
     public static void registerModels(ModelRegistryEvent event) {
         registerModel(ModItems.food_item, 0);
+        registerModel(ModItems.grilled_fish_skewer, 0);
         registerModel(ModItems.skillet, 0);
         registerModel(ModItems.pot, 0);
         registerModel(ModItems.grinder, 0);

diff --git a/src/main/java/net/prehistoricdiner/init/ModItems.java b/src/main/java/net/prehistoricdiner/init/ModItems.java
@@ -6,6 +6,7 @@
 @ObjectHolder("prehistoricdiner")
 public class ModItems {
     public static final Item food_item = null;
+    public static final Item grilled_fish_skewer = null;
     public static final Item skillet = null;
     public static final Item pot = null;
     public static final Item grinder = null;

diff --git a/src/main/resources/assets/prehistoricdiner/lang/en_us.lang b/src/main/resources/assets/prehistoricdiner/lang/en_us.lang
@@ -1,6 +1,7 @@
 itemGroup.prehistoricdiner=The Prehistoric Diner
 
 item.prehistoricdiner.food_item.name=Food decription here
+item.prehistoricdiner.grilled_fish_skewer.name=Grilled Fish Skewer
 
 item.prehistoricdiner.ladle.name=Ladle
 item.prehistoricdiner.knife.name=Kitchen Knife

diff --git a/src/main/resources/assets/prehistoricdiner/models/item/grilled_fish_skewer.json b/src/main/resources/assets/prehistoricdiner/models/item/grilled_fish_skewer.json
@@ -0,0 +1,4 @@
+{"parent": "item/generated", "textures": {"layer0": "prehistoricdiner:items/grilled_fish_skewer"}}
+
+w
+
diff --git a/src/main/resources/assets/prehistoricdiner/recipes/grilled_fish_skewer.json b/src/main/resources/assets/prehistoricdiner/recipes/grilled_fish_skewer.json
@@ -0,0 +1,27 @@
+{
+  "group": "prehistoricdiner",
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " 1 ",
+    " 4 ",
+    " 7 "
+  ],
+  "key": {
+    "1": {
+      "type": "forge:ore_dict",
+      "ore": "listAllfishraw"
+
+    },
+    "4": {
+      "item": "lepidodendron:red_leafy_algae"
+    },
+    "7": {
+      "type": "forge:ore_dict",
+      "ore": "stickWood"
+    }
+  },
+  "result": {
+    "item": "prehistoricdiner:grilled_fish_skewer",
+    "count": 1
+  }
+}
diff --git a/src/main/resources/assets/prehistoricdiner/textures/items/grilled_fish_skewer.png b/src/main/resources/assets/prehistoricdiner/textures/items/grilled_fish_skewer.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		{"parent": "item/generated", "textures": {"layer0": "prehistoricdiner:items/grilled_fish_skewer"}}

		w