remove an unused field, finish up merge

This commit is contained in:
TudbuT 2024-05-23 03:19:10 +02:00
parent 4d13e69f9b
commit ff14931ebd
2 changed files with 6 additions and 9 deletions

View file

@ -1,6 +1,6 @@
package com.baseband.client.module;
import com.baseband.client.Setup;
import com.baseband.client.init.Setup;
import com.baseband.client.init.BaseBand;
import com.baseband.client.configuration.ConfigHandle;
import com.baseband.client.configuration.Configuration;
@ -27,7 +27,7 @@ import java.util.HashMap;
//Double fuck you if this involves commands too then it's a feature not a module
public abstract class Feature extends ToggleButton implements SetCommand {
protected final Setup Setup = com.baseband.client.Setup.get();
protected final Setup Setup = com.baseband.client.init.Setup.get();
protected BaseBand bb;
protected Minecraft mc;
@ -36,8 +36,6 @@ public abstract class Feature extends ToggleButton implements SetCommand {
@Marker(1)
public boolean enabled = defaultEnable();
public boolean firstUpdate = false;
public Feature() {
super("Uninit", null, "Enabled");
this.setLambda(this::updateEnabled);

View file

@ -1,16 +1,15 @@
package com.baseband.client.module.command;
import com.baseband.client.BaseBand;
import com.baseband.client.Setup;
import com.baseband.client.init.BaseBand;
import com.baseband.client.configuration.ConfigHandle;
import com.baseband.client.module.Feature;
import com.baseband.client.module.category.Command;
import com.baseband.client.module.client.Client;
import com.baseband.client.util.ChatUtil;
import com.baseband.client.util.SetCommand;
import com.baseband.client.util.Util;
import java.util.HashMap;
import java.util.Random;
@Command
public class Set extends Feature {
@ -18,8 +17,8 @@ public class Set extends Feature {
private static final HashMap<Integer, ConfigHandle> quickSet = new HashMap<>();
public static int addQuickSet(ConfigHandle handle) {
int n = BaseBand.RANDOM.nextInt(0, Integer.MAX_VALUE);
while(quickSet.containsKey(n)) n = BaseBand.RANDOM.nextInt(0, Integer.MAX_VALUE);
int n = Util.RANDOM.nextInt(0, Integer.MAX_VALUE);
while(quickSet.containsKey(n)) n = Util.RANDOM.nextInt(0, Integer.MAX_VALUE);
quickSet.put(n, handle);
return n;
}