From 0bd00eb842fe3f5f3ebe5c55bc06eef339f014f4 Mon Sep 17 00:00:00 2001
From: olim <bobq4582@gmail.com>
Date: Thu, 11 Apr 2024 10:59:00 +0100
Subject: fix formatting hopefully

make sure that the code in the pull request is formatted properly
---
 src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java   | 4 ++--
 .../de/hysky/skyblocker/config/categories/GeneralCategory.java   | 6 +++---
 src/main/java/de/hysky/skyblocker/mixin/RenderFishMixin.java     | 9 ++-------
 src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java    | 1 -
 4 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/main/java')

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);
             }
         }
-
     }
 }
-- 
cgit