Update mixin names to match official mappings

src/main/java/net/wurstclient/Feature.java

@@ -16,7 +16,7 @@
 import net.minecraft.client.Minecraft;
 import net.wurstclient.event.EventManager;
 import net.wurstclient.keybinds.PossibleKeybind;
-import net.wurstclient.mixinterface.IMinecraftClient;
+import net.wurstclient.mixinterface.IMinecraft;
 import net.wurstclient.settings.Setting;
 import net.wurstclient.util.ChatUtils;
 
@@ -25,7 +25,7 @@ public abstract class Feature
 	protected static final WurstClient WURST = WurstClient.INSTANCE;
 	protected static final EventManager EVENTS = WURST.getEventManager();
 	protected static final Minecraft MC = WurstClient.MC;
-	protected static final IMinecraftClient IMC = WurstClient.IMC;
+	protected static final IMinecraft IMC = WurstClient.IMC;
 
 	private final LinkedHashMap<String, Setting> settings =
 		new LinkedHashMap<>();

src/main/java/net/wurstclient/WurstClient.java

@@ -34,7 +34,7 @@
 import net.wurstclient.hud.IngameHUD;
 import net.wurstclient.keybinds.KeybindList;
 import net.wurstclient.keybinds.KeybindProcessor;
-import net.wurstclient.mixinterface.IMinecraftClient;
+import net.wurstclient.mixinterface.IMinecraft;
 import net.wurstclient.navigator.Navigator;
 import net.wurstclient.other_feature.OtfList;
 import net.wurstclient.other_feature.OtherFeature;
@@ -48,7 +48,7 @@ public enum WurstClient
 	INSTANCE;
 
 	public static Minecraft MC;
-	public static IMinecraftClient IMC;
+	public static IMinecraft IMC;
 
 	public static final String VERSION = "7.51.1";
 	public static final String MC_VERSION = "1.21.10";
@@ -81,7 +81,7 @@ public void initialize()
 		System.out.println("Starting Wurst Client...");
 
 		MC = Minecraft.getInstance();
-		IMC = (IMinecraftClient)MC;
+		IMC = (IMinecraft)MC;
 		wurstFolder = createWurstFolder();
 
 		Path analyticsFile = wurstFolder.resolve("analytics.json");

src/main/java/net/wurstclient/ai/PathProcessor.java

@@ -14,7 +14,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
 import net.wurstclient.WurstClient;
-import net.wurstclient.mixinterface.IKeyBinding;
+import net.wurstclient.mixinterface.IKeyMapping;
 
 public abstract class PathProcessor
 {
@@ -77,6 +77,6 @@ public static final void releaseControls()
 	{
 		// reset keys
 		for(KeyMapping key : CONTROLS)
-			IKeyBinding.get(key).resetPressedState();
+			IKeyMapping.get(key).resetPressedState();
 	}
 }

src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java

@@ -51,7 +51,7 @@
 import net.minecraft.util.StringUtil;
 import net.wurstclient.WurstClient;
 import net.wurstclient.altmanager.*;
-import net.wurstclient.mixinterface.IMinecraftClient;
+import net.wurstclient.mixinterface.IMinecraft;
 import net.wurstclient.util.MultiProcessingUtils;
 import net.wurstclient.util.json.JsonException;
 import net.wurstclient.util.json.JsonUtils;
@@ -179,8 +179,7 @@ private void updateAltButtons()
 		editButton.active = altSelected;
 		deleteButton.active = altSelected;
 
-		logoutButton.active =
-			((IMinecraftClient)minecraft).getWurstSession() != null;
+		logoutButton.active = ((IMinecraft)minecraft).getWurstSession() != null;
 	}
 
 	@Override
@@ -225,7 +224,7 @@ private void pressLogin()
 
 	private void pressLogout()
 	{
-		((IMinecraftClient)minecraft).setWurstSession(null);
+		((IMinecraft)minecraft).setWurstSession(null);
 		updateAltButtons();
 	}
 

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

@@ -24,5 +24,5 @@ public AntiBlindHack()
 	}
 
 	// See BackgroundRendererMixin, LightmapTextureManagerMixin,
-	// WorldRendererMixin, ClientPlayerEntityMixin.hasStatusEffect()
+	// LevelRendererMixin, LocalPlayerMixin.hasEffect()
 }

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

@@ -158,5 +158,5 @@ public void onRefresh(String draftMessage,
 		lastRefreshTime = System.currentTimeMillis();
 	}
 
-	// See ChatInputSuggestorMixin
+	// See CommandSuggestionsMixin
 }

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

@@ -46,7 +46,7 @@
 import net.wurstclient.hack.Hack;
 import net.wurstclient.hacks.autolibrarian.BookOffer;
 import net.wurstclient.hacks.autolibrarian.UpdateBooksSetting;
-import net.wurstclient.mixinterface.IKeyBinding;
+import net.wurstclient.mixinterface.IKeyMapping;
 import net.wurstclient.settings.BookOffersSetting;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.FaceTargetSetting;
@@ -325,7 +325,7 @@ private void placeJobSite()
 			? InteractionHand.MAIN_HAND : InteractionHand.OFF_HAND;
 
 		// sneak-place to avoid activating trapdoors/chests/etc.
-		IKeyBinding sneakKey = IKeyBinding.get(MC.options.keyShift);
+		IKeyMapping sneakKey = IKeyMapping.get(MC.options.keyShift);
 		sneakKey.setDown(true);
 		if(!MC.player.isShiftKeyDown())
 			return;

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

@@ -19,7 +19,7 @@
 import net.wurstclient.events.HandleBlockBreakingListener;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.IKeyBinding;
+import net.wurstclient.mixinterface.IKeyMapping;
 import net.wurstclient.settings.CheckboxSetting;
 
 @SearchTags({"auto mine", "AutoBreak", "auto break"})
@@ -59,7 +59,7 @@ protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(HandleBlockBreakingListener.class, this);
-		IKeyBinding.get(MC.options.keyAttack).resetPressedState();
+		IKeyMapping.get(MC.options.keyAttack).resetPressedState();
 		MC.gameMode.stopDestroyBlock();
 	}
 

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

@@ -101,5 +101,5 @@ public boolean areButtonsVisible()
 		return buttons.isChecked();
 	}
 
-	// See GenericContainerScreenMixin and ShulkerBoxScreenMixin
+	// See ContainerScreenMixin and ShulkerBoxScreenMixin
 }

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

@@ -31,7 +31,7 @@
 import net.wurstclient.events.BlockBreakingProgressListener;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.IClientPlayerInteractionManager;
+import net.wurstclient.mixinterface.IMultiPlayerGameMode;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
@@ -224,7 +224,7 @@ private void putAwayDamagedTool(int repairMode)
 	{
 		Inventory inv = MC.player.getInventory();
 		int selectedSlot = inv.getSelectedSlot();
-		IClientPlayerInteractionManager im = IMC.getInteractionManager();
+		IMultiPlayerGameMode im = IMC.getInteractionManager();
 
 		// If there's an empty slot in the main inventory,
 		// shift-click the damaged item out of the hotbar

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

@@ -16,7 +16,7 @@
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.IClientPlayerInteractionManager;
+import net.wurstclient.mixinterface.IMultiPlayerGameMode;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
@@ -125,7 +125,7 @@ private void moveToOffhand(int itemSlot)
 	{
 		boolean offhandEmpty = MC.player.getOffhandItem().isEmpty();
 
-		IClientPlayerInteractionManager im = IMC.getInteractionManager();
+		IMultiPlayerGameMode im = IMC.getInteractionManager();
 		im.windowClick_PICKUP(itemSlot);
 		im.windowClick_PICKUP(45);
 
@@ -138,7 +138,7 @@ private void finishMovingTotem()
 		if(nextTickSlot == -1)
 			return;
 
-		IClientPlayerInteractionManager im = IMC.getInteractionManager();
+		IMultiPlayerGameMode im = IMC.getInteractionManager();
 		im.windowClick_PICKUP(nextTickSlot);
 		nextTickSlot = -1;
 	}

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

@@ -11,7 +11,7 @@
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.IKeyBinding;
+import net.wurstclient.mixinterface.IKeyMapping;
 
 @SearchTags({"auto walk"})
 public final class AutoWalkHack extends Hack implements UpdateListener
@@ -32,7 +32,7 @@ protected void onEnable()
 	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
-		IKeyBinding.get(MC.options.keyUp).resetPressedState();
+		IKeyMapping.get(MC.options.keyUp).resetPressedState();
 	}
 
 	@Override

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

@@ -20,5 +20,5 @@ public BarrierEspHack()
 		setCategory(Category.RENDER);
 	}
 
-	// See ClientWorldMixin
+	// See ClientLevelMixin
 }

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

@@ -15,7 +15,7 @@
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.IKeyBinding;
+import net.wurstclient.mixinterface.IKeyMapping;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
@@ -126,6 +126,6 @@ private void restoreKeyPresses()
 		KeyMapping[] keys = {MC.options.keyJump, MC.options.keyShift};
 
 		for(KeyMapping key : keys)
-			IKeyBinding.get(key).resetPressedState();
+			IKeyMapping.get(key).resetPressedState();
 	}
 }

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

@@ -22,7 +22,7 @@
 import net.wurstclient.events.*;
 import net.wurstclient.hack.DontSaveState;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.IKeyBinding;
+import net.wurstclient.mixinterface.IKeyMapping;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.settings.SliderSetting;
@@ -77,7 +77,7 @@ protected void onEnable()
 			opt.keyRight, opt.keyJump, opt.keyShift};
 
 		for(KeyMapping binding : bindings)
-			IKeyBinding.get(binding).resetPressedState();
+			IKeyMapping.get(binding).resetPressedState();
 	}
 
 	@Override

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

@@ -13,7 +13,7 @@
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.ISimpleOption;
+import net.wurstclient.mixinterface.IOptionInstance;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.EnumSetting;
 import net.wurstclient.settings.SliderSetting;
@@ -96,7 +96,7 @@ private void setGamma(double target)
 		wasGammaChanged = true;
 
 		OptionInstance<Double> gammaOption = MC.options.gamma();
-		ISimpleOption<Double> gammaOption2 = ISimpleOption.get(gammaOption);
+		IOptionInstance<Double> gammaOption2 = IOptionInstance.get(gammaOption);
 		double oldGammaValue = gammaOption.get();
 
 		if(!fade.isChecked() || Math.abs(oldGammaValue - target) <= 0.5)
@@ -114,7 +114,7 @@ private void setGamma(double target)
 	private void resetGamma(double target)
 	{
 		OptionInstance<Double> gammaOption = MC.options.gamma();
-		ISimpleOption<Double> gammaOption2 = ISimpleOption.get(gammaOption);
+		IOptionInstance<Double> gammaOption2 = IOptionInstance.get(gammaOption);
 		double oldGammaValue = gammaOption.get();
 
 		if(!fade.isChecked() || Math.abs(oldGammaValue - target) <= 0.5)
@@ -193,5 +193,5 @@ public String toString()
 		}
 	}
 
-	// See ClientPlayerEntityMixin.hasStatusEffect()
+	// See LocalPlayerMixin.hasEffect()
 }

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

@@ -45,5 +45,5 @@ public boolean isBlockInList(BlockPos pos)
 		return blocks.contains(BlockUtils.getName(pos));
 	}
 
-	// See AbstractBlockStateMixin.onGetOutlineShape()
+	// See BlockStateBaseMixin.onGetOutlineShape()
 }

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

@@ -22,7 +22,7 @@
 import net.wurstclient.clickgui.screens.ClickGuiScreen;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.IKeyBinding;
+import net.wurstclient.mixinterface.IKeyMapping;
 import net.wurstclient.settings.CheckboxSetting;
 
 @SearchTags({"inv walk", "inventory walk", "InvMove", "inv move",
@@ -93,7 +93,7 @@ public void onUpdate()
 			keys.add(MC.options.keyJump);
 
 		for(KeyMapping key : keys)
-			IKeyBinding.get(key).resetPressedState();
+			IKeyMapping.get(key).resetPressedState();
 	}
 
 	private boolean isAllowedScreen(Screen screen)

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

@@ -12,7 +12,7 @@
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.mixinterface.IKeyBinding;
+import net.wurstclient.mixinterface.IKeyMapping;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
 
@@ -43,7 +43,7 @@ protected void onEnable()
 	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
-		IKeyBinding.get(MC.options.keyShift).resetPressedState();
+		IKeyMapping.get(MC.options.keyShift).resetPressedState();
 	}
 
 	@Override

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

@@ -79,5 +79,5 @@ public boolean shouldForcePlayerNametags()
 	}
 
 	// See EntityRenderCommandQueueImpl, EntityRendererMixin,
-	// LivingEntityRendererMixin, MobEntityRendererMixin
+	// LivingEntityRendererMixin, MobRendererMixin
 }

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

@@ -32,5 +32,5 @@ public float getOverlayOffset()
 		return isEnabled() ? offset.getValueF() : 0;
 	}
 
-	// See InGameOverlayRendererMixin.getFireOffset()
+	// See ScreenEffectRendererMixin.getFireOffset()
 }

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

@@ -20,6 +20,6 @@ public NoLevitationHack()
 		setCategory(Category.MOVEMENT);
 	}
 
-	// See ClientPlayerEntityMixin.hasStatusEffect() and
-	// ClientPlayerEntityMixin.getStatusEffect()
+	// See LocalPlayerMixin.hasEffect() and
+	// LocalPlayerMixin.getEffect()
 }

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

@@ -21,6 +21,6 @@ public NoOverlayHack()
 		setCategory(Category.RENDER);
 	}
 
-	// See CameraMixin.onGetSubmersionType(), IngameHudMixin.renderOverlay(),
-	// InGameOverlayRendererMixin.onRenderUnderwaterOverlay()
+	// See CameraMixin.onGetSubmersionType(), GuiMixin.onRenderOverlay(),
+	// ScreenEffectRendererMixin.onRenderUnderwaterOverlay()
 }

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

@@ -20,5 +20,5 @@ public NoPumpkinHack()
 		setCategory(Category.RENDER);
 	}
 
-	// See IngameHudMixin.onRenderOverlay()
+	// See GuiMixin.onRenderOverlay()
 }

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

@@ -45,5 +45,5 @@ public void adjustShieldPosition(PoseStack matrixStack, boolean blocking)
 			matrixStack.translate(0, -nonBlockingOffset.getValue(), 0);
 	}
 
-	// See HeldItemRendererMixin
+	// See ItemInHandRendererMixin
 }

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

@@ -21,5 +21,5 @@ public NoSlowdownHack()
 	}
 
 	// See BlockMixin.onGetVelocityMultiplier() and
-	// ClientPlayerEntityMixin.wurstIsUsingItem()
+	// LocalPlayerMixin.wurstIsUsingItem()
 }

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

@@ -20,5 +20,5 @@ public NoVignetteHack()
 		setCategory(Category.RENDER);
 	}
 
-	// See IngameHudMixin.onRenderVignetteOverlay()
+	// See GuiMixin.onRenderVignetteOverlay()
 }