From 29b70883a18b166c65b53387c6d474504439d6e5 Mon Sep 17 00:00:00 2001
From: zeroeightsix <RidanVandenbergh@gmail.com>
Date: Sun, 14 Oct 2018 02:34:49 +0200
Subject: [PATCH] crystalaura

---
 .../kami/module/modules/combat/AutoTotem.java |  2 +-
 .../module/modules/combat/CrystalAura.java    | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTotem.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTotem.java
index 36633b20..1264059f 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTotem.java
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTotem.java
@@ -17,7 +17,7 @@ public class AutoTotem extends Module {
     int totems;
     boolean moving = false;
     boolean returnI = false;
-    private Setting<Boolean> soft = Settings.b("Soft");
+    private Setting<Boolean> soft = register(Settings.b("Soft"));
 
     @Override
     public void onUpdate() {
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java
index ee6c3db3..ecd95050 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java
@@ -6,7 +6,8 @@ import me.zeroeightsix.kami.event.events.PacketEvent;
 import me.zeroeightsix.kami.event.events.RenderEvent;
 import me.zeroeightsix.kami.module.Module;
 import me.zeroeightsix.kami.module.modules.render.Tracers;
-import me.zeroeightsix.kami.setting.ISetting;
+import me.zeroeightsix.kami.setting.Setting;
+import me.zeroeightsix.kami.setting.Settings;
 import me.zeroeightsix.kami.util.EntityUtil;
 import me.zeroeightsix.kami.util.Friends;
 import me.zeroeightsix.kami.util.GeometryMasks;
@@ -41,12 +42,12 @@ import static me.zeroeightsix.kami.util.EntityUtil.calculateLookAt;
 @Module.Info(name = "CrystalAura", category = Module.Category.COMBAT)
 public class CrystalAura extends Module {
 
-    @ISetting(name = "Range") private double range = 4;
-    @ISetting(name = "Place") private boolean place = false;
-    @ISetting(name = "Players") private boolean players = true;
-    @ISetting(name = "Mobs") private boolean mobs = false;
-    @ISetting(name = "Animals") private boolean animals = false;
-    @ISetting(name = "Auto switch") private boolean autoSwitch = true;
+    private Setting<Boolean> autoSwitch = register(Settings.b("Auto Switch"));
+    private Setting<Boolean> players = register(Settings.b("Players"));
+    private Setting<Boolean> place = register(Settings.b("Place", false));
+    private Setting<Boolean> mobs = register(Settings.b("Mobs", false));
+    private Setting<Boolean> animals = register(Settings.b("Animals", false));
+    private Setting<Double> range = register(Settings.d("Range", 4));
 
     private BlockPos render;
     private Entity renderEnt;
@@ -60,7 +61,7 @@ public class CrystalAura extends Module {
                 .map(entity -> (EntityEnderCrystal) entity)
                 .min(Comparator.comparing(c -> mc.player.getDistance(c)))
                 .orElse(null);
-        if (crystal != null && mc.player.getDistance(crystal) <= range) {
+        if (crystal != null && mc.player.getDistance(crystal) <= range.getValue()) {
             //Added delay to stop ncp from flagging "hitting too fast"
             if (((System.nanoTime() / 1000000) - systemTime) >= 250) {
                 lookAtPacket(crystal.posX, crystal.posY, crystal.posZ, mc.player);
@@ -87,9 +88,9 @@ public class CrystalAura extends Module {
 
         List<BlockPos> blocks = findCrystalBlocks();
         List<Entity> entities = new ArrayList<>();
-        if (players)
+        if (players.getValue())
             entities.addAll(mc.world.playerEntities.stream().filter(entityPlayer -> !Friends.isFriend(entityPlayer.getName())).collect(Collectors.toList()));
-        entities.addAll(mc.world.loadedEntityList.stream().filter(entity -> EntityUtil.isLiving(entity) && (EntityUtil.isPassive(entity) ? animals : mobs)).collect(Collectors.toList()));
+        entities.addAll(mc.world.loadedEntityList.stream().filter(entity -> EntityUtil.isLiving(entity) && (EntityUtil.isPassive(entity) ? animals.getValue() : mobs.getValue())).collect(Collectors.toList()));
 
         BlockPos q = null;
         double damage = .5;
@@ -120,9 +121,9 @@ public class CrystalAura extends Module {
         }
         render = q;
 
-        if (place) {
+        if (place.getValue()) {
             if (!offhand && mc.player.inventory.currentItem != crystalSlot) {
-                if (autoSwitch) {
+                if (autoSwitch.getValue()) {
                     mc.player.inventory.currentItem = crystalSlot;
                     resetRotation();
                 }
@@ -185,7 +186,7 @@ public class CrystalAura extends Module {
 
     private List<BlockPos> findCrystalBlocks() {
         NonNullList<BlockPos> positions = NonNullList.create();
-        positions.addAll(getSphere(getPlayerPos(), (float) range, (int) range, false, true, 0).stream().filter(this::canPlaceCrystal).collect(Collectors.toList()));
+        positions.addAll(getSphere(getPlayerPos(), range.getValue().floatValue(), range.getValue().intValue(), false, true, 0).stream().filter(this::canPlaceCrystal).collect(Collectors.toList()));
         return positions;
     }