From 3d9a38520de56c10423df0f82ac2104f2c19ba75 Mon Sep 17 00:00:00 2001
From: RubixDev <silas.groh@t-online.de>
Date: Fri, 1 Jul 2022 22:33:26 +0200
Subject: [PATCH] Fully hide `reachDistance` with REA installed

---
 gradle.properties                              | 2 +-
 src/main/java/de/rubixdev/rug/RugServer.java   | 2 +-
 src/main/java/de/rubixdev/rug/RugSettings.java | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6a8e6cd..a8ebfe3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx4G
     carpet_core_version=1.4.79+v220607
 
 # Mod Properties
-    mod_version = 1.3.4-beta.1
+    mod_version = 1.3.4
     maven_group = de.rubixdev.rug
     archives_base_name = rug
 
diff --git a/src/main/java/de/rubixdev/rug/RugServer.java b/src/main/java/de/rubixdev/rug/RugServer.java
index 12ade79..79a0b87 100644
--- a/src/main/java/de/rubixdev/rug/RugServer.java
+++ b/src/main/java/de/rubixdev/rug/RugServer.java
@@ -62,7 +62,7 @@
 import org.apache.logging.log4j.Logger;
 
 public class RugServer implements CarpetExtension, ModInitializer {
-    public static final String VERSION = "1.3.4-beta.1";
+    public static final String VERSION = "1.3.4";
     public static final Logger LOGGER = LogManager.getLogger("Rug");
 
     private static MinecraftServer minecraftServer;
diff --git a/src/main/java/de/rubixdev/rug/RugSettings.java b/src/main/java/de/rubixdev/rug/RugSettings.java
index 7842183..62d0f5e 100644
--- a/src/main/java/de/rubixdev/rug/RugSettings.java
+++ b/src/main/java/de/rubixdev/rug/RugSettings.java
@@ -2,10 +2,12 @@
 
 import static carpet.settings.RuleCategory.*;
 
+import carpet.settings.Condition;
 import carpet.settings.ParsedRule;
 import carpet.settings.Rule;
 import carpet.settings.Validator;
 import de.rubixdev.rug.util.CraftingRule;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.server.command.ServerCommandSource;
 
 @SuppressWarnings("CanBeFinal")
@@ -224,11 +226,17 @@ public String description() {
         }
     }
 
+    public static class conditionReachDistance implements Condition {
+        @Override
+        public boolean isTrue() { return !FabricLoader.getInstance().isModLoaded("reach-entity-attributes"); }
+    }
+
     @Rule(
         desc = "Reach in which you can place and break blocks. Value will be 0.5 higher in creative",
         extra = "Mod needed on server and client for this feature to work",
         strict = false,
         validate = validatorReachDistance.class,
+        condition = conditionReachDistance.class,
         options = { "0.0", "4.5", "5.0", "10.0" },
         category = { EXPERIMENTAL, CREATIVE, CLIENT, RUG }
     )