cleaning up fixed 1.15 features

src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java

@@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 @Mixin(ClientPlayerInteractionManager.class)
 public abstract class ClientPlayerInteractionManager_ghostBlocksMixin
 {
-
+/*
     @Shadow @Final private MinecraftClient client;
 
     @Redirect(method = "breakBlock", at = @At(
@@ -52,5 +52,5 @@ public abstract class ClientPlayerInteractionManager_ghostBlocksMixin
                         new BlockHitResult(new Vec3d(blockPos_1), Direction.DOWN, blockPos_1, false)
             ));
         }
-    }
+    }*/
 }

src/main/java/carpet/mixins/MobEntity_leashMixin.java

@@ -17,12 +17,12 @@ public abstract class MobEntity_leashMixin
 
     @Shadow /*@Nullable*/ private CompoundTag leashTag;
 
-    @Inject(method = "writeCustomDataToTag", at = @At("TAIL"))
+    /*@Inject(method = "writeCustomDataToTag", at = @At("TAIL"))   // added in 1.15
     private void addLeashData(CompoundTag compoundTag_1, CallbackInfo ci)
     {
         if (holdingEntity == null && CarpetSettings.leadFix && leashTag != null)
         {
             compoundTag_1.put("Leash", leashTag);
         }
-    }
+    }*/
 }

src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java

@@ -49,7 +49,7 @@ public class ServerPlayerInteractionManager_ghostBlocksMixin
     @ModifyConstant(method = "processBlockBreakingAction",
             constant = @Constant(doubleValue = 36D))
     private double addDistance(double original) {
-        if (CarpetSettings.miningGhostBlockFix)
+        if (CarpetSettings.antiCheatDisabled)
             return 1024D; // blocks 32 distance
         return original;
     }

src/main/java/carpet/settings/CarpetSettings.java

@@ -165,7 +165,10 @@ public class CarpetSettings
 
     @Rule(
             desc = "Prevents players from rubberbanding when moving too fast",
-            extra = {"... or being kicked out for 'flying'","Puts more trust in clients positioning"},
+            extra = {"... or being kicked out for 'flying'",
+                    "Puts more trust in clients positioning",
+                    "Increases player allowed mining distance to 32 blocks"
+            },
             category = {CREATIVE, SURVIVAL}
     )
     public static boolean antiCheatDisabled = false;
@@ -293,7 +296,7 @@ public class CarpetSettings
     public static boolean missingTools = false;
 
     //@Rule(desc = "Alternative, persistent caching strategy for nether portals", category = {SURVIVAL, CREATIVE})
-    public static boolean portalCaching = false;
+    //public static boolean portalCaching = false; // ineffective in 1.15
 
     @Rule(desc = "fill/clone/setblock and structure blocks cause block updates", category = CREATIVE)
     public static boolean fillUpdates = true;
@@ -301,12 +304,12 @@ public class CarpetSettings
     @Rule(desc = "smooth client animations with low tps settings", extra = "works only in SP, and will slow down players", category = CREATIVE)
     public static boolean smoothClientAnimations;
 
-    @Rule(
+    //@Rule(
-            desc="Fixes mining ghost blocks by trusting clients with block breaking",
+    //        desc="Fixes mining ghost blocks by trusting clients with block breaking",
-            extra="Increases player allowed mining distance to 32 blocks",
+    //        extra="Increases player allowed mining distance to 32 blocks",
-            category = SURVIVAL
+    //        category = SURVIVAL
-    )
+    //)
-    public static boolean miningGhostBlockFix = false;
+    //public static boolean miningGhostBlockFix = false;
 
     private static class PushLimitLimits extends Validator<Integer> {
         @Override public Integer validate(ServerCommandSource source, ParsedRule<Integer> currentRule, Integer newValue, String string) {
@@ -487,18 +490,18 @@ public class CarpetSettings
             desc = "Fixes leads breaking/becoming invisible in unloaded chunks",
             extra = "You may still get visibly broken leash links on the client side, but server side the link is still there.",
             category = BUGFIX
-    )
+    )// needs checkfix for 1.15
     public static boolean leadFix = false;
 
     @Rule(desc = "Spawning requires much less CPU and Memory", category = OPTIMIZATION)
     public static boolean lagFreeSpawning = false;
 
-    @Rule(
+    //@Rule(
-            desc = "Prevents horses and other mobs to wander into the distance after dismounting",
+    //        desc = "Prevents horses and other mobs to wander into the distance after dismounting",
-            extra = "Fixes issues with various Joergens wandering off and disappearing client-side",
+    //        extra = "Fixes issues with various Joergens wandering off and disappearing client-side",
-            category = BUGFIX
+    //        category = BUGFIX
-    )
+    //)
-    public static boolean horseWanderingFix = false;
+    //public static boolean horseWanderingFix = false;
     
     @Rule(
             desc = "Allows structure mobs to spawn in flat worlds",