diff --git a/src/main/java/net/aoba/gui/tabs/HudsTab.java b/src/main/java/net/aoba/gui/tabs/HudsTab.java index 6e725701..2a0b54a1 100644 --- a/src/main/java/net/aoba/gui/tabs/HudsTab.java +++ b/src/main/java/net/aoba/gui/tabs/HudsTab.java @@ -35,7 +35,7 @@ public HudsTab(List hudList) { stackPanel.addChild(hudComponent); } - stackPanel.addChild(new ColorPickerComponent("Hud Color", stackPanel, Aoba.getInstance().hudManager.color)); + stackPanel.addChild(new ColorPickerComponent(stackPanel, Aoba.getInstance().hudManager.color)); this.children.add(stackPanel); this.setWidth(300); diff --git a/src/main/java/net/aoba/gui/tabs/ModuleSettingsTab.java b/src/main/java/net/aoba/gui/tabs/ModuleSettingsTab.java index c5134e81..1175180c 100644 --- a/src/main/java/net/aoba/gui/tabs/ModuleSettingsTab.java +++ b/src/main/java/net/aoba/gui/tabs/ModuleSettingsTab.java @@ -9,6 +9,7 @@ import net.aoba.gui.HudManager; import net.aoba.gui.hud.AbstractHud; import net.aoba.gui.tabs.components.CheckboxComponent; +import net.aoba.gui.tabs.components.ColorPickerComponent; import net.aoba.gui.tabs.components.Component; import net.aoba.gui.tabs.components.KeybindComponent; import net.aoba.gui.tabs.components.ListComponent; @@ -18,6 +19,7 @@ import net.aoba.module.Module; import net.aoba.settings.Setting; import net.aoba.settings.types.BooleanSetting; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.FloatSetting; import net.aoba.settings.types.IndexedStringListSetting; import net.aoba.settings.types.StringListSetting; @@ -47,6 +49,8 @@ public ModuleSettingsTab(String title, float x, float y, Module module) { c = new CheckboxComponent(this, (BooleanSetting) setting); } else if (setting instanceof StringListSetting) { c = new ListComponent(this, (IndexedStringListSetting) setting); + } else if (setting instanceof ColorSetting) { + c = new ColorPickerComponent(this, (ColorSetting) setting); } else { c = null; } diff --git a/src/main/java/net/aoba/gui/tabs/components/ColorPickerComponent.java b/src/main/java/net/aoba/gui/tabs/components/ColorPickerComponent.java index 6bbf97da..edf378f3 100644 --- a/src/main/java/net/aoba/gui/tabs/components/ColorPickerComponent.java +++ b/src/main/java/net/aoba/gui/tabs/components/ColorPickerComponent.java @@ -36,17 +36,16 @@ public ColorPickerComponent(String text, IHudElement parent) { Aoba.getInstance().eventManager.AddListener(LeftMouseUpListener.class, this); } - public ColorPickerComponent(String text, IHudElement parent, ColorSetting color) { + public ColorPickerComponent(IHudElement parent, ColorSetting color) { super(parent); + this.text = color.displayName; this.color = color; this.hue = color.getValue().hue; this.saturation = color.getValue().saturation; this.luminance = color.getValue().luminance; - this.text = text; - this.setHeight(145); this.setLeft(4); this.setRight(4); diff --git a/src/main/java/net/aoba/gui/tabs/components/ModuleComponent.java b/src/main/java/net/aoba/gui/tabs/components/ModuleComponent.java index c2ee2a9d..5a6f6bf7 100644 --- a/src/main/java/net/aoba/gui/tabs/components/ModuleComponent.java +++ b/src/main/java/net/aoba/gui/tabs/components/ModuleComponent.java @@ -26,7 +26,7 @@ public class ModuleComponent extends Component implements LeftMouseDownListener private ModuleSettingsTab lastSettingsTab = null; - public static final Identifier gear = new Identifier("minecraft", "textures/gear.png"); + public static final Identifier gear = new Identifier("aoba", "/textures/gear.png"); public ModuleComponent(String text, IHudElement parent, Module module) { super(parent); @@ -49,9 +49,13 @@ public void draw(DrawContext drawContext, float partialTicks, Color color) { renderUtils.drawString(drawContext, this.text, actualX + 8, actualY + 8, module.getState() ? 0x00FF00 : this.hovered ? color.getColorAsInt() : 0xFFFFFF); - if (module.hasSettings()) { - drawContext.drawTexture(gear, (int) (actualX + actualWidth - 16), (int) (actualY + 6), 0, 0, 12, 12); + if(module.hasSettings()) { + renderUtils.drawString(drawContext, ">>", (actualX + actualWidth - 24), actualY + 8, color.getColorAsInt()); + } + //if (module.hasSettings()) { + // drawContext.drawTexture(gear, (int) (actualX + actualWidth - 16), (int) (actualY + 6), 0, 0, 4, 4, 4, 4); + //} } @Override diff --git a/src/main/java/net/aoba/module/modules/render/Breadcrumbs.java b/src/main/java/net/aoba/module/modules/render/Breadcrumbs.java index ddb61e0c..7b189e45 100644 --- a/src/main/java/net/aoba/module/modules/render/Breadcrumbs.java +++ b/src/main/java/net/aoba/module/modules/render/Breadcrumbs.java @@ -31,6 +31,7 @@ import org.lwjgl.glfw.GLFW; import net.aoba.module.Module; import net.aoba.settings.types.BooleanSetting; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.FloatSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.client.option.KeyBinding; @@ -41,10 +42,11 @@ public class Breadcrumbs extends Module implements RenderListener, TickListener { private Color currentColor; - private Color color; + + private ColorSetting color = new ColorSetting("breadcrumbs_color", "Color", "Color", new Color(0, 1f, 1f)); + private RainbowColor rainbowColor; - public FloatSetting hue = new FloatSetting("breadcrumbs_hue", "Hue", "Hue", 4, 0, 360, 1); public BooleanSetting rainbow = new BooleanSetting("breadcrumbs_rainbow", "Rainbow", "Rainbow", false); public FloatSetting effectSpeed = new FloatSetting("breadcrumbs_effectspeed", "Effect Spd.", "Effect Spd", 4, 1, 20, 0.1); @@ -58,10 +60,10 @@ public Breadcrumbs() { this.setName("Breadcrumbs"); this.setCategory(Category.Render); this.setDescription("Shows breadcrumbs of where you last stepped;"); - color = new Color(0f, 1f, 1f); - currentColor = color; + currentColor = color.getValue(); rainbowColor = new RainbowColor(); - this.addSetting(hue); + + this.addSetting(color); this.addSetting(rainbow); this.addSetting(effectSpeed); } @@ -103,8 +105,7 @@ public void OnUpdate(TickEvent event) { this.rainbowColor.update(this.effectSpeed.getValue().floatValue()); this.currentColor = this.rainbowColor.getColor(); }else { - this.color.setHSV(hue.getValue().floatValue(), 1f, 1f); - this.currentColor = color; + this.currentColor = color.getValue(); } } } \ No newline at end of file diff --git a/src/main/java/net/aoba/module/modules/render/ChestESP.java b/src/main/java/net/aoba/module/modules/render/ChestESP.java index 182e7db9..66a27efe 100644 --- a/src/main/java/net/aoba/module/modules/render/ChestESP.java +++ b/src/main/java/net/aoba/module/modules/render/ChestESP.java @@ -34,6 +34,7 @@ import net.aoba.misc.RainbowColor; import net.aoba.module.Module; import net.aoba.settings.types.BooleanSetting; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.FloatSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.block.entity.BlockEntity; @@ -45,23 +46,24 @@ public class ChestESP extends Module implements RenderListener, TickListener { private Color currentColor; - private Color color; private RainbowColor rainbowColor; - public FloatSetting hue = new FloatSetting("chestesp_hue", "Hue","Hue", 4, 0, 360, 1); + private ColorSetting color = new ColorSetting("chestesp_color", "Color", "Color", new Color(0, 1f, 1f)); + public BooleanSetting rainbow = new BooleanSetting("chestesp_rainbow", "Rainbow", "Rainbow", false); public FloatSetting effectSpeed = new FloatSetting("chestesp_effectspeed", "Effect Speed", "Effect Speed", 4, 1, 20, 0.1); + public ChestESP() { super(new KeybindSetting("key.chestesp", "ChestESP Key", InputUtil.fromKeyCode(GLFW.GLFW_KEY_UNKNOWN, 0))); this.setName("ChestESP"); this.setCategory(Category.Render); this.setDescription("Allows the player to see Chests with an ESP."); - color = new Color(hue.getValue().floatValue(), 1f, 1f); - currentColor = color; + + currentColor = color.getValue(); rainbowColor = new RainbowColor(); - this.addSetting(hue); + this.addSetting(color); this.addSetting(rainbow); this.addSetting(effectSpeed); } @@ -100,8 +102,7 @@ public void OnUpdate(TickEvent event) { this.rainbowColor.update(this.effectSpeed.getValue().floatValue()); this.currentColor = this.rainbowColor.getColor(); }else { - this.color.setHSV(hue.getValue().floatValue(), 1f, 1f); - this.currentColor = color; + this.currentColor = color.getValue(); } } diff --git a/src/main/java/net/aoba/module/modules/render/EntityESP.java b/src/main/java/net/aoba/module/modules/render/EntityESP.java index 498c7db5..cfb22f8f 100644 --- a/src/main/java/net/aoba/module/modules/render/EntityESP.java +++ b/src/main/java/net/aoba/module/modules/render/EntityESP.java @@ -31,6 +31,7 @@ import net.aoba.misc.RainbowColor; import net.aoba.module.Module; import net.aoba.settings.types.BooleanSetting; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.FloatSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.client.option.KeyBinding; @@ -45,10 +46,12 @@ import net.minecraft.util.math.Vec3d; public class EntityESP extends Module implements RenderListener, TickListener { - private Color color; private RainbowColor rainbowColor; - public FloatSetting hue = new FloatSetting("entitysp_hue", "Hue","Hue", 4, 0, 360, 1); + private ColorSetting color_passive = new ColorSetting("entityesp_color_passive", "Passive Color", "Passive Color", new Color(0, 1f, 1f)); + private ColorSetting color_enemies = new ColorSetting("entityesp_color_enemy", "Enemy Color", "Enemy Color", new Color(0, 1f, 1f)); + private ColorSetting color_misc = new ColorSetting("entityesp_color_misYOUBliterc", "Misc. Color", "Misc. Color", new Color(0, 1f, 1f)); + public BooleanSetting rainbow = new BooleanSetting("entityesp_rainbow", "Rainbow","Rainbow", false); public FloatSetting effectSpeed = new FloatSetting("entityesp_effectspeed", "Effect Speed", "Effect Speed", 4, 1, 20, 0.1); @@ -58,10 +61,12 @@ public EntityESP() { this.setName("EntityESP"); this.setCategory(Category.Render); this.setDescription("Allows the player to see entities with an ESP."); - color = new Color(255, 0, 0); rainbowColor = new RainbowColor(); - this.addSetting(hue); + this.addSetting(color_passive); + this.addSetting(color_enemies); + this.addSetting(color_misc); + this.addSetting(rainbow); this.addSetting(effectSpeed); } @@ -101,11 +106,11 @@ public void OnRender(RenderEvent event) { boundingBox = boundingBox.offset(velocityPartial); if (entity instanceof AnimalEntity) { - this.getRenderUtils().draw3DBox(matrixStack, boundingBox, new Color(0, 255, 0), 0.2f); + this.getRenderUtils().draw3DBox(matrixStack, boundingBox, color_passive.getValue(), 0.2f); } else if (entity instanceof Monster) { - this.getRenderUtils().draw3DBox(matrixStack, boundingBox, new Color(255, 0, 0), 0.2f); + this.getRenderUtils().draw3DBox(matrixStack, boundingBox, color_enemies.getValue(), 0.2f); } else { - this.getRenderUtils().draw3DBox(matrixStack, boundingBox, new Color(0, 0, 255), 0.2f); + this.getRenderUtils().draw3DBox(matrixStack, boundingBox, color_misc.getValue(), 0.2f); } } } @@ -114,10 +119,11 @@ public void OnRender(RenderEvent event) { @Override public void OnUpdate(TickEvent event) { - if(this.rainbow.getValue()) { - this.rainbowColor.update(this.effectSpeed.getValue().floatValue()); - }else { - this.color.setHSV(hue.getValue().floatValue(), 1f, 1f); - } + /* + * if(this.rainbow.getValue()) { + * this.rainbowColor.update(this.effectSpeed.getValue().floatValue()); }else { + * + * this.color.setHSV(hue.getValue().floatValue(), 1f, 1f); } + */ } } diff --git a/src/main/java/net/aoba/module/modules/render/ItemESP.java b/src/main/java/net/aoba/module/modules/render/ItemESP.java index 5e3c7f0c..94012646 100644 --- a/src/main/java/net/aoba/module/modules/render/ItemESP.java +++ b/src/main/java/net/aoba/module/modules/render/ItemESP.java @@ -27,6 +27,7 @@ import net.aoba.event.listeners.RenderListener; import net.aoba.gui.Color; import net.aoba.module.Module; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; @@ -35,12 +36,17 @@ public class ItemESP extends Module implements RenderListener { + private ColorSetting color = new ColorSetting("itemesp_color", "Color", "Color", new Color(0, 1f, 1f)); + + public ItemESP() { super(new KeybindSetting("key.itemesp", "ItemESP Key", InputUtil.fromKeyCode(GLFW.GLFW_KEY_UNKNOWN, 0))); this.setName("ItemESP"); this.setCategory(Category.Render); this.setDescription("Allows the player to see items with an ESP."); + + this.addSetting(color); } @Override @@ -62,7 +68,7 @@ public void onToggle() { public void OnRender(RenderEvent event) { for (Entity entity : MC.world.getEntities()) { if(entity instanceof ItemEntity) { - this.getRenderUtils().draw3DBox(event.GetMatrixStack(), entity.getBoundingBox(), new Color(255, 0, 0), 0.2f); + this.getRenderUtils().draw3DBox(event.GetMatrixStack(), entity.getBoundingBox(), color.getValue(), 0.2f); } } } diff --git a/src/main/java/net/aoba/module/modules/render/POV.java b/src/main/java/net/aoba/module/modules/render/POV.java index c0767421..d9f8e06d 100644 --- a/src/main/java/net/aoba/module/modules/render/POV.java +++ b/src/main/java/net/aoba/module/modules/render/POV.java @@ -41,6 +41,8 @@ public class POV extends Module implements TickListener { private Entity povEntity = null; private boolean fakePlayerSpawned = false; + + public POV() { super(new KeybindSetting("key.pov", "POV Key", InputUtil.fromKeyCode(GLFW.GLFW_KEY_UNKNOWN, 0))); diff --git a/src/main/java/net/aoba/module/modules/render/PlayerESP.java b/src/main/java/net/aoba/module/modules/render/PlayerESP.java index 647db9d3..f25cf50f 100644 --- a/src/main/java/net/aoba/module/modules/render/PlayerESP.java +++ b/src/main/java/net/aoba/module/modules/render/PlayerESP.java @@ -27,19 +27,28 @@ import net.aoba.event.listeners.RenderListener; import net.aoba.gui.Color; import net.aoba.module.Module; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; public class PlayerESP extends Module implements RenderListener { - + + private ColorSetting color_default = new ColorSetting("playeresp_color_default", "Default Color", "Default Color", new Color(1f, 1f, 0f)); + private ColorSetting color_friendly = new ColorSetting("playeresp_color_friendly", "Friendly Color", "Friendly Color", new Color(0f, 1f, 0f)); + private ColorSetting color_enemy = new ColorSetting("playeresp_color_enemy", "Enemy Color", "Enemy Color", new Color(1f, 0f, 0f)); + public PlayerESP() { super(new KeybindSetting("key.playeresp", "PlayerESP Key", InputUtil.fromKeyCode(GLFW.GLFW_KEY_UNKNOWN, 0))); this.setName("PlayerESP"); this.setCategory(Category.Render); this.setDescription("Allows the player to see other players with an ESP."); + + this.addSetting(color_default); + this.addSetting(color_friendly); + this.addSetting(color_enemy); } @Override @@ -61,7 +70,7 @@ public void onToggle() { public void OnRender(RenderEvent event) { for (AbstractClientPlayerEntity entity : MC.world.getPlayers()) { if(entity != MC.player) { - this.getRenderUtils().draw3DBox(event.GetMatrixStack(), entity.getBoundingBox(), new Color(255, 0, 0), 0.2f); + this.getRenderUtils().draw3DBox(event.GetMatrixStack(), entity.getBoundingBox(), color_default.getValue(), 0.2f); } } } diff --git a/src/main/java/net/aoba/module/modules/render/SpawnerESP.java b/src/main/java/net/aoba/module/modules/render/SpawnerESP.java index 1cf46bb1..3dc804ac 100644 --- a/src/main/java/net/aoba/module/modules/render/SpawnerESP.java +++ b/src/main/java/net/aoba/module/modules/render/SpawnerESP.java @@ -30,6 +30,7 @@ import net.aoba.gui.Color; import net.aoba.misc.ModuleUtils; import net.aoba.module.Module; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.MobSpawnerBlockEntity; @@ -39,12 +40,16 @@ public class SpawnerESP extends Module implements RenderListener { + private ColorSetting color = new ColorSetting("spawneresp_color", "Color", "Color", new Color(0, 1f, 1f)); + public SpawnerESP() { super(new KeybindSetting("key.spawneresp", "SpawnerESP Key", InputUtil.fromKeyCode(GLFW.GLFW_KEY_UNKNOWN, 0))); this.setName("SpawnerESP"); this.setCategory(Category.Render); this.setDescription("Allows the player to see spawners with an ESP."); + + this.addSetting(color); } @Override @@ -69,7 +74,7 @@ public void OnRender(RenderEvent event) { for(BlockEntity blockEntity : blockEntities) { if(blockEntity instanceof MobSpawnerBlockEntity) { Box box = new Box(blockEntity.getPos()); - this.getRenderUtils().draw3DBox(event.GetMatrixStack(), box, new Color(255,255,0), 0.2f); + this.getRenderUtils().draw3DBox(event.GetMatrixStack(), box, color.getValue(), 0.2f); } } } diff --git a/src/main/java/net/aoba/module/modules/render/Tracer.java b/src/main/java/net/aoba/module/modules/render/Tracer.java index 10460f9b..1f603164 100644 --- a/src/main/java/net/aoba/module/modules/render/Tracer.java +++ b/src/main/java/net/aoba/module/modules/render/Tracer.java @@ -25,7 +25,9 @@ import net.aoba.Aoba; import net.aoba.event.events.RenderEvent; import net.aoba.event.listeners.RenderListener; +import net.aoba.gui.Color; import net.aoba.module.Module; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; @@ -34,12 +36,16 @@ public class Tracer extends Module implements RenderListener { + private ColorSetting color = new ColorSetting("tracer_color", "Color", "Color", new Color(0, 1f, 1f)); + public Tracer() { super(new KeybindSetting("key.tracer", "Tracer Key", InputUtil.fromKeyCode(GLFW.GLFW_KEY_UNKNOWN, 0))); this.setName("Tracer"); this.setCategory(Category.Render); this.setDescription("Points toward other players and entities with a line."); + + this.addSetting(color); } @Override diff --git a/src/main/java/net/aoba/module/modules/render/Trajectory.java b/src/main/java/net/aoba/module/modules/render/Trajectory.java index d5fc82d2..5c6f02e3 100644 --- a/src/main/java/net/aoba/module/modules/render/Trajectory.java +++ b/src/main/java/net/aoba/module/modules/render/Trajectory.java @@ -28,8 +28,10 @@ import net.aoba.Aoba; import net.aoba.event.events.RenderEvent; import net.aoba.event.listeners.RenderListener; +import net.aoba.gui.Color; import net.aoba.misc.ModuleUtils; import net.aoba.module.Module; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.KeyBinding; @@ -47,12 +49,16 @@ public class Trajectory extends Module implements RenderListener { + private ColorSetting color = new ColorSetting("trajectory_color", "Color", "Color", new Color(0, 1f, 1f)); + public Trajectory() { super(new KeybindSetting("key.trajectory", "Trajectory Key", InputUtil.fromKeyCode(GLFW.GLFW_KEY_UNKNOWN, 0))); this.setName("Trajectory"); this.setCategory(Category.Render); this.setDescription("Allows the player to see where they are aiming. (DISABLED)"); + + this.addSetting(color); } @Override diff --git a/src/main/java/net/aoba/module/modules/world/Nuker.java b/src/main/java/net/aoba/module/modules/world/Nuker.java index a71a53ab..c3be4170 100644 --- a/src/main/java/net/aoba/module/modules/world/Nuker.java +++ b/src/main/java/net/aoba/module/modules/world/Nuker.java @@ -29,6 +29,7 @@ import net.aoba.event.listeners.TickListener; import net.aoba.gui.Color; import net.aoba.module.Module; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.FloatSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.block.Block; @@ -45,6 +46,8 @@ public class Nuker extends Module implements RenderListener, TickListener { private MinecraftClient mc; + private ColorSetting color = new ColorSetting("nuker_color", "Color", "Color", new Color(0, 1f, 1f)); + private FloatSetting radius; public Nuker() { @@ -56,6 +59,8 @@ public Nuker() { this.radius = new FloatSetting("nuker_radius", "Radius", "Radius", 5f, 0f, 15f, 1f); this.addSetting(radius); mc = MinecraftClient.getInstance(); + + this.addSetting(color); } public void setRadius(int radius) { @@ -112,7 +117,7 @@ public void OnRender(RenderEvent event) { if (block == Blocks.AIR || block == Blocks.WATER || block == Blocks.LAVA) continue; - this.getRenderUtils().draw3DBox(event.GetMatrixStack(), new Box(blockpos), new Color(255,0,0), 0.2f); + this.getRenderUtils().draw3DBox(event.GetMatrixStack(), new Box(blockpos), color.getValue(), 0.2f); } } } diff --git a/src/main/java/net/aoba/module/modules/world/TileBreaker.java b/src/main/java/net/aoba/module/modules/world/TileBreaker.java index b08b7352..e35ea2f5 100644 --- a/src/main/java/net/aoba/module/modules/world/TileBreaker.java +++ b/src/main/java/net/aoba/module/modules/world/TileBreaker.java @@ -30,6 +30,7 @@ import net.aoba.event.listeners.TickListener; import net.aoba.gui.Color; import net.aoba.module.Module; +import net.aoba.settings.types.ColorSetting; import net.aoba.settings.types.FloatSetting; import net.aoba.settings.types.KeybindSetting; import net.minecraft.block.Block; @@ -48,6 +49,8 @@ public class TileBreaker extends Module implements TickListener, RenderListener private ArrayList blocks = new ArrayList(); private FloatSetting radius; + private ColorSetting color = new ColorSetting("tilebreaker_color", "Color", "Color", new Color(0, 1f, 1f)); + public TileBreaker() { super(new KeybindSetting("key.tilebreaker", "TileBreaker Key", InputUtil.fromKeyCode(GLFW.GLFW_KEY_UNKNOWN, 0))); @@ -58,6 +61,8 @@ public TileBreaker() { this.radius = new FloatSetting("tilebreaker_radius", "Radius", "Radius", 5f, 0f, 15f, 1f); this.addSetting(radius); mc = MinecraftClient.getInstance(); + + this.addSetting(color); } public void setRadius(int radius) { @@ -155,7 +160,7 @@ public void OnRender(RenderEvent event) { mc.player.getBlockZ() + z); Block block = mc.world.getBlockState(blockpos).getBlock(); if (this.isTileBreakerBlock(block)) { - this.getRenderUtils().draw3DBox(event.GetMatrixStack(), new Box(blockpos), new Color(255,0,0), 0.2f); + this.getRenderUtils().draw3DBox(event.GetMatrixStack(), new Box(blockpos), color.getValue(), 0.2f); } } } diff --git a/src/main/java/net/aoba/settings/types/ColorSetting.java b/src/main/java/net/aoba/settings/types/ColorSetting.java index 68ee2f94..5e7d0170 100644 --- a/src/main/java/net/aoba/settings/types/ColorSetting.java +++ b/src/main/java/net/aoba/settings/types/ColorSetting.java @@ -2,7 +2,6 @@ import net.aoba.gui.Color; import net.aoba.settings.Setting; -import net.aoba.settings.Setting.TYPE; public class ColorSetting extends Setting { @@ -11,6 +10,11 @@ public ColorSetting(String ID, String description, Color default_value) { type = TYPE.COLOR; } + public ColorSetting(String ID, String displayName, String description, Color default_value) { + super(ID, displayName, description, default_value); + type = TYPE.COLOR; + } + @Override protected boolean isValueValid(Color value) { return (value.r <=255 && value.g <= 255 && value.b <= 255); diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/aoba/icon.png similarity index 100% rename from src/main/resources/assets/modid/icon.png rename to src/main/resources/assets/aoba/icon.png diff --git a/src/main/resources/assets/aoba/textures/gear.png b/src/main/resources/assets/aoba/textures/gear.png new file mode 100644 index 00000000..b90c29e5 Binary files /dev/null and b/src/main/resources/assets/aoba/textures/gear.png differ diff --git a/src/main/resources/assets/minecraft/textures/gear.png b/src/main/resources/assets/minecraft/textures/gear.png deleted file mode 100644 index a68f06dc..00000000 Binary files a/src/main/resources/assets/minecraft/textures/gear.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/pin.png b/src/main/resources/assets/minecraft/textures/pin.png deleted file mode 100644 index 8a4892c2..00000000 Binary files a/src/main/resources/assets/minecraft/textures/pin.png and /dev/null differ