Skip to content

Commit

Permalink
Implement different raw fish food values, depending on fish. Closes #401
Browse files Browse the repository at this point in the history
  • Loading branch information
@GirafiStudios
GirafiStudios committed May 19, 2023
1 parent e4423ca commit 39a777a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 27 deletions.
4 changes: 0 additions & 4 deletions src/main/java/com/teammetallurgy/aquaculture/api/fish/FishData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ public List<Item> getFish() {
return new ArrayList<>(WEIGHT_MIN.keySet());
}

public void add(Item fish, double min, double max) {
this.add(fish, min, max, 1);
}

public void add(Item fish, double min, double max, int filletAmount) {
this.addWeight(fish, min, max);
if (filletAmount > 0) {
Expand Down
30 changes: 15 additions & 15 deletions src/main/java/com/teammetallurgy/aquaculture/init/AquaItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,35 +70,35 @@ public class AquaItems {
public static final RegistryObject<Item> SUSHI = registerWithTab(() -> new Item(new Item.Properties().food(AquaFoods.SUSHI)), "sushi");

// Fish
public static final RegistryObject<Item> ATLANTIC_COD = FishRegistry.register(FishItem::new, "atlantic_cod");
public static final RegistryObject<Item> ATLANTIC_COD = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "atlantic_cod");
public static final RegistryObject<Item> BLACKFISH = FishRegistry.register(FishItem::new, "blackfish");
public static final RegistryObject<Item> PACIFIC_HALIBUT = FishRegistry.register(FishItem::new, "pacific_halibut", FishType.HALIBUT);
public static final RegistryObject<Item> ATLANTIC_HALIBUT = FishRegistry.register(FishItem::new, "atlantic_halibut", FishType.HALIBUT);
public static final RegistryObject<Item> ATLANTIC_HERRING = FishRegistry.register(FishItem::new, "atlantic_herring", FishType.SMALL);
public static final RegistryObject<Item> PACIFIC_HALIBUT = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "pacific_halibut", FishType.HALIBUT);
public static final RegistryObject<Item> ATLANTIC_HALIBUT = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "atlantic_halibut", FishType.HALIBUT);
public static final RegistryObject<Item> ATLANTIC_HERRING = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "atlantic_herring", FishType.SMALL);
public static final RegistryObject<Item> PINK_SALMON = FishRegistry.register(FishItem::new, "pink_salmon");
public static final RegistryObject<Item> POLLOCK = FishRegistry.register(FishItem::new, "pollock");
public static final RegistryObject<Item> RAINBOW_TROUT = FishRegistry.register(FishItem::new, "rainbow_trout");
public static final RegistryObject<Item> BAYAD = FishRegistry.register(FishItem::new, "bayad", FishType.CATFISH);
public static final RegistryObject<Item> BOULTI = FishRegistry.register(FishItem::new, "boulti", FishType.SMALL);
public static final RegistryObject<Item> CAPITAINE = FishRegistry.register(FishItem::new, "capitaine");
public static final RegistryObject<Item> SYNODONTIS = FishRegistry.register(FishItem::new, "synodontis", FishType.SMALL);
public static final RegistryObject<Item> BOULTI = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "boulti", FishType.SMALL);
public static final RegistryObject<Item> CAPITAINE = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "capitaine");
public static final RegistryObject<Item> SYNODONTIS = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "synodontis", FishType.SMALL);
public static final RegistryObject<Item> SMALLMOUTH_BASS = FishRegistry.register(FishItem::new, "smallmouth_bass");
public static final RegistryObject<Item> BLUEGILL = FishRegistry.register(FishItem::new, "bluegill", FishType.SMALL);
public static final RegistryObject<Item> BLUEGILL = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "bluegill", FishType.SMALL);
public static final RegistryObject<Item> BROWN_TROUT = FishRegistry.register(FishItem::new, "brown_trout");
public static final RegistryObject<Item> CARP = FishRegistry.register(FishItem::new, "carp", FishType.LARGE);
public static final RegistryObject<Item> CATFISH = FishRegistry.register(FishItem::new, "catfish", FishType.CATFISH);
public static final RegistryObject<Item> CATFISH = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "catfish", FishType.CATFISH);
public static final RegistryObject<Item> GAR = FishRegistry.register(FishItem::new, "gar", FishType.LONGNOSE);
public static final RegistryObject<Item> MINNOW = FishRegistry.register(() -> AquacultureAPI.createBait(50, 1, Aquaculture.GROUP), "minnow", FishType.SMALL);
public static final RegistryObject<Item> MUSKELLUNGE = FishRegistry.register(FishItem::new, "muskellunge", FishType.LONGNOSE);
public static final RegistryObject<Item> PERCH = FishRegistry.register(FishItem::new, "perch", FishType.SMALL);
public static final RegistryObject<Item> ARAPAIMA = FishRegistry.register(FishItem::new, "arapaima", FishType.LONGNOSE);
public static final RegistryObject<Item> PIRANHA = FishRegistry.register(FishItem::new, "piranha", FishType.SMALL);
public static final RegistryObject<Item> PERCH = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "perch", FishType.SMALL);
public static final RegistryObject<Item> ARAPAIMA = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "arapaima", FishType.LONGNOSE);
public static final RegistryObject<Item> PIRANHA = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "piranha", FishType.SMALL);
public static final RegistryObject<Item> TAMBAQUI = FishRegistry.register(FishItem::new, "tambaqui", FishType.LARGE);
public static final RegistryObject<Item> BROWN_SHROOMA = FishRegistry.register(FishItem::new, "brown_shrooma", FishType.SMALL);
public static final RegistryObject<Item> RED_SHROOMA = FishRegistry.register(FishItem::new, "red_shrooma", FishType.SMALL);
public static final RegistryObject<Item> BROWN_SHROOMA = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "brown_shrooma", FishType.SMALL);
public static final RegistryObject<Item> RED_SHROOMA = FishRegistry.register(() -> new FishItem(FishItem.SMALL_FISH_RAW), "red_shrooma", FishType.SMALL);
public static final RegistryObject<Item> JELLYFISH = FishRegistry.register(SimpleItem::new, "jellyfish", FishType.JELLYFISH);
public static final RegistryObject<Item> RED_GROUPER = FishRegistry.register(FishItem::new, "red_grouper");
public static final RegistryObject<Item> TUNA = FishRegistry.register(FishItem::new, "tuna", FishType.LARGE);
public static final RegistryObject<Item> TUNA = FishRegistry.register(() -> new FishItem(FishItem.LARGE_FISH_RAW), "tuna", FishType.LARGE);
public static final RegistryObject<Item> LEECH = registerWithTab(() -> AquacultureAPI.createBait(35, 1, Aquaculture.GROUP), "leech");
public static final RegistryObject<Item> GOLDFISH = registerWithTab(SimpleItem::new, "goldfish");
public static final RegistryObject<Item> BOX_TURTLE = registerWithTab(SimpleItem::new, "box_turtle");
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/com/teammetallurgy/aquaculture/item/FishItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@
import net.minecraft.world.item.Item;

public class FishItem extends SimpleItem {
public static final FoodProperties RAW_FISH = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.1F).build();
public static final FoodProperties SMALL_FISH_RAW = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.1F).build();
public static final FoodProperties MEDIUM_FISH_RAW = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.1F).build();
public static final FoodProperties LARGE_FISH_RAW = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.2F).build();

public FishItem() {
super(new Item.Properties().food(RAW_FISH));
this(MEDIUM_FISH_RAW);
}

public FishItem(FoodProperties foodProperties) {
super(new Item.Properties().food(foodProperties));
}
}
12 changes: 6 additions & 6 deletions src/main/java/com/teammetallurgy/aquaculture/loot/FishWeightHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,25 +101,25 @@ public static void registerFishData() {
AquacultureAPI.FISH_DATA.add(BLACKFISH.get(), 1, 28, 2);
AquacultureAPI.FISH_DATA.add(PACIFIC_HALIBUT.get(), 25, 550, 12);
AquacultureAPI.FISH_DATA.add(ATLANTIC_HALIBUT.get(), 50, 710, 14);
AquacultureAPI.FISH_DATA.add(ATLANTIC_HERRING.get(), 0.5, 2.4);
AquacultureAPI.FISH_DATA.add(ATLANTIC_HERRING.get(), 0.5, 2.4, 1);
AquacultureAPI.FISH_DATA.add(PINK_SALMON.get(), 1.5, 15, 2);
AquacultureAPI.FISH_DATA.add(POLLOCK.get(), 3, 46, 2);
AquacultureAPI.FISH_DATA.add(RAINBOW_TROUT.get(), 2, 27, 2);
AquacultureAPI.FISH_DATA.add(BAYAD.get(), 5, 145, 4);
AquacultureAPI.FISH_DATA.add(BOULTI.get(), 1, 9.5, 1);
AquacultureAPI.FISH_DATA.add(CAPITAINE.get(), 20, 440, 10);
AquacultureAPI.FISH_DATA.add(SYNODONTIS.get(), 0.5, 2.5);
AquacultureAPI.FISH_DATA.add(SYNODONTIS.get(), 0.5, 2.5, 1);
AquacultureAPI.FISH_DATA.add(SMALLMOUTH_BASS.get(), 1, 12, 2);
AquacultureAPI.FISH_DATA.add(BLUEGILL.get(), 0.8, 4.5);
AquacultureAPI.FISH_DATA.add(BLUEGILL.get(), 0.8, 4.5, 1);
AquacultureAPI.FISH_DATA.add(BROWN_TROUT.get(), 1.5, 44, 2);
AquacultureAPI.FISH_DATA.add(CARP.get(), 2, 40, 2);
AquacultureAPI.FISH_DATA.add(CATFISH.get(), 10, 220, 6);
AquacultureAPI.FISH_DATA.add(GAR.get(), 8, 100, 4);
AquacultureAPI.FISH_DATA.add(MINNOW.get(), 0.2, 1.5, 0);
AquacultureAPI.FISH_DATA.add(MUSKELLUNGE.get(), 5, 70, 3);
AquacultureAPI.FISH_DATA.add(PERCH.get(), 0.5, 6);
AquacultureAPI.FISH_DATA.add(PERCH.get(), 0.5, 6, 1);
AquacultureAPI.FISH_DATA.add(ARAPAIMA.get(), 20, 440, 10);
AquacultureAPI.FISH_DATA.add(PIRANHA.get(), 0.5, 7.7);
AquacultureAPI.FISH_DATA.add(PIRANHA.get(), 0.5, 7.7, 1);
AquacultureAPI.FISH_DATA.add(TAMBAQUI.get(), 7, 97, 3);
AquacultureAPI.FISH_DATA.add(BROWN_SHROOMA.get(), 1, 5, 0);
AquacultureAPI.FISH_DATA.add(RED_SHROOMA.get(), 1, 5, 0);
Expand All @@ -132,6 +132,6 @@ public static void registerFishData() {
AquacultureAPI.FISH_DATA.add(Items.COD, 12, 211, 4);
AquacultureAPI.FISH_DATA.add(Items.SALMON, 0.6, 15, 2);
AquacultureAPI.FISH_DATA.add(Items.TROPICAL_FISH, 0.01, 1, 0);
AquacultureAPI.FISH_DATA.add(Items.PUFFERFISH, 1, 25);
AquacultureAPI.FISH_DATA.add(Items.PUFFERFISH, 1, 25, 1);
}
}

0 comments on commit 39a777a

Please sign in to comment.