stuff
This commit is contained in:
parent
48547a2c66
commit
dc1e189d38
25 changed files with 259 additions and 157 deletions
|
@ -10,7 +10,7 @@ import net.minecraft.client.MinecraftClient;
|
|||
import net.minecraft.entity.MovementType;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
|
||||
public abstract class Module_
|
||||
public abstract class Module
|
||||
{
|
||||
protected static MinecraftClient mc = MinecraftClient.getInstance();
|
||||
public String name;
|
||||
|
@ -22,7 +22,7 @@ public abstract class Module_
|
|||
public BooleanSetting showInModulesList = new BooleanSetting("Show in Modules List", true);
|
||||
public KeycodeSetting keybind = new KeycodeSetting("Keybind", 0);
|
||||
|
||||
public Module_(String name, String description, Category category)
|
||||
public Module(String name, String description, Category category)
|
||||
{
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
|
@ -46,4 +46,24 @@ public abstract class Module_
|
|||
onDisable();
|
||||
}
|
||||
}
|
||||
|
||||
public Setting getSettingByName(String settingName)
|
||||
{
|
||||
for(Setting setting : settings)
|
||||
{
|
||||
if ((setting.name.trim().equalsIgnoreCase(settingName)))
|
||||
{
|
||||
return setting;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
protected void addSettings(Setting... settings)
|
||||
{
|
||||
for(Setting setting : settings)
|
||||
{
|
||||
this.settings.add(setting);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -7,7 +7,7 @@ import me.kawaiizenbo.moonlight.module.modules.*;
|
|||
public class ModuleManager
|
||||
{
|
||||
public static ModuleManager INSTANCE = new ModuleManager();
|
||||
public ArrayList<Module_> modules = new ArrayList<>();
|
||||
public ArrayList<Module> modules = new ArrayList<>();
|
||||
|
||||
public ModuleManager()
|
||||
{
|
||||
|
@ -18,25 +18,21 @@ public class ModuleManager
|
|||
new Step(),
|
||||
new Fullbright(),
|
||||
new Speed(),
|
||||
new ModulesList()
|
||||
new ModulesList(),
|
||||
new TestModule()
|
||||
);
|
||||
}
|
||||
|
||||
public void registerModule(Module_ module)
|
||||
{
|
||||
modules.add(module);
|
||||
}
|
||||
|
||||
public void registerModules(Module_... modules)
|
||||
private void registerModules(Module... modules)
|
||||
{
|
||||
for (Module_ module : modules) {
|
||||
for (Module module : modules) {
|
||||
this.modules.add(module);
|
||||
}
|
||||
}
|
||||
|
||||
public Module_ getModuleByName(String moduleName)
|
||||
public Module getModuleByName(String moduleName)
|
||||
{
|
||||
for(Module_ module : modules)
|
||||
for(Module module : modules)
|
||||
{
|
||||
if ((module.name.trim().equalsIgnoreCase(moduleName)))
|
||||
{
|
||||
|
@ -46,10 +42,10 @@ public class ModuleManager
|
|||
return null;
|
||||
}
|
||||
|
||||
public ArrayList<Module_> getModulesByCategory(Category category)
|
||||
public ArrayList<Module> getModulesByCategory(Category category)
|
||||
{
|
||||
ArrayList<Module_> returnedModules = new ArrayList<>();
|
||||
for(Module_ module : modules)
|
||||
ArrayList<Module> returnedModules = new ArrayList<>();
|
||||
for(Module module : modules)
|
||||
{
|
||||
if (module.category == category)
|
||||
{
|
||||
|
@ -59,10 +55,10 @@ public class ModuleManager
|
|||
return returnedModules;
|
||||
}
|
||||
|
||||
public ArrayList<Module_> getEnabledModules()
|
||||
public ArrayList<Module> getEnabledModules()
|
||||
{
|
||||
ArrayList<Module_> enabledModules = new ArrayList<>();
|
||||
for (Module_ module : modules)
|
||||
ArrayList<Module> enabledModules = new ArrayList<>();
|
||||
for (Module module : modules)
|
||||
{
|
||||
if (!module.enabled)
|
||||
continue;
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package me.kawaiizenbo.moonlight.module.modules;
|
||||
|
||||
import me.kawaiizenbo.moonlight.module.Category;
|
||||
import me.kawaiizenbo.moonlight.module.Module_;
|
||||
import me.kawaiizenbo.moonlight.module.Module;
|
||||
|
||||
public class Fly extends Module_
|
||||
public class Fly extends Module
|
||||
{
|
||||
|
||||
public Fly()
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package me.kawaiizenbo.moonlight.module.modules;
|
||||
|
||||
import me.kawaiizenbo.moonlight.module.Category;
|
||||
import me.kawaiizenbo.moonlight.module.Module_;
|
||||
import me.kawaiizenbo.moonlight.module.Module;
|
||||
import me.kawaiizenbo.moonlight.util.ISimpleOption;
|
||||
|
||||
public class Fullbright extends Module_
|
||||
public class Fullbright extends Module
|
||||
{
|
||||
public Fullbright()
|
||||
{
|
||||
|
|
|
@ -2,13 +2,13 @@ package me.kawaiizenbo.moonlight.module.modules;
|
|||
|
||||
import me.kawaiizenbo.moonlight.Moonlight;
|
||||
import me.kawaiizenbo.moonlight.module.Category;
|
||||
import me.kawaiizenbo.moonlight.module.Module_;
|
||||
import me.kawaiizenbo.moonlight.module.Module;
|
||||
import me.kawaiizenbo.moonlight.module.settings.BooleanSetting;
|
||||
import me.kawaiizenbo.moonlight.module.settings.DoubleSetting;
|
||||
import me.kawaiizenbo.moonlight.ui.HUDOverlay;
|
||||
import me.kawaiizenbo.moonlight.util.ColorUtils;
|
||||
|
||||
public class HUDModule extends Module_
|
||||
public class HUDModule extends Module
|
||||
{
|
||||
public BooleanSetting clientTag = new BooleanSetting("Client Tag", true);
|
||||
public DoubleSetting r = new DoubleSetting("Red", 0x55, 0, 255, 0);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package me.kawaiizenbo.moonlight.module.modules;
|
||||
|
||||
import me.kawaiizenbo.moonlight.module.Category;
|
||||
import me.kawaiizenbo.moonlight.module.Module_;
|
||||
import me.kawaiizenbo.moonlight.module.Module;
|
||||
|
||||
public class ModulesList extends Module_
|
||||
public class ModulesList extends Module
|
||||
{
|
||||
public ModulesList()
|
||||
{
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package me.kawaiizenbo.moonlight.module.modules;
|
||||
|
||||
import me.kawaiizenbo.moonlight.module.Category;
|
||||
import me.kawaiizenbo.moonlight.module.Module_;
|
||||
import me.kawaiizenbo.moonlight.module.Module;
|
||||
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
|
||||
|
||||
public class NoFall extends Module_
|
||||
public class NoFall extends Module
|
||||
{
|
||||
public NoFall()
|
||||
{
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package me.kawaiizenbo.moonlight.module.modules;
|
||||
|
||||
import me.kawaiizenbo.moonlight.module.Category;
|
||||
import me.kawaiizenbo.moonlight.module.Module_;
|
||||
import me.kawaiizenbo.moonlight.module.Module;
|
||||
import me.kawaiizenbo.moonlight.module.settings.DoubleSetting;
|
||||
import net.minecraft.entity.MovementType;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
|
||||
public class Speed extends Module_
|
||||
public class Speed extends Module
|
||||
{
|
||||
DoubleSetting speed = new DoubleSetting("Speed", 2, 0.1, 10, 1);
|
||||
public Speed()
|
||||
|
@ -17,6 +17,7 @@ public class Speed extends Module_
|
|||
@Override
|
||||
public void onMotion(MovementType type, Vec3d movement)
|
||||
{
|
||||
// ???
|
||||
mc.player.addVelocity(movement);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package me.kawaiizenbo.moonlight.module.modules;
|
||||
|
||||
import me.kawaiizenbo.moonlight.module.Category;
|
||||
import me.kawaiizenbo.moonlight.module.Module_;
|
||||
import me.kawaiizenbo.moonlight.module.Module;
|
||||
import me.kawaiizenbo.moonlight.module.settings.DoubleSetting;
|
||||
|
||||
public class Step extends Module_
|
||||
public class Step extends Module
|
||||
{
|
||||
DoubleSetting stepHeight = new DoubleSetting("Height", 1, 1, 10, 0);
|
||||
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
package me.kawaiizenbo.moonlight.module.modules;
|
||||
|
||||
import me.kawaiizenbo.moonlight.module.Category;
|
||||
import me.kawaiizenbo.moonlight.module.Module;
|
||||
import me.kawaiizenbo.moonlight.module.settings.BooleanSetting;
|
||||
import me.kawaiizenbo.moonlight.module.settings.DoubleSetting;
|
||||
import me.kawaiizenbo.moonlight.module.settings.StringSetting;
|
||||
|
||||
public class TestModule extends Module
|
||||
{
|
||||
public BooleanSetting bs = new BooleanSetting("BooleanSetting", false);
|
||||
public DoubleSetting ds = new DoubleSetting("DoubleSetting", 1, 0, 10, 10);
|
||||
public StringSetting ss = new StringSetting("StringSetting", "string");
|
||||
|
||||
public TestModule()
|
||||
{
|
||||
super("Test Module", "Used for testing module features.", Category.WORLD);
|
||||
addSettings(bs, ds, ss);
|
||||
}
|
||||
}
|
|
@ -1,5 +1,9 @@
|
|||
package me.kawaiizenbo.moonlight.module.settings;
|
||||
|
||||
import net.minecraft.client.font.TextRenderer;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
public class StringSetting extends Setting
|
||||
{
|
||||
public String value;
|
||||
|
@ -9,4 +13,14 @@ public class StringSetting extends Setting
|
|||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(DrawContext drawContext, int x, int y, int mouseX, int mouseY, TextRenderer textRenderer)
|
||||
{
|
||||
super.render(drawContext, x, y, mouseX, mouseY, textRenderer);
|
||||
drawContext.drawTextWithShadow(textRenderer, Text.literal(name), x+2, y+4, 0xFFFFFF);
|
||||
int twidth = textRenderer.getWidth(value);
|
||||
drawContext.drawTextWithShadow(textRenderer, value, x+190-twidth, y+4, 0xFFFFFF);
|
||||
drawContext.drawTextWithShadow(textRenderer, "WIP, please use the .setting command", x+2, y+14, 0xFFFFFF);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue