frybread and small changes

src/main/java/com/github/platymemo/alaskanativecraft/block/AlaskaBlocks.java

@@ -36,7 +36,7 @@ public class AlaskaBlocks {
 	public static final BlockEntityType<DryingRackBlockEntity> DRYING_RACK_BLOCK_ENTITY;
 
 	static {
-		WHALE_MEAT_BLOCK = register("whale_meat_block", new WhaleMeatBlock(QuiltBlockSettings.create().mapColor(MapColor.SNOW).requiresTool().sounds(BlockSoundGroup.HONEY).strength(1.0F, 1.0F)), ItemGroups.BUILDING_BLOCKS);
+		WHALE_MEAT_BLOCK = register("whale_meat_block", new WhaleMeatBlock(QuiltBlockSettings.create().mapColor(MapColor.SNOW).sounds(BlockSoundGroup.HONEY).strength(0.8F)), ItemGroups.BUILDING_BLOCKS);
 		BLUEBERRY_BUSH = register("blueberry_bush", new BushBlock(QuiltBlockSettings.create().mapColor(MapColor.PLANT).ticksRandomly().noCollision().sounds(BlockSoundGroup.SWEET_BERRY_BUSH)));
 		CLOUDBERRY_BUSH = register("cloudberry_bush", new CloudberryBushBlock(QuiltBlockSettings.create().mapColor(MapColor.PLANT).ticksRandomly().noCollision().sounds(BlockSoundGroup.SWEET_BERRY_BUSH)));
 		RASPBERRY_BUSH = register("raspberry_bush", new BushBlock(QuiltBlockSettings.create().mapColor(MapColor.PLANT).ticksRandomly().noCollision().sounds(BlockSoundGroup.SWEET_BERRY_BUSH)));

src/main/java/com/github/platymemo/alaskanativecraft/item/AlaskaItems.java

@@ -54,6 +54,8 @@ public class AlaskaItems {
 	public static final Item IVORY;
 	public static final Item FISH_STRIP;
 	public static final Item DRY_FISH;
+	public static final Item FRYBREAD;
+	public static final Item FRYBREAD_SUGAR;
 	public static final Item BLUEBERRIES;
 	public static final Item RASPBERRIES;
 	public static final Item SALMONBERRIES;
@@ -98,6 +100,9 @@ public class AlaskaItems {
 		FISH_STRIP = register("fish_strip", new Item(new QuiltItemSettings().food(new FoodComponent.Builder().hunger(1).saturationModifier(0.1F).snack().build())));
 		DRY_FISH = register("dry_fish", new Item(new QuiltItemSettings().food(new FoodComponent.Builder().hunger(1).saturationModifier(1F).snack().build())));
 
+		FRYBREAD = register("frybread", new Item(new QuiltItemSettings().food(new FoodComponent.Builder().hunger(3).saturationModifier(0.8F).build())));
+		FRYBREAD_SUGAR = register("frybread_sugar", new Item(new QuiltItemSettings().food(new FoodComponent.Builder().hunger(5).saturationModifier(0.8F).build())));
+
 		BLUEBERRIES = register("blueberries", new AliasedBlockItem(AlaskaBlocks.BLUEBERRY_BUSH, new QuiltItemSettings().food(new FoodComponent.Builder().hunger(2).saturationModifier(0.1F).snack().build())));
 		RASPBERRIES = register("raspberries", new AliasedBlockItem(AlaskaBlocks.RASPBERRY_BUSH, new QuiltItemSettings().food(new FoodComponent.Builder().hunger(2).saturationModifier(0.1F).snack().build())));
 		SALMONBERRIES = register("salmonberries", new AliasedBlockItem(AlaskaBlocks.SALMONBERRY_BUSH, new QuiltItemSettings().food(new FoodComponent.Builder().hunger(2).saturationModifier(0.1F).snack().build())));
@@ -106,7 +111,7 @@ public class AlaskaItems {
 
 		AKUTAQ = register("akutaq", new SuspiciousStewItem(new QuiltItemSettings().maxCount(1).food(new FoodComponent.Builder().hunger(4).saturationModifier(0.8F).build())));
 
-		ULU = register("ulu", new UluItem(new QuiltItemSettings().maxDamage(472)));
+		ULU = register("ulu", new UluItem(new QuiltItemSettings().maxDamage(472).recipeDamageRemainder()));
 
 		WOODEN_HARPOON = register("wooden_harpoon", new HarpoonItem(ToolMaterials.WOOD, 4.0F, -2.2F, () -> AlaskaEntities.WOODEN_HARPOON, new QuiltItemSettings()));
 		STONE_HARPOON = register("stone_harpoon", new HarpoonItem(ToolMaterials.STONE, 4.0F, -2.3F, () -> AlaskaEntities.STONE_HARPOON, new QuiltItemSettings()));

src/main/java/com/github/platymemo/alaskanativecraft/recipe/AlaskaRecipes.java

@@ -11,7 +11,6 @@
 
 public class AlaskaRecipes {
 	public static final SpecialRecipeSerializer<AkutaqRecipe> AKUTAQ = Registry.register(Registries.RECIPE_SERIALIZER, new Identifier(AlaskaNativeCraft.MOD_ID, "crafting_special_akutaq"), new SpecialRecipeSerializer<>(AkutaqRecipe::new));
-	public static final SpecialRecipeSerializer<FishStripRecipe> FISH_STRIP = Registry.register(Registries.RECIPE_SERIALIZER, new Identifier(AlaskaNativeCraft.MOD_ID, "crafting_special_fish_strip"), new SpecialRecipeSerializer<>(FishStripRecipe::new));
 
 	public static final RecipeType<DryingRecipe> DRYING = Registry.register(Registries.RECIPE_TYPE, new Identifier(AlaskaNativeCraft.MOD_ID, "drying"), new RecipeType<DryingRecipe>() {
 		public String toString() {

src/main/resources/assets/alaskanativecraft/lang/en_us.json

@@ -16,6 +16,8 @@
   "item.alaskanativecraft.ivory": "Ivory",
   "item.alaskanativecraft.fish_strip": "Fish Strips",
   "item.alaskanativecraft.dry_fish": "Dry Fish",
+  "item.alaskanativecraft.frybread": "Frybread",
+  "item.alaskanativecraft.frybread_sugar": "Frybread with Sugar",
   "item.alaskanativecraft.dry_seal": "Dried Seal",
   "item.alaskanativecraft.ulu": "Ulu",
   "item.alaskanativecraft.wooden_harpoon": "Wooden Harpoon",

src/main/resources/assets/alaskanativecraft/models/item/frybread.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "alaskanativecraft:item/frybread"
+  }
+}

src/main/resources/assets/alaskanativecraft/models/item/frybread_sugar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "alaskanativecraft:item/frybread_sugar"
+  }
+}

src/main/resources/data/alaskanativecraft/advancements/alaskanativecraft/find_fish_camp.json

@@ -26,7 +26,7 @@
     "frame": "task",
     "hidden": true,
     "icon": {
-      "item": "alaskanativecraft:kuspuk"
+      "item": "alaskanativecraft:kuspuk_body"
     },
     "show_toast": true,
     "title": {

src/main/resources/data/alaskanativecraft/loot_tables/blocks/whale_meat_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:alternatives",
@@ -19,9 +20,12 @@
                   }
                 },
                 {
-                  "function": "minecraft:apply_bonus",
                   "enchantment": "minecraft:fortune",
-                  "formula": "minecraft:ore_drops"
+                  "formula": "minecraft:uniform_bonus_count",
+                  "function": "minecraft:apply_bonus",
+                  "parameters": {
+                    "bonusMultiplier": 1
+                  }
                 },
                 {
                   "function": "minecraft:explosion_decay"
@@ -31,7 +35,7 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "item": "alaskanativecraft:ulu"
+                    "tag": "alaskanativecraft:ulus"
                   }
                 }
               ],

src/main/resources/data/alaskanativecraft/recipes/fish_strip.json

@@ -1,3 +1,15 @@
 {
-  "type": "alaskanativecraft:crafting_special_fish_strip"
-}
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "alaskanativecraft:ulu"
+    },
+    {
+      "tag": "alaskanativecraft:sliceable_fish"
+    }
+  ],
+  "result": {
+    "item": "alaskanativecraft:dry_fish",
+    "count": 3
+  }
+}

src/main/resources/data/alaskanativecraft/recipes/frybread.json

@@ -0,0 +1,14 @@
+{
+  "pattern": [
+    "##"
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:wheat"
+    }
+  },
+  "result": {
+    "item": "alaskanativecraft:frybread"
+  },
+  "type": "minecraft:crafting_shaped"
+}

src/main/resources/data/alaskanativecraft/recipes/frybread_sugar.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "alaskanativecraft:frybread"
+    },
+    {
+      "item": "minecraft:sugar"
+    }
+  ],
+  "result": {
+    "item": "alaskanativecraft:frybread_sugar"
+  }
+}

src/main/resources/data/alaskanativecraft/tags/blocks/mineable/ulu.json

@@ -6,6 +6,7 @@
     "minecraft:redstone_wire",
     "minecraft:tripwire",
     "#minecraft:leaves",
-    "#minecraft:wool"
+    "#minecraft:wool",
+    "#minecraft:wool_carpets"
   ]
 }