diff --git a/Client/src/main/java/com/baseband/client/BaseBand.java b/Client/src/main/java/com/baseband/client/BaseBand.java index 0d68163..847984d 100644 --- a/Client/src/main/java/com/baseband/client/BaseBand.java +++ b/Client/src/main/java/com/baseband/client/BaseBand.java @@ -1,19 +1,19 @@ package com.baseband.client; import com.baseband.client.event.Event; -import com.baseband.client.event.remote.RemoteEvent; -import com.baseband.client.event.remote.RemoteEventManager; -import com.baseband.client.registry.ConfigHandle; -import com.baseband.client.registry.Updater; import com.baseband.client.event.EventManager; import com.baseband.client.event.FMLEventHandler; +import com.baseband.client.event.remote.RemoteEvent; +import com.baseband.client.event.remote.RemoteEventManager; import com.baseband.client.feature.Feature; import com.baseband.client.feature.client.Client; -import com.baseband.client.feature.render.*; -import com.baseband.client.util.type.KeyBind; +import com.baseband.client.feature.render.HUD; +import com.baseband.client.registry.ConfigHandle; +import com.baseband.client.registry.Updater; import com.baseband.client.util.interact.ChatUtil; -import com.baseband.client.util.type.FeatureAction; import com.baseband.client.util.misc.GlobalUtil; +import com.baseband.client.util.type.FeatureAction; +import com.baseband.client.util.type.KeyBind; import de.tudbut.parsing.TCN; import de.tudbut.tools.Lock; import net.minecraft.client.Minecraft; diff --git a/Client/src/main/java/com/baseband/client/event/FMLEventHandler.java b/Client/src/main/java/com/baseband/client/event/FMLEventHandler.java index fdc1a0d..263f885 100644 --- a/Client/src/main/java/com/baseband/client/event/FMLEventHandler.java +++ b/Client/src/main/java/com/baseband/client/event/FMLEventHandler.java @@ -1,8 +1,8 @@ package com.baseband.client.event; +import com.baseband.client.BaseBand; import com.baseband.client.Setup; import com.baseband.client.event.events.PlayerDestroyEvent; -import com.baseband.client.BaseBand; import com.baseband.client.feature.Feature; import com.baseband.client.feature.client.Client; import com.baseband.client.util.interact.ChatUtil; diff --git a/Client/src/main/java/com/baseband/client/event/remote/RemoteEventManager.java b/Client/src/main/java/com/baseband/client/event/remote/RemoteEventManager.java index 64211ee..454c48b 100644 --- a/Client/src/main/java/com/baseband/client/event/remote/RemoteEventManager.java +++ b/Client/src/main/java/com/baseband/client/event/remote/RemoteEventManager.java @@ -10,7 +10,10 @@ import de.tudbut.parsing.JSON; import de.tudbut.parsing.TCN; import de.tudbut.tools.ConfigSaverTCN2; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; +import java.io.OutputStream; import java.net.ServerSocket; import java.net.Socket; import java.util.ArrayList; diff --git a/Client/src/main/java/com/baseband/client/feature/Category.java b/Client/src/main/java/com/baseband/client/feature/Category.java index 9d1266c..edb0099 100644 --- a/Client/src/main/java/com/baseband/client/feature/Category.java +++ b/Client/src/main/java/com/baseband/client/feature/Category.java @@ -1,9 +1,9 @@ package com.baseband.client.feature; import com.baseband.client.BaseBand; +import com.baseband.client.feature.category.*; import com.baseband.client.registry.ConfigHandle; import com.baseband.client.registry.Configuration; -import com.baseband.client.feature.category.*; import com.baseband.client.util.adapt.FieldFinder; import com.baseband.client.util.adapt.Marker; diff --git a/Client/src/main/java/com/baseband/client/feature/Feature.java b/Client/src/main/java/com/baseband/client/feature/Feature.java index 880df9b..02c2ffd 100644 --- a/Client/src/main/java/com/baseband/client/feature/Feature.java +++ b/Client/src/main/java/com/baseband/client/feature/Feature.java @@ -1,19 +1,17 @@ package com.baseband.client.feature; -import com.baseband.client.Setup; -import com.baseband.client.registry.AnyGate; -import com.baseband.client.registry.annotation.*; -import com.baseband.client.gui.lib.component.*; import com.baseband.client.BaseBand; +import com.baseband.client.Setup; +import com.baseband.client.feature.category.Command; +import com.baseband.client.gui.lib.component.*; +import com.baseband.client.registry.AnyGate; import com.baseband.client.registry.ConfigHandle; import com.baseband.client.registry.Configuration; -import com.baseband.client.feature.category.Command; -import com.baseband.client.registry.annotation.Description; -import com.baseband.client.util.adapt.FieldFinder; -import com.baseband.client.util.type.KeyBind; -import com.baseband.client.util.adapt.Marker; import com.baseband.client.registry.SetCommand; -import com.baseband.client.registry.annotation.Trigger; +import com.baseband.client.registry.annotation.*; +import com.baseband.client.util.adapt.FieldFinder; +import com.baseband.client.util.adapt.Marker; +import com.baseband.client.util.type.KeyBind; import net.minecraft.client.Minecraft; import net.minecraftforge.common.MinecraftForge; diff --git a/Client/src/main/java/com/baseband/client/feature/chat/ChatAppend.java b/Client/src/main/java/com/baseband/client/feature/chat/ChatAppend.java index 27a97b8..13d77c0 100644 --- a/Client/src/main/java/com/baseband/client/feature/chat/ChatAppend.java +++ b/Client/src/main/java/com/baseband/client/feature/chat/ChatAppend.java @@ -1,9 +1,9 @@ package com.baseband.client.feature.chat; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Gate; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Chat; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Gate; import com.baseband.client.util.adapt.Marker; import net.minecraftforge.client.event.ClientChatEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/Client/src/main/java/com/baseband/client/feature/chat/ChatCrypt.java b/Client/src/main/java/com/baseband/client/feature/chat/ChatCrypt.java index f9218eb..880d00d 100644 --- a/Client/src/main/java/com/baseband/client/feature/chat/ChatCrypt.java +++ b/Client/src/main/java/com/baseband/client/feature/chat/ChatCrypt.java @@ -1,17 +1,18 @@ package com.baseband.client.feature.chat; -import com.baseband.client.registry.annotation.Description; -import com.baseband.client.registry.annotation.*; -import com.baseband.client.event.events.PacketEvent; import com.baseband.client.BaseBand; -import com.baseband.client.mixins.ICPacketChat; +import com.baseband.client.event.events.PacketEvent; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Chat; import com.baseband.client.feature.render.HUD; +import com.baseband.client.mixins.ICPacketChat; +import com.baseband.client.registry.annotation.*; import com.baseband.client.util.adapt.FieldFinder; import com.baseband.client.util.adapt.Marker; import com.baseband.client.util.interact.ChatUtil; -import com.baseband.client.util.misc.*; +import com.baseband.client.util.misc.GlobalUtil; +import com.baseband.client.util.misc.SBE; +import com.baseband.client.util.misc.Trypt; import de.tudbut.tools.Hasher; import net.minecraft.network.play.client.CPacketChatMessage; import net.minecraft.network.play.server.SPacketChat; diff --git a/Client/src/main/java/com/baseband/client/feature/chat/ChatExtras.java b/Client/src/main/java/com/baseband/client/feature/chat/ChatExtras.java index cb6ff05..098c374 100644 --- a/Client/src/main/java/com/baseband/client/feature/chat/ChatExtras.java +++ b/Client/src/main/java/com/baseband/client/feature/chat/ChatExtras.java @@ -1,16 +1,16 @@ package com.baseband.client.feature.chat; import com.baseband.client.BaseBand; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Description; -import com.baseband.client.registry.annotation.Gate; import com.baseband.client.event.events.PacketEvent; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Chat; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Description; +import com.baseband.client.registry.annotation.Gate; +import com.baseband.client.registry.annotation.Trigger; import com.baseband.client.util.adapt.FieldFinder; import com.baseband.client.util.adapt.Marker; import com.baseband.client.util.interact.ChatUtil; -import com.baseband.client.registry.annotation.Trigger; import net.minecraft.client.gui.ChatLine; import net.minecraft.client.gui.GuiNewChat; import net.minecraft.network.play.server.SPacketChat; diff --git a/Client/src/main/java/com/baseband/client/feature/chat/ChatFilter.java b/Client/src/main/java/com/baseband/client/feature/chat/ChatFilter.java index 8d10567..9670c89 100644 --- a/Client/src/main/java/com/baseband/client/feature/chat/ChatFilter.java +++ b/Client/src/main/java/com/baseband/client/feature/chat/ChatFilter.java @@ -1,11 +1,11 @@ package com.baseband.client.feature.chat; -import com.baseband.client.registry.annotation.Config; import com.baseband.client.event.events.PacketEvent; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Chat; -import com.baseband.client.util.interact.ChatUtil; +import com.baseband.client.registry.annotation.Config; import com.baseband.client.util.adapt.FieldFinder; +import com.baseband.client.util.interact.ChatUtil; import com.baseband.client.util.misc.GlobalUtil; import net.minecraft.network.play.server.SPacketChat; import net.minecraft.util.text.ITextComponent; diff --git a/Client/src/main/java/com/baseband/client/feature/client/AutoReconnect.java b/Client/src/main/java/com/baseband/client/feature/client/AutoReconnect.java index 711e490..d26fa11 100644 --- a/Client/src/main/java/com/baseband/client/feature/client/AutoReconnect.java +++ b/Client/src/main/java/com/baseband/client/feature/client/AutoReconnect.java @@ -1,9 +1,9 @@ package com.baseband.client.feature.client; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Range; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.ClientCategory; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Range; import com.baseband.client.util.adapt.FieldFinder; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/Client/src/main/java/com/baseband/client/feature/client/Baritone.java b/Client/src/main/java/com/baseband/client/feature/client/Baritone.java index 60dc35b..867d09e 100644 --- a/Client/src/main/java/com/baseband/client/feature/client/Baritone.java +++ b/Client/src/main/java/com/baseband/client/feature/client/Baritone.java @@ -32,7 +32,7 @@ public class Baritone extends Feature { public void onTick() { IBaritoneProcess baritoneProcess = BaritoneManager.getBaritone().getPathingControlManager().mostRecentInControl().orElse(null); - text = "Baritone §7[" + (baritoneProcess == null ? "IDLE" : baritoneProcess.displayName()) + "]"; + text = "Baritone §7[" + (baritoneProcess == null ? "Idle" : baritoneProcess.displayName()) + "]"; } public void onSelect(SelectEvent event) { diff --git a/Client/src/main/java/com/baseband/client/feature/client/Client.java b/Client/src/main/java/com/baseband/client/feature/client/Client.java index 435d28d..204618c 100644 --- a/Client/src/main/java/com/baseband/client/feature/client/Client.java +++ b/Client/src/main/java/com/baseband/client/feature/client/Client.java @@ -1,19 +1,19 @@ package com.baseband.client.feature.client; -import com.baseband.client.feature.category.ClientCategory; -import com.baseband.client.registry.Configuration; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.KeyBound; -import com.baseband.client.util.interact.RotationManager; -import com.baseband.client.util.interact.ServerDataManager; -import com.baseband.client.registry.annotation.Description; +import com.baseband.client.BaseBand; import com.baseband.client.event.events.PacketEvent; import com.baseband.client.event.events.PlayerDestroyEvent; -import com.baseband.client.gui.GuiTheme; -import com.baseband.client.BaseBand; import com.baseband.client.feature.Feature; -import com.baseband.client.util.interact.ChatUtil; +import com.baseband.client.feature.category.ClientCategory; +import com.baseband.client.gui.GuiTheme; +import com.baseband.client.registry.Configuration; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Description; +import com.baseband.client.registry.annotation.KeyBound; import com.baseband.client.registry.annotation.Trigger; +import com.baseband.client.util.interact.ChatUtil; +import com.baseband.client.util.interact.RotationManager; +import com.baseband.client.util.interact.ServerDataManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.network.Packet; import net.minecraft.network.play.server.SPacketPlayerPosLook; diff --git a/Client/src/main/java/com/baseband/client/feature/client/MidClick.java b/Client/src/main/java/com/baseband/client/feature/client/MidClick.java index 0cfe58e..d57d649 100644 --- a/Client/src/main/java/com/baseband/client/feature/client/MidClick.java +++ b/Client/src/main/java/com/baseband/client/feature/client/MidClick.java @@ -1,10 +1,10 @@ package com.baseband.client.feature.client; import com.baseband.client.BaseBand; -import com.baseband.client.registry.annotation.Config; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.ClientCategory; import com.baseband.client.registry.PlayerDB; +import com.baseband.client.registry.annotation.Config; import com.baseband.client.util.interact.ChatUtil; import de.tudbut.parsing.TCN; import net.minecraft.entity.EntityLivingBase; diff --git a/Client/src/main/java/com/baseband/client/feature/client/Timer.java b/Client/src/main/java/com/baseband/client/feature/client/Timer.java index 406345d..a6823b6 100644 --- a/Client/src/main/java/com/baseband/client/feature/client/Timer.java +++ b/Client/src/main/java/com/baseband/client/feature/client/Timer.java @@ -1,15 +1,15 @@ package com.baseband.client.feature.client; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.util.interact.ServerDataManager; -import com.baseband.client.registry.annotation.Description; -import com.baseband.client.registry.annotation.Gate; -import com.baseband.client.registry.annotation.Range; import com.baseband.client.event.events.PlayerDestroyEvent; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.ClientCategory; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Description; +import com.baseband.client.registry.annotation.Gate; +import com.baseband.client.registry.annotation.Range; import com.baseband.client.util.adapt.FieldFinder; import com.baseband.client.util.adapt.Marker; +import com.baseband.client.util.interact.ServerDataManager; import net.minecraft.client.Minecraft; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/Client/src/main/java/com/baseband/client/feature/combat/AutoKill.java b/Client/src/main/java/com/baseband/client/feature/combat/AutoKill.java index 6450acf..933594a 100644 --- a/Client/src/main/java/com/baseband/client/feature/combat/AutoKill.java +++ b/Client/src/main/java/com/baseband/client/feature/combat/AutoKill.java @@ -1,10 +1,10 @@ package com.baseband.client.feature.combat; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Gate; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Combat; import com.baseband.client.registry.PlayerDB; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Gate; import com.baseband.client.util.adapt.Marker; import de.tudbut.parsing.TCN; import net.minecraft.entity.Entity; diff --git a/Client/src/main/java/com/baseband/client/feature/combat/AutoTotem.java b/Client/src/main/java/com/baseband/client/feature/combat/AutoTotem.java index eec8665..baa9785 100644 --- a/Client/src/main/java/com/baseband/client/feature/combat/AutoTotem.java +++ b/Client/src/main/java/com/baseband/client/feature/combat/AutoTotem.java @@ -1,12 +1,11 @@ package com.baseband.client.feature.combat; -import com.baseband.client.registry.annotation.*; -import com.baseband.client.gui.GuiBBIngame; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Combat; -import com.baseband.client.util.interact.ChatUtil; -import com.baseband.client.registry.annotation.Description; +import com.baseband.client.gui.GuiBBIngame; +import com.baseband.client.registry.annotation.*; import com.baseband.client.util.adapt.Marker; +import com.baseband.client.util.interact.ChatUtil; import com.baseband.client.util.interact.InventoryUtils; import de.tudbut.tools.Lock; import net.minecraft.client.gui.ScaledResolution; diff --git a/Client/src/main/java/com/baseband/client/feature/command/Bind.java b/Client/src/main/java/com/baseband/client/feature/command/Bind.java index 9ea23b6..c26d7ec 100644 --- a/Client/src/main/java/com/baseband/client/feature/command/Bind.java +++ b/Client/src/main/java/com/baseband/client/feature/command/Bind.java @@ -3,8 +3,8 @@ package com.baseband.client.feature.command; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Command; import com.baseband.client.feature.client.Client; -import com.baseband.client.util.interact.ChatUtil; import com.baseband.client.registry.SetCommand; +import com.baseband.client.util.interact.ChatUtil; import org.lwjgl.input.Keyboard; import static com.baseband.client.BaseBand.features; diff --git a/Client/src/main/java/com/baseband/client/feature/command/Set.java b/Client/src/main/java/com/baseband/client/feature/command/Set.java index 46762f7..5b1ca0a 100644 --- a/Client/src/main/java/com/baseband/client/feature/command/Set.java +++ b/Client/src/main/java/com/baseband/client/feature/command/Set.java @@ -1,11 +1,11 @@ package com.baseband.client.feature.command; -import com.baseband.client.registry.ConfigHandle; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Command; import com.baseband.client.feature.client.Client; -import com.baseband.client.util.interact.ChatUtil; +import com.baseband.client.registry.ConfigHandle; import com.baseband.client.registry.SetCommand; +import com.baseband.client.util.interact.ChatUtil; import com.baseband.client.util.misc.GlobalUtil; import java.util.HashMap; diff --git a/Client/src/main/java/com/baseband/client/feature/command/Test.java b/Client/src/main/java/com/baseband/client/feature/command/Test.java index 7cc28fe..1668901 100644 --- a/Client/src/main/java/com/baseband/client/feature/command/Test.java +++ b/Client/src/main/java/com/baseband/client/feature/command/Test.java @@ -1,9 +1,9 @@ package com.baseband.client.feature.command; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Range; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Command; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Range; /** * @author TudbuT diff --git a/Client/src/main/java/com/baseband/client/feature/command/Trigger.java b/Client/src/main/java/com/baseband/client/feature/command/Trigger.java index 89463e5..ae8d8ce 100644 --- a/Client/src/main/java/com/baseband/client/feature/command/Trigger.java +++ b/Client/src/main/java/com/baseband/client/feature/command/Trigger.java @@ -1,11 +1,11 @@ package com.baseband.client.feature.command; -import com.baseband.client.gui.lib.component.Component; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Command; import com.baseband.client.feature.client.Client; -import com.baseband.client.util.interact.ChatUtil; +import com.baseband.client.gui.lib.component.Component; import com.baseband.client.registry.annotation.Description; +import com.baseband.client.util.interact.ChatUtil; import static com.baseband.client.BaseBand.features; diff --git a/Client/src/main/java/com/baseband/client/feature/movement/ElytraBot.java b/Client/src/main/java/com/baseband/client/feature/movement/ElytraBot.java index 19d6534..0d292cd 100644 --- a/Client/src/main/java/com/baseband/client/feature/movement/ElytraBot.java +++ b/Client/src/main/java/com/baseband/client/feature/movement/ElytraBot.java @@ -1,13 +1,13 @@ package com.baseband.client.feature.movement; import com.baseband.client.BaseBand; +import com.baseband.client.feature.Feature; +import com.baseband.client.feature.category.Movement; +import com.baseband.client.feature.client.Client; import com.baseband.client.registry.annotation.Config; import com.baseband.client.registry.annotation.Description; import com.baseband.client.registry.annotation.Gate; import com.baseband.client.registry.annotation.Range; -import com.baseband.client.feature.Feature; -import com.baseband.client.feature.category.Movement; -import com.baseband.client.feature.client.Client; import com.baseband.client.util.adapt.Marker; import net.minecraft.entity.player.EntityPlayer; diff --git a/Client/src/main/java/com/baseband/client/feature/movement/ElytraFly.java b/Client/src/main/java/com/baseband/client/feature/movement/ElytraFly.java index 64cbe52..f521f4b 100644 --- a/Client/src/main/java/com/baseband/client/feature/movement/ElytraFly.java +++ b/Client/src/main/java/com/baseband/client/feature/movement/ElytraFly.java @@ -1,11 +1,13 @@ package com.baseband.client.feature.movement; -import com.baseband.client.registry.annotation.*; import com.baseband.client.event.events.MoveEvent; import com.baseband.client.event.events.PacketEvent; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Movement; +import com.baseband.client.registry.annotation.Config; import com.baseband.client.registry.annotation.Description; +import com.baseband.client.registry.annotation.Gate; +import com.baseband.client.registry.annotation.Range; import com.baseband.client.util.adapt.Marker; import com.baseband.client.util.interact.MotionUtil; import de.tudbut.tools.Lock; diff --git a/Client/src/main/java/com/baseband/client/feature/movement/Speed.java b/Client/src/main/java/com/baseband/client/feature/movement/Speed.java index f6407b1..1f54f70 100644 --- a/Client/src/main/java/com/baseband/client/feature/movement/Speed.java +++ b/Client/src/main/java/com/baseband/client/feature/movement/Speed.java @@ -1,19 +1,19 @@ package com.baseband.client.feature.movement; import com.baseband.client.BaseBand; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Gate; -import com.baseband.client.registry.annotation.Range; import com.baseband.client.event.Priority; import com.baseband.client.event.events.MoveEvent; import com.baseband.client.event.events.PacketEvent; -import com.baseband.client.mixins.IMinecraft; -import com.baseband.client.mixins.ITimer; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Movement; import com.baseband.client.feature.client.Timer; -import com.baseband.client.util.interact.MotionUtil; +import com.baseband.client.mixins.IMinecraft; +import com.baseband.client.mixins.ITimer; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Gate; +import com.baseband.client.registry.annotation.Range; import com.baseband.client.util.adapt.Marker; +import com.baseband.client.util.interact.MotionUtil; import net.minecraft.network.play.server.SPacketEntityVelocity; import net.minecraft.network.play.server.SPacketExplosion; import net.minecraft.network.play.server.SPacketPlayerPosLook; diff --git a/Client/src/main/java/com/baseband/client/feature/movement/Velocity.java b/Client/src/main/java/com/baseband/client/feature/movement/Velocity.java index fdd1139..3f6b90d 100644 --- a/Client/src/main/java/com/baseband/client/feature/movement/Velocity.java +++ b/Client/src/main/java/com/baseband/client/feature/movement/Velocity.java @@ -1,9 +1,9 @@ package com.baseband.client.feature.movement; import com.baseband.client.event.events.PacketEvent; -import com.baseband.client.mixins.ISPacketExplosion; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Movement; +import com.baseband.client.mixins.ISPacketExplosion; import net.minecraft.network.play.server.SPacketEntityVelocity; import net.minecraft.network.play.server.SPacketExplosion; import net.minecraftforge.client.event.PlayerSPPushOutOfBlocksEvent; diff --git a/Client/src/main/java/com/baseband/client/feature/render/Bright.java b/Client/src/main/java/com/baseband/client/feature/render/Bright.java index bc626a0..e686e71 100644 --- a/Client/src/main/java/com/baseband/client/feature/render/Bright.java +++ b/Client/src/main/java/com/baseband/client/feature/render/Bright.java @@ -2,6 +2,7 @@ package com.baseband.client.feature.render; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Render; +import com.baseband.client.registry.annotation.Config; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; @@ -12,14 +13,39 @@ public class Bright extends Feature { return "Bright"; } + + @Config("Mode") + public Mode mode = Mode.Gamma; + + public enum Mode { + Potion, + Gamma + } + + @Override + public void onEveryTick() { + //Hot + if (enabled && !notIngame()) { + text = this + "§7 [" + mode.toString() + "]"; + } else { + text = toString(); + } + } + @Override public void onTick() { - mc.player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, 20 * 60, 0, true, false)); + switch (mode) { + case Gamma: + mc.gameSettings.gammaSetting = 100f; + case Potion: + mc.player.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, 20 * 60, 0, true, false)); + } } @Override public void onDisable() { if(notIngame()) return; mc.player.removeActivePotionEffect(MobEffects.NIGHT_VISION); + mc.gameSettings.gammaSetting = 1f; } } diff --git a/Client/src/main/java/com/baseband/client/feature/render/ClickGUI.java b/Client/src/main/java/com/baseband/client/feature/render/ClickGUI.java index 26fed6e..37a230d 100644 --- a/Client/src/main/java/com/baseband/client/feature/render/ClickGUI.java +++ b/Client/src/main/java/com/baseband/client/feature/render/ClickGUI.java @@ -1,11 +1,11 @@ package com.baseband.client.feature.render; +import com.baseband.client.feature.Feature; +import com.baseband.client.feature.category.Render; +import com.baseband.client.gui.GuiRewrite; import com.baseband.client.registry.annotation.Config; import com.baseband.client.registry.annotation.Description; import com.baseband.client.registry.annotation.Gate; -import com.baseband.client.gui.GuiRewrite; -import com.baseband.client.feature.Feature; -import com.baseband.client.feature.category.Render; import static com.baseband.client.BaseBand.features; diff --git a/Client/src/main/java/com/baseband/client/feature/render/HUD.java b/Client/src/main/java/com/baseband/client/feature/render/HUD.java index 255e16e..5b75730 100644 --- a/Client/src/main/java/com/baseband/client/feature/render/HUD.java +++ b/Client/src/main/java/com/baseband/client/feature/render/HUD.java @@ -1,17 +1,15 @@ package com.baseband.client.feature.render; -import com.baseband.client.registry.annotation.*; -import com.baseband.client.gui.GuiTheme; import com.baseband.client.BaseBand; import com.baseband.client.feature.Category; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Render; import com.baseband.client.feature.client.Client; -import com.baseband.client.util.interact.ServerDataManager; -import com.baseband.client.registry.annotation.Description; -import com.baseband.client.util.misc.GlobalUtil; +import com.baseband.client.gui.GuiTheme; +import com.baseband.client.registry.annotation.*; import com.baseband.client.util.adapt.Marker; -import com.baseband.client.registry.annotation.Trigger; +import com.baseband.client.util.interact.ServerDataManager; +import com.baseband.client.util.misc.GlobalUtil; import com.baseband.client.util.render.Pixels; import com.baseband.client.util.render.TextSplitter; import net.minecraft.client.Minecraft; diff --git a/Client/src/main/java/com/baseband/client/feature/render/Nametags.java b/Client/src/main/java/com/baseband/client/feature/render/Nametags.java index 6535c35..90b20ba 100644 --- a/Client/src/main/java/com/baseband/client/feature/render/Nametags.java +++ b/Client/src/main/java/com/baseband/client/feature/render/Nametags.java @@ -1,9 +1,9 @@ package com.baseband.client.feature.render; -import com.baseband.client.mixins.IRenderManager; -import com.baseband.client.mixins.IMinecraft; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Render; +import com.baseband.client.mixins.IMinecraft; +import com.baseband.client.mixins.IRenderManager; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; diff --git a/Client/src/main/java/com/baseband/client/feature/render/NoRender.java b/Client/src/main/java/com/baseband/client/feature/render/NoRender.java index cc395d8..02b3dfa 100644 --- a/Client/src/main/java/com/baseband/client/feature/render/NoRender.java +++ b/Client/src/main/java/com/baseband/client/feature/render/NoRender.java @@ -1,8 +1,8 @@ package com.baseband.client.feature.render; -import com.baseband.client.registry.annotation.Config; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Render; +import com.baseband.client.registry.annotation.Config; import net.minecraftforge.client.event.RenderBlockOverlayEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/Client/src/main/java/com/baseband/client/feature/render/RenderFun.java b/Client/src/main/java/com/baseband/client/feature/render/RenderFun.java index 5e694cf..44a66cc 100644 --- a/Client/src/main/java/com/baseband/client/feature/render/RenderFun.java +++ b/Client/src/main/java/com/baseband/client/feature/render/RenderFun.java @@ -1,10 +1,10 @@ package com.baseband.client.feature.render; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Gate; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.Render; +import com.baseband.client.registry.annotation.Config; import com.baseband.client.registry.annotation.Description; +import com.baseband.client.registry.annotation.Gate; import com.baseband.client.util.adapt.Marker; import net.minecraftforge.client.event.EntityViewRenderEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/Client/src/main/java/com/baseband/client/feature/world/AutoEat.java b/Client/src/main/java/com/baseband/client/feature/world/AutoEat.java index 1bc598c..04d2821 100644 --- a/Client/src/main/java/com/baseband/client/feature/world/AutoEat.java +++ b/Client/src/main/java/com/baseband/client/feature/world/AutoEat.java @@ -1,11 +1,12 @@ package com.baseband.client.feature.world; -import com.baseband.client.event.events.PacketEvent; -import com.baseband.client.registry.annotation.Config; import com.baseband.client.event.events.BaritoneEvent; -import com.baseband.client.mixins.IMinecraft; +import com.baseband.client.event.events.PacketEvent; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.World; +import com.baseband.client.mixins.IMinecraft; +import com.baseband.client.registry.annotation.Config; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.settings.KeyBinding; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemAppleGold; @@ -35,7 +36,7 @@ public class AutoEat extends Feature { @Override public void onEveryTick() { if(enabled) { - text = this + "§7 [" + (eating ? "EATING" : "IDLE") + "]"; + text = this + "§7 [" + (eating ? "Eating" : "Idle") + "]"; } else { text = toString(); } @@ -105,7 +106,7 @@ public class AutoEat extends Feature { //你为什么用谷歌翻译这个 //get outta my face! //you know you didn't! - return mc.currentScreen == null && //re- dumbfuck code, this used to be != null + return !(mc.currentScreen instanceof GuiContainer) && //re- dumbfuck code, this used to be != null stack.getItem() instanceof ItemFood //it has to be food bruh && !(stack.getItem() instanceof ItemChorusFruit) //not a chorus fruit you ret-.... dumbfuck && ((20 - currentHunger) >= ((ItemFood) stack.getItem()).getHealAmount(stack) //if hunger low and food wanted refills the amount left diff --git a/Client/src/main/java/com/baseband/client/feature/world/AutoSignText.java b/Client/src/main/java/com/baseband/client/feature/world/AutoSignText.java index 8ad2cd2..e34bffe 100644 --- a/Client/src/main/java/com/baseband/client/feature/world/AutoSignText.java +++ b/Client/src/main/java/com/baseband/client/feature/world/AutoSignText.java @@ -1,8 +1,8 @@ package com.baseband.client.feature.world; -import com.baseband.client.registry.annotation.Config; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.World; +import com.baseband.client.registry.annotation.Config; @World public class AutoSignText extends Feature { diff --git a/Client/src/main/java/com/baseband/client/feature/world/FastBreak.java b/Client/src/main/java/com/baseband/client/feature/world/FastBreak.java index 47dcb06..12f894b 100644 --- a/Client/src/main/java/com/baseband/client/feature/world/FastBreak.java +++ b/Client/src/main/java/com/baseband/client/feature/world/FastBreak.java @@ -7,8 +7,6 @@ import com.baseband.client.mixins.IPlayerControllerMP; import com.baseband.client.registry.annotation.Config; import net.minecraft.network.play.client.CPacketPlayerDigging; import net.minecraft.util.EnumHand; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @World public class FastBreak extends Feature { @@ -24,14 +22,13 @@ public class FastBreak extends Feature { @Config("NoBreakDelay") public boolean noBreakDelay; - enum Mode { + public enum Mode { Damage, Packet } @Override public void onEveryTick() { - //Hot if (enabled && !notIngame()) { text = this + "§7 [" + mode.toString() + "]"; diff --git a/Client/src/main/java/com/baseband/client/feature/world/Ping.java b/Client/src/main/java/com/baseband/client/feature/world/Ping.java index 04b6cdb..158f17d 100644 --- a/Client/src/main/java/com/baseband/client/feature/world/Ping.java +++ b/Client/src/main/java/com/baseband/client/feature/world/Ping.java @@ -1,11 +1,11 @@ package com.baseband.client.feature.world; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Description; -import com.baseband.client.registry.annotation.Range; import com.baseband.client.event.events.PacketEvent; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.World; +import com.baseband.client.registry.annotation.Config; +import com.baseband.client.registry.annotation.Description; +import com.baseband.client.registry.annotation.Range; import net.minecraft.network.play.client.CPacketKeepAlive; @World diff --git a/Client/src/main/java/com/baseband/client/feature/world/SeedOverlay.java b/Client/src/main/java/com/baseband/client/feature/world/SeedOverlay.java index f18f05a..fcd2239 100644 --- a/Client/src/main/java/com/baseband/client/feature/world/SeedOverlay.java +++ b/Client/src/main/java/com/baseband/client/feature/world/SeedOverlay.java @@ -1,18 +1,15 @@ package com.baseband.client.feature.world; import com.baseband.client.BaseBand; -import com.baseband.client.registry.annotation.Config; -import com.baseband.client.registry.annotation.Gate; -import com.baseband.client.registry.annotation.Range; import com.baseband.client.feature.Feature; import com.baseband.client.feature.category.World; import com.baseband.client.feature.render.ClickGUI; -import com.baseband.client.util.adapt.SimpleWorldGenerator; -import com.baseband.client.registry.annotation.Description; -import com.baseband.client.util.misc.GlobalUtil; +import com.baseband.client.registry.annotation.*; import com.baseband.client.util.adapt.Marker; -import com.baseband.client.registry.annotation.Trigger; +import com.baseband.client.util.adapt.SimpleWorldGenerator; +import com.baseband.client.util.misc.GlobalUtil; import com.baseband.client.util.render.Pixels; +import de.tudbut.tools.Lock; import net.minecraft.block.Block; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.init.Blocks; @@ -22,7 +19,6 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; -import de.tudbut.tools.Lock; import java.util.ArrayList; import java.util.Objects; diff --git a/Client/src/main/java/com/baseband/client/feature/world/Select.java b/Client/src/main/java/com/baseband/client/feature/world/Select.java index 7fe0c77..10bc569 100644 --- a/Client/src/main/java/com/baseband/client/feature/world/Select.java +++ b/Client/src/main/java/com/baseband/client/feature/world/Select.java @@ -36,9 +36,9 @@ public class Select extends Feature { @Override public void onTick() { if(selection != null) - text = this + "§7 [" + selection.area() + "B]"; + text = this + "§7 [" + selection.area() + " Blocks]"; else - text = this + "§7 [0B]"; + text = this + "§7 [0 Blocks]"; } @Override diff --git a/Client/src/main/java/com/baseband/client/gui/GuiRewrite.java b/Client/src/main/java/com/baseband/client/gui/GuiRewrite.java index 2229ae0..c82844a 100644 --- a/Client/src/main/java/com/baseband/client/gui/GuiRewrite.java +++ b/Client/src/main/java/com/baseband/client/gui/GuiRewrite.java @@ -1,11 +1,11 @@ package com.baseband.client.gui; import com.baseband.client.BaseBand; +import com.baseband.client.feature.Feature; +import com.baseband.client.feature.render.ClickGUI; import com.baseband.client.gui.lib.GUIManager; import com.baseband.client.gui.lib.component.Category; import com.baseband.client.gui.lib.component.Component; -import com.baseband.client.feature.Feature; -import com.baseband.client.feature.render.ClickGUI; import de.tudbut.obj.TLMap; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/Client/src/main/java/com/baseband/client/gui/lib/GUIManager.java b/Client/src/main/java/com/baseband/client/gui/lib/GUIManager.java index b75808b..ac7e3b7 100644 --- a/Client/src/main/java/com/baseband/client/gui/lib/GUIManager.java +++ b/Client/src/main/java/com/baseband/client/gui/lib/GUIManager.java @@ -1,9 +1,9 @@ package com.baseband.client.gui.lib; -import com.baseband.client.gui.GuiTheme; -import com.baseband.client.gui.lib.component.Component; import com.baseband.client.BaseBand; import com.baseband.client.feature.client.Client; +import com.baseband.client.gui.GuiTheme; +import com.baseband.client.gui.lib.component.Component; import org.lwjgl.util.Rectangle; import java.util.HashMap; diff --git a/Client/src/main/java/com/baseband/client/gui/lib/component/Component.java b/Client/src/main/java/com/baseband/client/gui/lib/component/Component.java index 4ed0fdf..e68b8e2 100644 --- a/Client/src/main/java/com/baseband/client/gui/lib/component/Component.java +++ b/Client/src/main/java/com/baseband/client/gui/lib/component/Component.java @@ -1,11 +1,11 @@ package com.baseband.client.gui.lib.component; import com.baseband.client.BaseBand; +import com.baseband.client.gui.lib.GUIManager; +import com.baseband.client.gui.lib.RenderException; import com.baseband.client.registry.AnyGate; import com.baseband.client.registry.annotation.Config; import com.baseband.client.registry.annotation.Gate; -import com.baseband.client.gui.lib.GUIManager; -import com.baseband.client.gui.lib.RenderException; import com.baseband.client.util.adapt.Marker; import com.baseband.client.util.render.TextSplitter; import net.minecraft.client.Minecraft; diff --git a/Client/src/main/java/com/baseband/client/gui/lib/component/EnumButton.java b/Client/src/main/java/com/baseband/client/gui/lib/component/EnumButton.java index 19376d0..ff6ce71 100644 --- a/Client/src/main/java/com/baseband/client/gui/lib/component/EnumButton.java +++ b/Client/src/main/java/com/baseband/client/gui/lib/component/EnumButton.java @@ -1,7 +1,7 @@ package com.baseband.client.gui.lib.component; -import com.baseband.client.registry.ConfigHandle; import com.baseband.client.feature.command.Set; +import com.baseband.client.registry.ConfigHandle; public class EnumButton extends Component { ConfigHandle handle; diff --git a/Client/src/main/java/com/baseband/client/gui/lib/component/IntSlider.java b/Client/src/main/java/com/baseband/client/gui/lib/component/IntSlider.java index 0659a22..02f7b27 100644 --- a/Client/src/main/java/com/baseband/client/gui/lib/component/IntSlider.java +++ b/Client/src/main/java/com/baseband/client/gui/lib/component/IntSlider.java @@ -1,8 +1,8 @@ package com.baseband.client.gui.lib.component; -import com.baseband.client.registry.ConfigHandle; -import com.baseband.client.gui.lib.GUIManager; import com.baseband.client.feature.command.Set; +import com.baseband.client.gui.lib.GUIManager; +import com.baseband.client.registry.ConfigHandle; import com.baseband.client.util.misc.GlobalUtil; import net.minecraft.client.gui.Gui; import org.lwjgl.input.Keyboard; diff --git a/Client/src/main/java/com/baseband/client/gui/lib/component/Slider.java b/Client/src/main/java/com/baseband/client/gui/lib/component/Slider.java index 7422fb6..632b974 100644 --- a/Client/src/main/java/com/baseband/client/gui/lib/component/Slider.java +++ b/Client/src/main/java/com/baseband/client/gui/lib/component/Slider.java @@ -1,8 +1,8 @@ package com.baseband.client.gui.lib.component; -import com.baseband.client.registry.ConfigHandle; -import com.baseband.client.gui.lib.GUIManager; import com.baseband.client.feature.command.Set; +import com.baseband.client.gui.lib.GUIManager; +import com.baseband.client.registry.ConfigHandle; import com.baseband.client.util.misc.GlobalUtil; import net.minecraft.client.gui.Gui; import org.lwjgl.input.Keyboard; diff --git a/Client/src/main/java/com/baseband/client/gui/lib/component/StringButton.java b/Client/src/main/java/com/baseband/client/gui/lib/component/StringButton.java index 1a2d5b5..9c03dc4 100644 --- a/Client/src/main/java/com/baseband/client/gui/lib/component/StringButton.java +++ b/Client/src/main/java/com/baseband/client/gui/lib/component/StringButton.java @@ -1,7 +1,7 @@ package com.baseband.client.gui.lib.component; -import com.baseband.client.registry.ConfigHandle; import com.baseband.client.feature.command.Set; +import com.baseband.client.registry.ConfigHandle; public class StringButton extends Button { protected final String name; diff --git a/Client/src/main/java/com/baseband/client/gui/lib/component/ToggleButton.java b/Client/src/main/java/com/baseband/client/gui/lib/component/ToggleButton.java index 736ef8f..f2673eb 100644 --- a/Client/src/main/java/com/baseband/client/gui/lib/component/ToggleButton.java +++ b/Client/src/main/java/com/baseband/client/gui/lib/component/ToggleButton.java @@ -1,7 +1,7 @@ package com.baseband.client.gui.lib.component; -import com.baseband.client.registry.ConfigHandle; import com.baseband.client.feature.command.Set; +import com.baseband.client.registry.ConfigHandle; import com.baseband.client.util.misc.GlobalUtil; public class ToggleButton extends Component { diff --git a/Client/src/main/java/com/baseband/client/mixins/MixinEntityPlayerSP.java b/Client/src/main/java/com/baseband/client/mixins/MixinEntityPlayerSP.java index ca0f6e8..6334567 100644 --- a/Client/src/main/java/com/baseband/client/mixins/MixinEntityPlayerSP.java +++ b/Client/src/main/java/com/baseband/client/mixins/MixinEntityPlayerSP.java @@ -1,8 +1,8 @@ package com.baseband.client.mixins; +import com.baseband.client.BaseBand; import com.baseband.client.event.events.MotionUpdateEvent; import com.baseband.client.event.events.MoveEvent; -import com.baseband.client.BaseBand; import com.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; diff --git a/Client/src/main/java/com/baseband/client/util/adapt/WorldRecreationGenerator.java b/Client/src/main/java/com/baseband/client/util/adapt/WorldRecreationGenerator.java index d5c9b76..bf37ae2 100644 --- a/Client/src/main/java/com/baseband/client/util/adapt/WorldRecreationGenerator.java +++ b/Client/src/main/java/com/baseband/client/util/adapt/WorldRecreationGenerator.java @@ -2,6 +2,7 @@ package com.baseband.client.util.adapt; import com.baseband.client.Setup; import com.baseband.client.util.misc.GlobalUtil; +import de.tudbut.tools.ReflectUtil; import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.profiler.Profiler; @@ -18,7 +19,6 @@ import net.minecraft.world.gen.ChunkGeneratorOverworld; import net.minecraft.world.gen.IChunkGenerator; import net.minecraft.world.storage.SaveHandlerMP; import net.minecraft.world.storage.WorldInfo; -import de.tudbut.tools.ReflectUtil; import javax.annotation.Nonnull; import javax.annotation.Nullable;