diff --git a/gradle.properties b/gradle.properties index 4e4c000d..7462fe92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true # Mod Properties -mod_version=2.4.5 +mod_version=2.4.6 maven_group=io.github.markassk.fishonmcextras archives_base_name=fishonmc-extras project_url=https://modrinth.com/project/fishonmc-extras diff --git a/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/FOMCItem.java b/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/FOMCItem.java index 6b0b5401..3a0c8c28 100644 --- a/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/FOMCItem.java +++ b/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/FOMCItem.java @@ -43,6 +43,7 @@ public static FOMCItem getFOMCItem(ItemStack itemStack) { || itemStack.getItem() == Items.ROTTEN_FLESH || itemStack.getItem() == Items.GOLD_INGOT || itemStack.getItem() == Items.PRISMARINE_SHARD + || itemStack.getItem() == Items.DRIED_KELP ) { String line = Objects.requireNonNull(itemStack.getComponents().get(DataComponentTypes.LORE)).lines().get(15).getString(); return Fish.getFish(itemStack, Defaults.ItemTypes.FISH, line.substring(line.lastIndexOf(" ") + 1)); @@ -72,6 +73,7 @@ public static boolean isFOMCItem(ItemStack itemStack) { || itemStack.getItem() == Items.ROTTEN_FLESH || itemStack.getItem() == Items.GOLD_INGOT || itemStack.getItem() == Items.PRISMARINE_SHARD + || itemStack.getItem() == Items.DRIED_KELP || itemStack.getItem() == Items.FISHING_ROD; } } @@ -95,7 +97,8 @@ public static boolean isFish(ItemStack itemStack) { || itemStack.getItem() == Items.BLACK_DYE || itemStack.getItem() == Items.GOLD_INGOT || itemStack.getItem() == Items.ROTTEN_FLESH - || itemStack.getItem() == Items.PRISMARINE_SHARD; + || itemStack.getItem() == Items.PRISMARINE_SHARD + || itemStack.getItem() == Items.DRIED_KELP; } return false; } diff --git a/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/Fish.java b/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/Fish.java index 03d8dd83..95fe06c6 100644 --- a/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/Fish.java +++ b/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/Fish.java @@ -79,6 +79,7 @@ public static Fish getFish(ItemStack itemStack) { || itemStack.getItem() == Items.BLACK_DYE || itemStack.getItem() == Items.GOLD_INGOT || itemStack.getItem() == Items.PRISMARINE_SHARD + || itemStack.getItem() == Items.DRIED_KELP ) { String line = Objects.requireNonNull(itemStack.getComponents().get(DataComponentTypes.LORE)).lines().get(15).getString(); return Fish.getFish(itemStack, Defaults.ItemTypes.FISH, line.substring(line.lastIndexOf(" ") + 1)); diff --git a/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/Pet.java b/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/Pet.java index 93676c1a..caff0d51 100644 --- a/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/Pet.java +++ b/src/main/java/io/github/markassk/fishonmcextras/FOMC/Types/Pet.java @@ -12,7 +12,6 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.DecimalFormat; import java.time.LocalDate; import java.util.Objects; import java.util.UUID; @@ -160,8 +159,10 @@ private static float getPercentPetRating(float climateLuck, float climateScale, } public static Constant getConstantFromPercent(float value) { - BigDecimal input = new BigDecimal(value); + + BigDecimal input = new BigDecimal(value * 100f); float ceilValue = input.setScale(2, RoundingMode.HALF_EVEN).floatValue(); + if (ceilValue <= 20f) return Constant.SICKLY; else if (ceilValue < 30f) return Constant.BAD; else if (ceilValue < 40f) return Constant.BELOW_AVERAGE; diff --git a/src/main/java/io/github/markassk/fishonmcextras/config/TrackerFishHUDConfig.java b/src/main/java/io/github/markassk/fishonmcextras/config/TrackerFishHUDConfig.java index b47b5ab0..534d9fe7 100644 --- a/src/main/java/io/github/markassk/fishonmcextras/config/TrackerFishHUDConfig.java +++ b/src/main/java/io/github/markassk/fishonmcextras/config/TrackerFishHUDConfig.java @@ -64,7 +64,7 @@ public static class VariantToggles { public boolean showAlbino = true; public boolean showMelanistic = true; public boolean showTrophy = true; - public boolean showFabled = false; + public boolean showFabled = true; public boolean showAlternate = false; } @@ -88,7 +88,7 @@ public static class DryStreakToggles { public boolean showAlbino = true; public boolean showMelanistic = true; public boolean showTrophy = true; - public boolean showFabled = false; + public boolean showFabled = true; public boolean showAlternate = true; @ConfigEntry.Gui.PrefixText public boolean showPet = false; diff --git a/src/main/java/io/github/markassk/fishonmcextras/screens/main/MainScreen.java b/src/main/java/io/github/markassk/fishonmcextras/screens/main/MainScreen.java index f79c4883..3b6f1ffa 100644 --- a/src/main/java/io/github/markassk/fishonmcextras/screens/main/MainScreen.java +++ b/src/main/java/io/github/markassk/fishonmcextras/screens/main/MainScreen.java @@ -46,7 +46,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) { textList.add(Text.literal("Welcome to FishOnMC-Extras").formatted(Formatting.WHITE)); textList.add(TabHandler.instance().player); textList.add(Text.empty()); - textList.add(Text.literal("2.4.5").formatted(Formatting.GRAY)); + textList.add(Text.literal("2.4.6").formatted(Formatting.GRAY)); textList.add(Text.literal("Quality of Fishing Part 2 Update").formatted(Formatting.GRAY, Formatting.ITALIC)); textList.forEach(text -> context.drawText(textRenderer, text, width / 2 - 4 - textRenderer.getWidth(text), height / 2 - (textList.size() * (textRenderer.fontHeight + 1)) / 2 + count.getAndIncrement() * (textRenderer.fontHeight + 1), 0xFFFFFF, true)); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7dbd77b4..77733cf4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "fishonmcextras", - "version": "2.4.5", + "version": "2.4.6", "name": "FishOnMC-Extras", "description": "A QOL mod for play.fishonmc.net.", "authors": [