Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ dependencies {
shadow(runtimeOnly(compileOnly("com.kohlschutter.junixsocket:junixsocket-common:2.10.1")!!)!!)
shadow(runtimeOnly(compileOnly("com.kohlschutter.junixsocket:junixsocket-native-common:2.10.1")!!)!!)

shadow(runtimeOnly(compileOnly("com.github.mizosoft.methanol:methanol:1.9.0")!!)!!)
shadow(runtimeOnly(compileOnly("io.nayuki:qrcodegen:1.8.0")!!)!!)

compileOnly("net.hypixel:mod-api:1.0.1")
compileOnly("com.mojang:brigadier:1.0.18")

Expand Down Expand Up @@ -128,15 +125,12 @@ tasks.shadowJar {
archiveClassifier.set("")
mergeServiceFiles()
minimize {
exclude(dependency("com.github.mizosoft.methanol:.*:.*"))
exclude(dependency("io.github.CDAGaming:DiscordIPC:.*"))
exclude(dependency("com.kohlschutter.junixsocket:junixsocket-common:.*"))
exclude(dependency("com.kohlschutter.junixsocket:junixsocket-native-common:.*"))
}

relocate("com.jagrosh", "io.github.axolotlclient.shadow.jagrosh")
relocate("com.github.mizosoft", "io.github.axolotlclient.shadow.mizosoft")
relocate("io.nayuki", "io.github.axolotlclient.shadow.nayuki")

append("../LICENSE")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
import io.github.axolotlclient.AxolotlClientConfig.impl.managers.JsonConfigManager;
import io.github.axolotlclient.AxolotlClientConfig.impl.managers.VersionedJsonConfigManager;
import io.github.axolotlclient.api.API;
import io.github.axolotlclient.api.Options;
import io.github.axolotlclient.bridge.events.Events;
import io.github.axolotlclient.bridge.util.AxoIdentifier;
import io.github.axolotlclient.bridge.util.AxoProfiler;
Expand All @@ -56,7 +54,6 @@
import io.github.axolotlclient.util.FeatureDisablerCommon;
import io.github.axolotlclient.util.Logger;
import io.github.axolotlclient.util.OSUtil;
import io.github.axolotlclient.util.compat.BetterTabCompat;
import io.github.axolotlclient.util.notifications.NotificationProvider;
import lombok.Getter;
import net.fabricmc.loader.api.FabricLoader;
Expand Down Expand Up @@ -160,9 +157,7 @@ private void addBuiltinCommonModules() {
registerModule(Freelook.getInstance());
registerModule(TntTime.getInstance());
registerModule(DiscordRPC.getInstance());
registerModule(getApiOptions());
registerModule(Zoom.getInstance());
registerModule(new BetterTabCompat());
}

// init logic
Expand Down Expand Up @@ -232,10 +227,7 @@ protected final void init(NotificationProvider provider) {

getFeatureDisabler().init();

// register events

Events.END_RESOURCE_RELOAD.register(() -> HypixelAbstractionLayer.getInstance().clearPlayerData());
Events.CLIENT_STOP.register(() -> API.getInstance().shutdown());
}

protected final void registerModule(Module module) {
Expand All @@ -247,8 +239,6 @@ protected final void registerModule(Module module) {

protected abstract DolphinClientConfigCommon createConfig();

public abstract Options getApiOptions();

// random stuff

public void saveConfig() {
Expand Down Expand Up @@ -282,6 +272,5 @@ public void reloadConfig() {
}
}
lateModuleInit();
API.getInstance().restart();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,29 +66,12 @@ public boolean showButton() {
}

}
public enum TabBadgeMode {
BEFORE_NAME,
BEFORE_NAME_ALIGNED,
BEFORE_PING;

@Override
public String toString() {
return "tab_badge_mode." + super.toString().toLowerCase(Locale.ROOT);
}

}

// options

public final BooleanOption showOwnNametag = new BooleanOption("showOwnNametag", false);
public final BooleanOption useShadows = new BooleanOption("useShadows", false);
public final BooleanOption nametagBackground = new BooleanOption("nametagBackground", true);

public final BooleanOption showBadges = new BooleanOption("showBadges", true);
public final BooleanOption customBadge = new BooleanOption("customBadge", false);
public final StringOption badgeText = new StringOption("badgeText", "");
public final EnumOption<TabBadgeMode> tabBadgeMode = new EnumOption<>("tab_badge_mode", TabBadgeMode.class, TabBadgeMode.BEFORE_NAME);

public final ForceableBooleanOption timeChangerEnabled = new ForceableBooleanOption("enabled", false);
public final IntegerOption customTime = new IntegerOption("time", 0, 0, 24000);

Expand Down
Loading