diff options
Diffstat (limited to 'src')
5 files changed, 9 insertions, 15 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 9ee1dabe..dc3fea10 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -355,7 +355,7 @@ public class SkyblockerConfig { public boolean enableFishingHelper = true; @SerialEntry - public boolean enableFishingTimer = true; + public boolean enableFishingTimer = false; @SerialEntry public boolean changeTimerColor = true; @@ -364,7 +364,7 @@ public class SkyblockerConfig { public float fishingTimerScale = 1f; @SerialEntry - public boolean hideOtherPlayers = true; + public boolean hideOtherPlayersRods = false; } public static class FairySouls { diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index 830c67fd..2a171a14 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -253,9 +253,9 @@ public class GeneralCategory { .option(Option.<Boolean>createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.hideOtherPlayers")) .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.hideOtherPlayers.@Tooltip"))) - .binding(defaults.general.fishing.hideOtherPlayers, - () -> config.general.fishing.hideOtherPlayers, - newValue -> config.general.fishing.hideOtherPlayers = newValue) + .binding(defaults.general.fishing.hideOtherPlayersRods, + () -> config.general.fishing.hideOtherPlayersRods, + newValue -> config.general.fishing.hideOtherPlayersRods = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/mixin/RenderFishMixin.java b/src/main/java/de/hysky/skyblocker/mixin/RenderFishMixin.java index 7c840bc9..e74bbaea 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/RenderFishMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/RenderFishMixin.java @@ -5,7 +5,6 @@ import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.Utils; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.entity.FishingBobberEntityRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.projectile.FishingBobberEntity; @@ -19,13 +18,9 @@ public abstract class RenderFishMixin { @Inject(method = "render", at = @At("HEAD"), cancellable = true) private void skyblocker$render(FishingBobberEntity fishingBobberEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) { - //if not the players and option to hide is enabled hid the rod - if (Utils.isOnSkyblock() && fishingBobberEntity.getPlayerOwner() != MinecraftClient.getInstance().player && SkyblockerConfigManager.get().general.fishing.hideOtherPlayers) { + //if rendered bobber is not the players and option to hide others is enabled do not render the bobber + if (Utils.isOnSkyblock() && fishingBobberEntity.getPlayerOwner() != MinecraftClient.getInstance().player && SkyblockerConfigManager.get().general.fishing.hideOtherPlayersRods) { ci.cancel(); } - - - } - } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java index 121921b3..b235f7f7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java @@ -96,6 +96,5 @@ public class FishingHelper { RenderHelper.renderText(context, text, pos, scale, true); } } - } } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index b43845e6..2563e51e 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -37,8 +37,8 @@ "text.autoconfig.skyblocker.option.general.fishing.enableFishingHelper": "Enable Fishing Helper", "text.autoconfig.skyblocker.option.general.fishing.enableFishingTimer": "Enable Timer", "text.autoconfig.skyblocker.option.general.fishing.enableFishingTimer.@Tooltip": "Display fishing time above bobber", - "text.autoconfig.skyblocker.option.general.fishing.changeTimerColor": "Change Timer Color At 20s", - "text.autoconfig.skyblocker.option.general.fishing.changeTimerColor.@Tooltip": "Changes the color of the timer to green after 20 seconds has passed", + "text.autoconfig.skyblocker.option.general.fishing.changeTimerColor": "Change Timer At 20s", + "text.autoconfig.skyblocker.option.general.fishing.changeTimerColor.@Tooltip": "Changes timer to green after 20 seconds has passed", "text.autoconfig.skyblocker.option.general.fishing.fishingTimerScale": "Fishing Timer Scale", "text.autoconfig.skyblocker.option.general.fishing.fishingTimerScale.@Tooltip": "How big to display the fishing timer", "text.autoconfig.skyblocker.option.general.fishing.hideOtherPlayers": "Hide Other Players Rods", |