Backported changes made in 1.16.1

gradle.properties

@@ -1,7 +1,7 @@
 minecraft_version=1.15.2
 forge_version=31.2.21
 mappings=20200621-1.15.1
-mod_version=2.0.16
+mod_version=2.0.20
 jei_version=6.0.2.6
 
 org.gradle.jvmargs=-Xmx4G

src/main/java/com/teammetallurgy/aquaculture/init/AquaItems.java

@@ -76,35 +76,35 @@ public class AquaItems {
     public static final Item SUSHI = register(new Item(new Item.Properties().group(Aquaculture.GROUP).food(AquaFoods.SUSHI)), "sushi");
 
     // Fish
-    public static final Item ATLANTIC_COD = FishRegistry.register(new SimpleItem(), "atlantic_cod");
-    public static final Item BLACKFISH = FishRegistry.register(new SimpleItem(), "blackfish");
-    public static final Item PACIFIC_HALIBUT = FishRegistry.register(new SimpleItem(), "pacific_halibut", FishType.HALIBUT);
-    public static final Item ATLANTIC_HALIBUT = FishRegistry.register(new SimpleItem(), "atlantic_halibut", FishType.HALIBUT);
-    public static final Item ATLANTIC_HERRING = FishRegistry.register(new SimpleItem(), "atlantic_herring", FishType.SMALL);
-    public static final Item PINK_SALMON = FishRegistry.register(new SimpleItem(), "pink_salmon");
-    public static final Item POLLOCK = FishRegistry.register(new SimpleItem(), "pollock");
-    public static final Item RAINBOW_TROUT = FishRegistry.register(new SimpleItem(), "rainbow_trout");
-    public static final Item BAYAD = FishRegistry.register(new SimpleItem(), "bayad", FishType.CATFISH);
-    public static final Item BOULTI = FishRegistry.register(new SimpleItem(), "boulti", FishType.SMALL);
-    public static final Item CAPITAINE = FishRegistry.register(new SimpleItem(), "capitaine");
-    public static final Item SYNODONTIS = FishRegistry.register(new SimpleItem(), "synodontis", FishType.SMALL);
-    public static final Item SMALLMOUTH_BASS = FishRegistry.register(new SimpleItem(), "smallmouth_bass");
-    public static final Item BLUEGILL = FishRegistry.register(new SimpleItem(), "bluegill", FishType.SMALL);
-    public static final Item BROWN_TROUT = FishRegistry.register(new SimpleItem(), "brown_trout");
-    public static final Item CARP = FishRegistry.register(new SimpleItem(), "carp", FishType.LARGE);
-    public static final Item CATFISH = FishRegistry.register(new SimpleItem(), "catfish", FishType.CATFISH);
-    public static final Item GAR = FishRegistry.register(new SimpleItem(), "gar", FishType.LONGNOSE);
+    public static final Item ATLANTIC_COD = FishRegistry.register(new FishItem(), "atlantic_cod");
+    public static final Item BLACKFISH = FishRegistry.register(new FishItem(), "blackfish");
+    public static final Item PACIFIC_HALIBUT = FishRegistry.register(new FishItem(), "pacific_halibut", FishType.HALIBUT);
+    public static final Item ATLANTIC_HALIBUT = FishRegistry.register(new FishItem(), "atlantic_halibut", FishType.HALIBUT);
+    public static final Item ATLANTIC_HERRING = FishRegistry.register(new FishItem(), "atlantic_herring", FishType.SMALL);
+    public static final Item PINK_SALMON = FishRegistry.register(new FishItem(), "pink_salmon");
+    public static final Item POLLOCK = FishRegistry.register(new FishItem(), "pollock");
+    public static final Item RAINBOW_TROUT = FishRegistry.register(new FishItem(), "rainbow_trout");
+    public static final Item BAYAD = FishRegistry.register(new FishItem(), "bayad", FishType.CATFISH);
+    public static final Item BOULTI = FishRegistry.register(new FishItem(), "boulti", FishType.SMALL);
+    public static final Item CAPITAINE = FishRegistry.register(new FishItem(), "capitaine");
+    public static final Item SYNODONTIS = FishRegistry.register(new FishItem(), "synodontis", FishType.SMALL);
+    public static final Item SMALLMOUTH_BASS = FishRegistry.register(new FishItem(), "smallmouth_bass");
+    public static final Item BLUEGILL = FishRegistry.register(new FishItem(), "bluegill", FishType.SMALL);
+    public static final Item BROWN_TROUT = FishRegistry.register(new FishItem(), "brown_trout");
+    public static final Item CARP = FishRegistry.register(new FishItem(), "carp", FishType.LARGE);
+    public static final Item CATFISH = FishRegistry.register(new FishItem(), "catfish", FishType.CATFISH);
+    public static final Item GAR = FishRegistry.register(new FishItem(), "gar", FishType.LONGNOSE);
     public static final Item MINNOW = FishRegistry.register(AquacultureAPI.createBait(50, 1, Aquaculture.GROUP), "minnow", FishType.SMALL);
-    public static final Item MUSKELLUNGE = FishRegistry.register(new SimpleItem(), "muskellunge", FishType.LONGNOSE);
-    public static final Item PERCH = FishRegistry.register(new SimpleItem(), "perch", FishType.SMALL);
-    public static final Item ARAPAIMA = FishRegistry.register(new SimpleItem(), "arapaima", FishType.LONGNOSE);
-    public static final Item PIRANHA = FishRegistry.register(new SimpleItem(), "piranha", FishType.SMALL);
-    public static final Item TAMBAQUI = FishRegistry.register(new SimpleItem(), "tambaqui", FishType.LARGE);
-    public static final Item BROWN_SHROOMA = FishRegistry.register(new SimpleItem(), "brown_shrooma", FishType.SMALL);
-    public static final Item RED_SHROOMA = FishRegistry.register(new SimpleItem(), "red_shrooma", FishType.SMALL);
-    public static final Item JELLYFISH = FishRegistry.register(new SimpleItem(), "jellyfish", FishType.JELLYFISH);
-    public static final Item RED_GROUPER = FishRegistry.register(new SimpleItem(), "red_grouper");
-    public static final Item TUNA = FishRegistry.register(new SimpleItem(), "tuna", FishType.LARGE);
+    public static final Item MUSKELLUNGE = FishRegistry.register(new FishItem(), "muskellunge", FishType.LONGNOSE);
+    public static final Item PERCH = FishRegistry.register(new FishItem(), "perch", FishType.SMALL);
+    public static final Item ARAPAIMA = FishRegistry.register(new FishItem(), "arapaima", FishType.LONGNOSE);
+    public static final Item PIRANHA = FishRegistry.register(new FishItem(), "piranha", FishType.SMALL);
+    public static final Item TAMBAQUI = FishRegistry.register(new FishItem(), "tambaqui", FishType.LARGE);
+    public static final Item BROWN_SHROOMA = FishRegistry.register(new FishItem(), "brown_shrooma", FishType.SMALL);
+    public static final Item RED_SHROOMA = FishRegistry.register(new FishItem(), "red_shrooma", FishType.SMALL);
+    public static final Item JELLYFISH = FishRegistry.register(new FishItem(), "jellyfish", FishType.JELLYFISH);
+    public static final Item RED_GROUPER = FishRegistry.register(new FishItem(), "red_grouper");
+    public static final Item TUNA = FishRegistry.register(new FishItem(), "tuna", FishType.LARGE);
     public static final Item FROG = register(new SimpleItem(), "frog");
     public static final Item LEECH = register(AquacultureAPI.createBait(35, 1, Aquaculture.GROUP), "leech");
     public static final Item GOLDFISH = register(new SimpleItem(), "goldfish");

src/main/java/com/teammetallurgy/aquaculture/item/FishItem.java

@@ -0,0 +1,12 @@
+package com.teammetallurgy.aquaculture.item;
+
+import net.minecraft.item.Food;
+import net.minecraft.item.Item;
+
+public class FishItem extends SimpleItem {
+    public static final Food RAW_FISH = (new Food.Builder()).hunger(1).saturation(0.1F).build();
+
+    public FishItem() {
+        super(new Item.Properties().food(RAW_FISH));
+    }
+}

src/main/java/com/teammetallurgy/aquaculture/item/SimpleItem.java

@@ -8,4 +8,8 @@ public class SimpleItem extends Item {
     public SimpleItem() {
         super(new Item.Properties().group(Aquaculture.GROUP));
     }
+
+    public SimpleItem(Item.Properties properties) {
+        super(properties.group(Aquaculture.GROUP));
+    }
 }