Update to newest dev version - fixes #92
This commit is contained in:
@@ -10,10 +10,11 @@ import anticope.rejects.utils.RejectsUtils;
|
|||||||
import meteordevelopment.meteorclient.addons.MeteorAddon;
|
import meteordevelopment.meteorclient.addons.MeteorAddon;
|
||||||
import meteordevelopment.meteorclient.MeteorClient;
|
import meteordevelopment.meteorclient.MeteorClient;
|
||||||
import meteordevelopment.meteorclient.gui.GuiThemes;
|
import meteordevelopment.meteorclient.gui.GuiThemes;
|
||||||
|
import meteordevelopment.meteorclient.systems.Systems;
|
||||||
import meteordevelopment.meteorclient.systems.commands.Commands;
|
import meteordevelopment.meteorclient.systems.commands.Commands;
|
||||||
|
import meteordevelopment.meteorclient.systems.hud.HUD;
|
||||||
import meteordevelopment.meteorclient.systems.modules.Category;
|
import meteordevelopment.meteorclient.systems.modules.Category;
|
||||||
import meteordevelopment.meteorclient.systems.modules.Modules;
|
import meteordevelopment.meteorclient.systems.modules.Modules;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HUD;
|
|
||||||
import net.minecraft.item.Items;
|
import net.minecraft.item.Items;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@@ -87,7 +88,7 @@ public class MeteorRejectsAddon extends MeteorAddon {
|
|||||||
commands.add(new TerrainExport());
|
commands.add(new TerrainExport());
|
||||||
|
|
||||||
// HUD
|
// HUD
|
||||||
HUD hud = modules.get(HUD.class);
|
HUD hud = Systems.get(HUD.class);
|
||||||
hud.elements.add(new AppleHud(hud));
|
hud.elements.add(new AppleHud(hud));
|
||||||
hud.elements.add(new BaritoneHud(hud));
|
hud.elements.add(new BaritoneHud(hud));
|
||||||
hud.elements.add(new CrystalHud(hud));
|
hud.elements.add(new CrystalHud(hud));
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ package anticope.rejects.gui.hud;
|
|||||||
import meteordevelopment.meteorclient.settings.DoubleSetting;
|
import meteordevelopment.meteorclient.settings.DoubleSetting;
|
||||||
import meteordevelopment.meteorclient.settings.Setting;
|
import meteordevelopment.meteorclient.settings.Setting;
|
||||||
import meteordevelopment.meteorclient.settings.SettingGroup;
|
import meteordevelopment.meteorclient.settings.SettingGroup;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HUD;
|
import meteordevelopment.meteorclient.systems.hud.HUD;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HudRenderer;
|
import meteordevelopment.meteorclient.systems.hud.HudRenderer;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.modules.HudElement;
|
import meteordevelopment.meteorclient.systems.hud.modules.HudElement;
|
||||||
import meteordevelopment.meteorclient.utils.player.InvUtils;
|
import meteordevelopment.meteorclient.utils.player.InvUtils;
|
||||||
import meteordevelopment.meteorclient.utils.render.RenderUtils;
|
import meteordevelopment.meteorclient.utils.render.RenderUtils;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ package anticope.rejects.gui.hud;
|
|||||||
|
|
||||||
import baritone.api.BaritoneAPI;
|
import baritone.api.BaritoneAPI;
|
||||||
import baritone.api.process.IBaritoneProcess;
|
import baritone.api.process.IBaritoneProcess;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HUD;
|
import meteordevelopment.meteorclient.systems.hud.HUD;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.modules.DoubleTextHudElement;
|
import meteordevelopment.meteorclient.systems.hud.modules.DoubleTextHudElement;
|
||||||
|
|
||||||
public class BaritoneHud extends DoubleTextHudElement {
|
public class BaritoneHud extends DoubleTextHudElement {
|
||||||
public BaritoneHud(HUD hud) {
|
public BaritoneHud(HUD hud) {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package anticope.rejects.gui.hud;
|
package anticope.rejects.gui.hud;
|
||||||
|
|
||||||
import anticope.rejects.utils.RejectsUtils;
|
import anticope.rejects.utils.RejectsUtils;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HUD;
|
import meteordevelopment.meteorclient.systems.hud.HUD;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.modules.DoubleTextHudElement;
|
import meteordevelopment.meteorclient.systems.hud.modules.DoubleTextHudElement;
|
||||||
|
|
||||||
public class CpsHud extends DoubleTextHudElement {
|
public class CpsHud extends DoubleTextHudElement {
|
||||||
public CpsHud(HUD hud) {
|
public CpsHud(HUD hud) {
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ package anticope.rejects.gui.hud;
|
|||||||
import meteordevelopment.meteorclient.settings.DoubleSetting;
|
import meteordevelopment.meteorclient.settings.DoubleSetting;
|
||||||
import meteordevelopment.meteorclient.settings.Setting;
|
import meteordevelopment.meteorclient.settings.Setting;
|
||||||
import meteordevelopment.meteorclient.settings.SettingGroup;
|
import meteordevelopment.meteorclient.settings.SettingGroup;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HUD;
|
import meteordevelopment.meteorclient.systems.hud.HUD;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HudRenderer;
|
import meteordevelopment.meteorclient.systems.hud.HudRenderer;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.modules.HudElement;
|
import meteordevelopment.meteorclient.systems.hud.modules.HudElement;
|
||||||
import meteordevelopment.meteorclient.utils.player.InvUtils;
|
import meteordevelopment.meteorclient.utils.player.InvUtils;
|
||||||
import meteordevelopment.meteorclient.utils.render.RenderUtils;
|
import meteordevelopment.meteorclient.utils.render.RenderUtils;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ package anticope.rejects.gui.hud;
|
|||||||
import meteordevelopment.meteorclient.settings.DoubleSetting;
|
import meteordevelopment.meteorclient.settings.DoubleSetting;
|
||||||
import meteordevelopment.meteorclient.settings.Setting;
|
import meteordevelopment.meteorclient.settings.Setting;
|
||||||
import meteordevelopment.meteorclient.settings.SettingGroup;
|
import meteordevelopment.meteorclient.settings.SettingGroup;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HUD;
|
import meteordevelopment.meteorclient.systems.hud.HUD;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.HudRenderer;
|
import meteordevelopment.meteorclient.systems.hud.HudRenderer;
|
||||||
import meteordevelopment.meteorclient.systems.modules.render.hud.modules.HudElement;
|
import meteordevelopment.meteorclient.systems.hud.modules.HudElement;
|
||||||
import meteordevelopment.meteorclient.utils.player.InvUtils;
|
import meteordevelopment.meteorclient.utils.player.InvUtils;
|
||||||
import meteordevelopment.meteorclient.utils.render.RenderUtils;
|
import meteordevelopment.meteorclient.utils.render.RenderUtils;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|||||||
@@ -1,46 +1,18 @@
|
|||||||
package anticope.rejects.mixin.meteor;
|
package anticope.rejects.mixin.meteor;
|
||||||
|
|
||||||
|
import anticope.rejects.utils.ConfigModifier;
|
||||||
import anticope.rejects.utils.RejectsConfig;
|
import anticope.rejects.utils.RejectsConfig;
|
||||||
import meteordevelopment.meteorclient.gui.tabs.builtin.ConfigTab;
|
import meteordevelopment.meteorclient.gui.tabs.builtin.ConfigTab;
|
||||||
import meteordevelopment.meteorclient.settings.*;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import meteordevelopment.meteorclient.systems.modules.Module;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.spongepowered.asm.mixin.*;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||||
|
|
||||||
@Mixin(ConfigTab.class)
|
@Mixin(ConfigTab.class)
|
||||||
public class ConfigTabMixin {
|
public class ConfigTabMixin {
|
||||||
@Shadow(remap = false)
|
// No idea why CallbackInfoReturnable, but fabric crashes otherwise lol
|
||||||
@Final
|
@Inject(method = "createScreen", at=@At("HEAD"), remap = false)
|
||||||
private static Settings settings;
|
private void onCreateScreen(CallbackInfoReturnable<?> cir) {
|
||||||
|
ConfigModifier.INSTANCE.hiddenModules.set(RejectsConfig.get().getHiddenModules());
|
||||||
private static final SettingGroup sgRejects = settings.createGroup("Rejects");
|
}
|
||||||
|
}
|
||||||
private static final Setting<RejectsConfig.HttpAllowed> httpAllowed = sgRejects.add(new EnumSetting.Builder<RejectsConfig.HttpAllowed>()
|
|
||||||
.name("http-allowed")
|
|
||||||
.description("Changes what api endpoints can be reached.")
|
|
||||||
.defaultValue(RejectsConfig.get().httpAllowed)
|
|
||||||
.onChanged(v -> RejectsConfig.get().httpAllowed = v)
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
|
|
||||||
private final Setting<List<Module>> hiddenModules = sgRejects.add(new ModuleListSetting.Builder()
|
|
||||||
.name("hidden-modules")
|
|
||||||
.description("Which modules to hide.")
|
|
||||||
.defaultValue(Arrays.asList())
|
|
||||||
.defaultValue(RejectsConfig.get().getHiddenModules())
|
|
||||||
.onChanged(v -> RejectsConfig.get().setHiddenModules(v))
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
|
|
||||||
// No idea why CallbackInfoReturnable, but fabric crashes otherwise lol
|
|
||||||
@Inject(method = "createScreen", at=@At("HEAD"), remap = false)
|
|
||||||
private void onCreateScreen(CallbackInfoReturnable<?> cir) {
|
|
||||||
hiddenModules.set(RejectsConfig.get().getHiddenModules());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package anticope.rejects.mixin.meteor;
|
||||||
|
|
||||||
|
import anticope.rejects.utils.ConfigModifier;
|
||||||
|
import meteordevelopment.meteorclient.systems.Systems;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
|
@Mixin(Systems.class)
|
||||||
|
public class SystemsMixin {
|
||||||
|
@Inject(method = "init", at = @At(value = "INVOKE", target = "Lmeteordevelopment/meteorclient/systems/System;load()V"), remap = false)
|
||||||
|
private static void onInitializeConfig(CallbackInfo ci) {
|
||||||
|
// adds the reject settings
|
||||||
|
new ConfigModifier();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -59,7 +59,7 @@ public class SkeletonESP extends Module {
|
|||||||
mc.world.getEntities().forEach(entity -> {
|
mc.world.getEntities().forEach(entity -> {
|
||||||
if (!(entity instanceof PlayerEntity)) return;
|
if (!(entity instanceof PlayerEntity)) return;
|
||||||
if (mc.options.getPerspective() == Perspective.FIRST_PERSON && !freecam.isActive() && mc.player == entity) return;
|
if (mc.options.getPerspective() == Perspective.FIRST_PERSON && !freecam.isActive() && mc.player == entity) return;
|
||||||
int rotationHoldTicks = Config.get().rotationHoldTicks;
|
int rotationHoldTicks = Config.get().rotationHoldTicks.get();
|
||||||
|
|
||||||
Color skeletonColor = PlayerUtils.getPlayerColor((PlayerEntity)entity, skeletonColorSetting.get());
|
Color skeletonColor = PlayerUtils.getPlayerColor((PlayerEntity)entity, skeletonColorSetting.get());
|
||||||
PlayerEntity playerEntity = (PlayerEntity) entity;
|
PlayerEntity playerEntity = (PlayerEntity) entity;
|
||||||
|
|||||||
39
src/main/java/anticope/rejects/utils/ConfigModifier.java
Normal file
39
src/main/java/anticope/rejects/utils/ConfigModifier.java
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
package anticope.rejects.utils;
|
||||||
|
|
||||||
|
import meteordevelopment.meteorclient.settings.EnumSetting;
|
||||||
|
import meteordevelopment.meteorclient.settings.ModuleListSetting;
|
||||||
|
import meteordevelopment.meteorclient.settings.Setting;
|
||||||
|
import meteordevelopment.meteorclient.settings.SettingGroup;
|
||||||
|
import meteordevelopment.meteorclient.systems.config.Config;
|
||||||
|
import meteordevelopment.meteorclient.systems.modules.Module;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class ConfigModifier {
|
||||||
|
|
||||||
|
public static ConfigModifier INSTANCE;
|
||||||
|
|
||||||
|
public ConfigModifier() {
|
||||||
|
INSTANCE = this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public final SettingGroup sgRejects = Config.get().settings.createGroup("Rejects");
|
||||||
|
|
||||||
|
public final Setting<RejectsConfig.HttpAllowed> httpAllowed = sgRejects.add(new EnumSetting.Builder<RejectsConfig.HttpAllowed>()
|
||||||
|
.name("http-allowed")
|
||||||
|
.description("Changes what api endpoints can be reached.")
|
||||||
|
.defaultValue(RejectsConfig.get().httpAllowed)
|
||||||
|
.onChanged(v -> RejectsConfig.get().httpAllowed = v)
|
||||||
|
.build()
|
||||||
|
);
|
||||||
|
|
||||||
|
public final Setting<List<Module>> hiddenModules = sgRejects.add(new ModuleListSetting.Builder()
|
||||||
|
.name("hidden-modules")
|
||||||
|
.description("Which modules to hide.")
|
||||||
|
.defaultValue(Arrays.asList())
|
||||||
|
.defaultValue(RejectsConfig.get().getHiddenModules())
|
||||||
|
.onChanged(v -> RejectsConfig.get().setHiddenModules(v))
|
||||||
|
.build()
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -3,12 +3,15 @@
|
|||||||
"package": "anticope.rejects.mixin.meteor",
|
"package": "anticope.rejects.mixin.meteor",
|
||||||
"compatibilityLevel": "JAVA_16",
|
"compatibilityLevel": "JAVA_16",
|
||||||
"client": [
|
"client": [
|
||||||
"modules.NoRenderAccessor",
|
|
||||||
"modules.FlightMixin",
|
|
||||||
"CommandsMixin",
|
"CommandsMixin",
|
||||||
"ConfigTabMixin",
|
"ConfigMixin",
|
||||||
"GuiRendererAccessor",
|
"GuiRendererAccessor",
|
||||||
"HttpMixin",
|
"HttpMixin",
|
||||||
"ModulesMixin"
|
"ModulesMixin",
|
||||||
|
"modules.FlightMixin",
|
||||||
|
"modules.NoRenderAccessor"
|
||||||
|
],
|
||||||
|
"mixins": [
|
||||||
|
"ConfigTabMixin"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user