Merge master into 1.20.1

.github/workflows/gradle.yml

@@ -11,6 +11,11 @@ on:
       - '**.java'
       - 'gradle**'
       - 'build.gradle'
+  # Makes it possible to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+permissions:
+  contents: write
 
 jobs:
   build:
@@ -21,10 +26,10 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Validate Gradle wrapper
-      uses: gradle/wrapper-validation-action@v1
+      uses: gradle/actions/wrapper-validation@v3
 
     - name: Set up Java 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'microsoft'
@@ -33,7 +38,15 @@ jobs:
       run: chmod +x gradlew
 
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
+
+    - name: Generate and submit dependency graph
+      if: ${{ github.event_name == 'push' }}
+      uses: gradle/actions/dependency-submission@v3
+      with:
+        build-scan-publish: true
+        build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"
+        build-scan-terms-of-use-agree: "yes"
 
     - name: Check code style with Spotless
       id: spotless_check

.gitignore

@@ -25,6 +25,7 @@ bin/
 
 run/
 *.launch
+remappedSrc/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

SECURITY.md

@@ -0,0 +1,96 @@
+# Security Policy
+
+## Supported Versions
+
+Generally, Wurst Client versions for the latest Minecraft release and for the latest Minecraft snapshot are supported.
+
+Older versions are decided on a case-by-case basis, depending on the severity of the exploit.
+
+## Reporting a Vulnerability
+
+You can report a vulnerability by sending an email to contact.wurstimperium@gmail.com.
+
+If you want to encrypt your email with PGP (you don't have to), then you can find my public key below:
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=8sQI
+-----END PGP PUBLIC KEY BLOCK-----
+```

build.gradle

@@ -1,13 +1,13 @@
 buildscript {
 	dependencies {
-		classpath 'org.kohsuke:github-api:1.135'
+		classpath 'org.kohsuke:github-api:1.321'
 	}
 }
 
 plugins {
-	id 'fabric-loom' version '1.5-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
-	id 'com.diffplug.spotless' version '6.23.3'
+	id 'com.diffplug.spotless' version '6.25.0'
 }
 
 def ENV = System.getenv()
@@ -88,7 +88,7 @@ spotless {
 // configure the maven publication
 publishing {
 	publications {
-		mavenJava(MavenPublication) {
+		create("mavenJava", MavenPublication) {
 			from components.java
 		}
 	}

gradle.properties

@@ -4,13 +4,13 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and
-# https://www.curseforge.com/minecraft/mc-mods/fabric-api
+# https://modrinth.com/mod/fabric-api/versions
 minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.10
-loader_version=0.15.7
+loader_version=0.15.11
 
-#Fabric api
-fabric_version=0.92.0+1.20.1
+# Fabric API
+fabric_version=0.92.1+1.20.1
 
 # Mod Properties
 mod_version = v7.41.2-MC1.20.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -246,4 +246,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -89,4 +89,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

src/main/java/net/wurstclient/hacks/AirPlaceHack.java

@@ -31,13 +31,13 @@ public final class AirPlaceHack extends Hack implements RightClickListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(RightClickListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(RightClickListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AnchorAuraHack.java

@@ -91,13 +91,13 @@ public final class AnchorAuraHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AntiAfkHack.java

@@ -54,7 +54,7 @@ public final class AntiAfkHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		start = BlockPos.ofFloored(MC.player.getPos());
 		nextBlock = null;
@@ -68,7 +68,7 @@ public final class AntiAfkHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/AntiHungerHack.java

@@ -24,13 +24,13 @@ public final class AntiHungerHack extends Hack implements PacketOutputListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(PacketOutputListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(PacketOutputListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AntiSpamHack.java

@@ -32,13 +32,13 @@ public final class AntiSpamHack extends Hack implements ChatInputListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(ChatInputListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(ChatInputListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AutoArmorHack.java

@@ -63,7 +63,7 @@ public final class AutoArmorHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		timer = 0;
 		EVENTS.add(UpdateListener.class, this);
@@ -71,7 +71,7 @@ public final class AutoArmorHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketOutputListener.class, this);

src/main/java/net/wurstclient/hacks/AutoBuildHack.java

@@ -117,7 +117,7 @@ public final class AutoBuildHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(RightClickListener.class, this);
@@ -125,7 +125,7 @@ public final class AutoBuildHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RightClickListener.class, this);

src/main/java/net/wurstclient/hacks/AutoCompleteHack.java

@@ -75,7 +75,7 @@ public final class AutoCompleteHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(ChatOutputListener.class, this);
 		EVENTS.remove(UpdateListener.class, this);

src/main/java/net/wurstclient/hacks/AutoDropHack.java

@@ -49,13 +49,13 @@ public final class AutoDropHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AutoEatHack.java

@@ -108,13 +108,13 @@ public final class AutoEatHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		

src/main/java/net/wurstclient/hacks/AutoFarmHack.java

@@ -79,7 +79,7 @@ public final class AutoFarmHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		plants.clear();
 		
@@ -88,7 +88,7 @@ public final class AutoFarmHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/AutoFishHack.java

@@ -89,7 +89,7 @@ public final class AutoFishHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		castRodTimer = 0;
 		reelInTimer = 0;
@@ -108,7 +108,7 @@ public final class AutoFishHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketInputListener.class, this);

src/main/java/net/wurstclient/hacks/AutoLeaveHack.java

@@ -58,13 +58,13 @@ public final class AutoLeaveHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java

@@ -102,13 +102,7 @@ public final class AutoLibrarianHack extends Hack
 	
 	private final SwingHandSetting swingHand =
 		new SwingHandSetting("How to swing your hand when interacting with the"
-			+ " villager and job site.\n\n"
-			+ "\u00a7lOff\u00a7r - Don't swing your hand at all. Will be detected"
-			+ " by anti-cheat plugins.\n\n"
-			+ "\u00a7lServer-side\u00a7r - Swing your hand on the server-side,"
-			+ " without playing the animation on the client-side.\n\n"
-			+ "\u00a7lClient-side\u00a7r - Swing your hand on the client-side."
-			+ " This is the most legit option.");
+			+ " villager and job site.");
 	
 	private final SliderSetting repairMode = new SliderSetting("Repair mode",
 		"Prevents AutoLibrarian from using your axe when its durability reaches"
@@ -297,7 +291,7 @@ public final class AutoLibrarianHack extends Hack
 		// damage block and swing hand
 		if(MC.interactionManager.updateBlockBreakingProgress(jobSite,
 			params.side()))
-			swingHand.getSelected().swing(Hand.MAIN_HAND);
+			swingHand.swing(Hand.MAIN_HAND);
 		
 		// update progress
 		overlay.updateProgress();
@@ -359,7 +353,7 @@ public final class AutoLibrarianHack extends Hack
 		
 		// swing hand
 		if(result.isAccepted() && result.shouldSwingHand())
-			swingHand.getSelected().swing(hand);
+			swingHand.swing(hand);
 		
 		// reset sneak
 		((IKeyBinding)MC.options.sneakKey).resetPressedState();
@@ -401,7 +395,7 @@ public final class AutoLibrarianHack extends Hack
 		
 		// swing hand
 		if(actionResult.isAccepted() && actionResult.shouldSwingHand())
-			swingHand.getSelected().swing(hand);
+			swingHand.swing(hand);
 		
 		// set cooldown
 		MC.itemUseCooldown = 4;

src/main/java/net/wurstclient/hacks/AutoMineHack.java

@@ -30,7 +30,7 @@ public final class AutoMineHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		WURST.getHax().excavatorHack.setEnabled(false);
 		WURST.getHax().nukerHack.setEnabled(false);
@@ -42,7 +42,7 @@ public final class AutoMineHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		stopMiningAndResetProgress();

src/main/java/net/wurstclient/hacks/AutoPotionHack.java

@@ -40,13 +40,13 @@ public final class AutoPotionHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		timer = 0;

src/main/java/net/wurstclient/hacks/AutoRespawnHack.java

@@ -29,13 +29,13 @@ public final class AutoRespawnHack extends Hack implements DeathListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(DeathListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(DeathListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AutoSignHack.java

@@ -25,7 +25,7 @@ public final class AutoSignHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		signText = null;
 	}

src/main/java/net/wurstclient/hacks/AutoSoupHack.java

@@ -45,13 +45,13 @@ public final class AutoSoupHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		stopIfEating();

src/main/java/net/wurstclient/hacks/AutoSprintHack.java

@@ -33,13 +33,13 @@ public final class AutoSprintHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AutoSwimHack.java

@@ -23,13 +23,13 @@ public final class AutoSwimHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AutoSwitchHack.java

@@ -23,13 +23,13 @@ public final class AutoSwitchHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AutoSwordHack.java

@@ -62,14 +62,14 @@ public final class AutoSwordHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		oldSlot = -1;
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		resetSlot();

src/main/java/net/wurstclient/hacks/AutoToolHack.java

@@ -60,7 +60,7 @@ public final class AutoToolHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(BlockBreakingProgressListener.class, this);
 		EVENTS.add(UpdateListener.class, this);
@@ -68,7 +68,7 @@ public final class AutoToolHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(BlockBreakingProgressListener.class, this);
 		EVENTS.remove(UpdateListener.class, this);

src/main/java/net/wurstclient/hacks/AutoTotemHack.java

@@ -68,7 +68,7 @@ public final class AutoTotemHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		nextTickSlot = -1;
 		totems = 0;
@@ -78,7 +78,7 @@ public final class AutoTotemHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/AutoWalkHack.java

@@ -23,13 +23,13 @@ public final class AutoWalkHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		((IKeyBinding)MC.options.forwardKey).resetPressedState();

src/main/java/net/wurstclient/hacks/BaseFinderHack.java

@@ -131,7 +131,7 @@ public final class BaseFinderHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// reset timer
 		messageTimer = 0;
@@ -142,7 +142,7 @@ public final class BaseFinderHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/BlinkHack.java

@@ -50,7 +50,7 @@ public final class BlinkHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		fakePlayer = new FakePlayerEntity();
 		
@@ -59,7 +59,7 @@ public final class BlinkHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketOutputListener.class, this);

src/main/java/net/wurstclient/hacks/BoatFlyHack.java

@@ -42,13 +42,13 @@ public final class BoatFlyHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/BonemealAuraHack.java

@@ -77,13 +77,13 @@ public final class BonemealAuraHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/BowAimbotHack.java

@@ -94,7 +94,7 @@ public final class BowAimbotHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable conflicting hacks
 		WURST.getHax().excavatorHack.setEnabled(false);
@@ -106,7 +106,7 @@ public final class BowAimbotHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(GUIRenderListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/BuildRandomHack.java

@@ -75,13 +75,7 @@ public final class BuildRandomHack extends Hack
 			+ " can be VERY disorienting to look at.");
 	
 	private final SwingHandSetting swingHand = new SwingHandSetting(
-		"How BuildRandom should swing your hand when placing blocks.\n\n"
-			+ "\u00a7lOff\u00a7r - Don't swing your hand at all. Will be detected"
-			+ " by anti-cheat plugins.\n\n"
-			+ "\u00a7lServer-side\u00a7r - Swing your hand on the server-side,"
-			+ " without playing the animation on the client-side.\n\n"
-			+ "\u00a7lClient-side\u00a7r - Swing your hand on the client-side."
-			+ " This is the most legit option.");
+		"How BuildRandom should swing your hand when placing blocks.");
 	
 	private final CheckboxSetting fastPlace =
 		new CheckboxSetting("Always FastPlace",
@@ -122,14 +116,14 @@ public final class BuildRandomHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(RenderListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		lastPos = null;
 		EVENTS.remove(UpdateListener.class, this);

src/main/java/net/wurstclient/hacks/BunnyHopHack.java

@@ -36,13 +36,13 @@ public final class BunnyHopHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/CaveFinderHack.java

@@ -96,7 +96,7 @@ public final class CaveFinderHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		prevLimit = limit.getValueI();
 		notify = true;
@@ -111,7 +111,7 @@ public final class CaveFinderHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketInputListener.class, coordinator);

src/main/java/net/wurstclient/hacks/ChatTranslatorHack.java

@@ -39,13 +39,13 @@ public final class ChatTranslatorHack extends Hack implements ChatInputListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(ChatInputListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(ChatInputListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/ClickAuraHack.java

@@ -65,7 +65,7 @@ public final class ClickAuraHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable other killauras
 		WURST.getHax().aimAssistHack.setEnabled(false);
@@ -84,7 +84,7 @@ public final class ClickAuraHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(LeftClickListener.class, this);

src/main/java/net/wurstclient/hacks/ClickGuiHack.java

@@ -60,7 +60,7 @@ public final class ClickGuiHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		MC.setScreen(new ClickGuiScreen(WURST.getGui()));
 		setEnabled(false);

src/main/java/net/wurstclient/hacks/CrashChestHack.java

@@ -28,7 +28,7 @@ public final class CrashChestHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		if(!MC.player.getAbilities().creativeMode)
 		{

src/main/java/net/wurstclient/hacks/CreativeFlightHack.java

@@ -52,7 +52,7 @@ public final class CreativeFlightHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		tickCounter = 0;
 		
@@ -63,7 +63,7 @@ public final class CreativeFlightHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		

src/main/java/net/wurstclient/hacks/CriticalsHack.java

@@ -40,13 +40,13 @@ public final class CriticalsHack extends Hack implements LeftClickListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(LeftClickListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(LeftClickListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/CrystalAuraHack.java

@@ -90,7 +90,7 @@ public final class CrystalAuraHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable other killauras
 		WURST.getHax().aimAssistHack.setEnabled(false);
@@ -107,7 +107,7 @@ public final class CrystalAuraHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/DerpHack.java

@@ -27,7 +27,7 @@ public final class DerpHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable incompatible derps
 		WURST.getHax().headRollHack.setEnabled(false);
@@ -37,7 +37,7 @@ public final class DerpHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/DolphinHack.java

@@ -24,14 +24,14 @@ public final class DolphinHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		WURST.getHax().fishHack.setEnabled(false);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/ExcavatorHack.java

@@ -91,7 +91,7 @@ public final class ExcavatorHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable conflicting hacks
 		WURST.getHax().autoMineHack.setEnabled(false);
@@ -110,7 +110,7 @@ public final class ExcavatorHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/ExtraElytraHack.java

@@ -53,14 +53,14 @@ public final class ExtraElytraHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		jumpTimer = 0;
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/FancyChatHack.java

@@ -24,13 +24,13 @@ public final class FancyChatHack extends Hack implements ChatOutputListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(ChatOutputListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(ChatOutputListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/FastLadderHack.java

@@ -24,13 +24,13 @@ public final class FastLadderHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/FastPlaceHack.java

@@ -22,13 +22,13 @@ public final class FastPlaceHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/FightBotHack.java

@@ -81,7 +81,7 @@ public final class FightBotHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable other killauras
 		WURST.getHax().aimAssistHack.setEnabled(false);
@@ -103,7 +103,7 @@ public final class FightBotHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		// remove listener
 		EVENTS.remove(UpdateListener.class, this);

src/main/java/net/wurstclient/hacks/FishHack.java

@@ -24,14 +24,14 @@ public final class FishHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		WURST.getHax().dolphinHack.setEnabled(false);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/FlightHack.java

@@ -68,7 +68,7 @@ public final class FlightHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		tickCounter = 0;
 		
@@ -81,7 +81,7 @@ public final class FlightHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(IsPlayerInWaterListener.class, this);

src/main/java/net/wurstclient/hacks/FollowHack.java

@@ -76,7 +76,7 @@ public final class FollowHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		WURST.getHax().fightBotHack.setEnabled(false);
 		WURST.getHax().protectHack.setEnabled(false);
@@ -115,7 +115,7 @@ public final class FollowHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/ForceOpHack.java

@@ -52,7 +52,7 @@ public final class ForceOpHack extends Hack implements ChatInputListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		passwords = defaultList;
 		gotWrongPwMsg = false;
@@ -147,7 +147,7 @@ public final class ForceOpHack extends Hack implements ChatInputListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(ChatInputListener.class, this);
 		

src/main/java/net/wurstclient/hacks/FreecamHack.java

@@ -69,7 +69,7 @@ public final class FreecamHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(PacketOutputListener.class, this);
@@ -92,7 +92,7 @@ public final class FreecamHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketOutputListener.class, this);

src/main/java/net/wurstclient/hacks/GlideHack.java

@@ -48,14 +48,14 @@ public final class GlideHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(AirStrafingSpeedListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(AirStrafingSpeedListener.class, this);

src/main/java/net/wurstclient/hacks/HeadRollHack.java

@@ -24,7 +24,7 @@ public final class HeadRollHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable incompatible derps
 		WURST.getHax().derpHack.setEnabled(false);
@@ -34,7 +34,7 @@ public final class HeadRollHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/InstantBunkerHack.java

@@ -61,7 +61,7 @@ public final class InstantBunkerHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		WURST.getHax().tunnellerHack.setEnabled(false);
 		
@@ -111,7 +111,7 @@ public final class InstantBunkerHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/InvWalkHack.java

@@ -58,13 +58,13 @@ public final class InvWalkHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/ItemEspHack.java

@@ -65,7 +65,7 @@ public final class ItemEspHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(CameraTransformViewBobbingListener.class, this);
@@ -73,7 +73,7 @@ public final class ItemEspHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(CameraTransformViewBobbingListener.class, this);

src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java

@@ -47,7 +47,7 @@ public final class ItemGeneratorHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		
@@ -59,7 +59,7 @@ public final class ItemGeneratorHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/JesusHack.java

@@ -46,14 +46,14 @@ public final class JesusHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(PacketOutputListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketOutputListener.class, this);

src/main/java/net/wurstclient/hacks/JetpackHack.java

@@ -23,7 +23,7 @@ public final class JetpackHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		WURST.getHax().creativeFlightHack.setEnabled(false);
 		WURST.getHax().flightHack.setEnabled(false);
@@ -32,7 +32,7 @@ public final class JetpackHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/KaboomHack.java

@@ -37,13 +37,13 @@ public final class KaboomHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/KillPotionHack.java

@@ -37,7 +37,7 @@ public final class KillPotionHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// check gamemode
 		if(!MC.player.getAbilities().creativeMode)

src/main/java/net/wurstclient/hacks/LsdHack.java

@@ -23,7 +23,7 @@ public final class LsdHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		if(!(MC.getCameraEntity() instanceof PlayerEntity))
 		{
@@ -39,7 +39,7 @@ public final class LsdHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		if(MC.gameRenderer.getPostProcessor() != null)
 			MC.gameRenderer.disablePostProcessor();

src/main/java/net/wurstclient/hacks/MassTpaHack.java

@@ -75,7 +75,7 @@ public final class MassTpaHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// reset state
 		players.clear();
@@ -111,7 +111,7 @@ public final class MassTpaHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(ChatInputListener.class, this);
 		EVENTS.remove(UpdateListener.class, this);

src/main/java/net/wurstclient/hacks/MileyCyrusHack.java

@@ -33,14 +33,14 @@ public final class MileyCyrusHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		timer = 0;
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		((IKeyBinding)MC.options.sneakKey).resetPressedState();

src/main/java/net/wurstclient/hacks/MobEspHack.java

@@ -92,7 +92,7 @@ public final class MobEspHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(CameraTransformViewBobbingListener.class, this);
@@ -104,7 +104,7 @@ public final class MobEspHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(CameraTransformViewBobbingListener.class, this);

src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java

@@ -77,7 +77,7 @@ public final class MobSpawnEspHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		pool = MinPriorityThreadFactory.newFixedThreadPool();
 		
@@ -87,7 +87,7 @@ public final class MobSpawnEspHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketInputListener.class, this);

src/main/java/net/wurstclient/hacks/MultiAuraHack.java

@@ -58,7 +58,7 @@ public final class MultiAuraHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable other killauras
 		WURST.getHax().aimAssistHack.setEnabled(false);
@@ -76,7 +76,7 @@ public final class MultiAuraHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/NavigatorHack.java

@@ -25,7 +25,7 @@ public final class NavigatorHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		if(!(MC.currentScreen instanceof NavigatorMainScreen))
 			MC.setScreen(new NavigatorMainScreen());

src/main/java/net/wurstclient/hacks/NoClipHack.java

@@ -29,7 +29,7 @@ public final class NoClipHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(PlayerMoveListener.class, this);
@@ -39,7 +39,7 @@ public final class NoClipHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PlayerMoveListener.class, this);

src/main/java/net/wurstclient/hacks/NoFallHack.java

@@ -49,13 +49,13 @@ public final class NoFallHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/NoWebHack.java

@@ -21,13 +21,13 @@ public final class NoWebHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/NukerLegitHack.java

@@ -96,7 +96,7 @@ public final class NukerLegitHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// disable other nukers
 		WURST.getHax().autoMineHack.setEnabled(false);
@@ -112,7 +112,7 @@ public final class NukerLegitHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		// remove listeners
 		EVENTS.remove(LeftClickListener.class, this);

src/main/java/net/wurstclient/hacks/OpenWaterEspHack.java

@@ -43,13 +43,13 @@ public final class OpenWaterEspHack extends Hack implements RenderListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(RenderListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(RenderListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/OverlayHack.java

@@ -28,14 +28,14 @@ public final class OverlayHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(RenderListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/PanicHack.java

@@ -24,13 +24,13 @@ public final class PanicHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/ParkourHack.java

@@ -45,14 +45,14 @@ public final class ParkourHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		WURST.getHax().safeWalkHack.setEnabled(false);
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/PlayerEspHack.java

@@ -74,7 +74,7 @@ public final class PlayerEspHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(CameraTransformViewBobbingListener.class, this);
@@ -82,7 +82,7 @@ public final class PlayerEspHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(CameraTransformViewBobbingListener.class, this);

src/main/java/net/wurstclient/hacks/PortalEspHack.java

@@ -96,7 +96,7 @@ public final class PortalEspHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		groupsUpToDate = false;
 		
@@ -109,7 +109,7 @@ public final class PortalEspHack extends Hack implements UpdateListener,
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketInputListener.class, coordinator);

src/main/java/net/wurstclient/hacks/ProphuntEspHack.java

@@ -36,13 +36,13 @@ public final class ProphuntEspHack extends Hack implements RenderListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(RenderListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(RenderListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/ProtectHack.java

@@ -109,7 +109,7 @@ public final class ProtectHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		WURST.getHax().followHack.setEnabled(false);
 		WURST.getHax().tunnellerHack.setEnabled(false);
@@ -149,7 +149,7 @@ public final class ProtectHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);

src/main/java/net/wurstclient/hacks/RadarHack.java

@@ -67,14 +67,14 @@ public final class RadarHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 		window.setInvisible(false);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		window.setInvisible(true);

src/main/java/net/wurstclient/hacks/RemoteViewHack.java

@@ -47,7 +47,7 @@ public final class RemoteViewHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		// find entity if not already set
 		if(entity == null)
@@ -94,7 +94,7 @@ public final class RemoteViewHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		// remove listener
 		EVENTS.remove(UpdateListener.class, this);

src/main/java/net/wurstclient/hacks/RestockHack.java

@@ -65,13 +65,13 @@ public final class RestockHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java

@@ -37,13 +37,13 @@ public final class ScaffoldWalkHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}

src/main/java/net/wurstclient/hacks/SearchHack.java

@@ -95,7 +95,7 @@ public final class SearchHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		lastBlock = block.getBlock();
 		coordinator.setTargetBlock(lastBlock);
@@ -112,7 +112,7 @@ public final class SearchHack extends Hack
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(PacketInputListener.class, coordinator);

src/main/java/net/wurstclient/hacks/SkinDerpHack.java

@@ -27,13 +27,13 @@ public final class SkinDerpHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		

src/main/java/net/wurstclient/hacks/SneakHack.java

@@ -52,14 +52,14 @@ public final class SneakHack extends Hack
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(PreMotionListener.class, this);
 		EVENTS.add(PostMotionListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(PreMotionListener.class, this);
 		EVENTS.remove(PostMotionListener.class, this);

src/main/java/net/wurstclient/hacks/SpeedHackHack.java

@@ -23,13 +23,13 @@ public final class SpeedHackHack extends Hack implements UpdateListener
 	}
 	
 	@Override
-	public void onEnable()
+	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
 	}
 	
 	@Override
-	public void onDisable()
+	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 	}