diff --git a/src/main/java/net/wurstclient/Feature.java b/src/main/java/net/wurstclient/Feature.java index fe9215be2e..f2afbc2e39 100644 --- a/src/main/java/net/wurstclient/Feature.java +++ b/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 settings = new LinkedHashMap<>(); diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 4058ae6e6f..0790b8b56d 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/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"); diff --git a/src/main/java/net/wurstclient/ai/PathProcessor.java b/src/main/java/net/wurstclient/ai/PathProcessor.java index 0ffdf9d8d4..60b76ff009 100644 --- a/src/main/java/net/wurstclient/ai/PathProcessor.java +++ b/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(); } } diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java index ce6dca6bf1..7187c216a9 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java +++ b/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(); } diff --git a/src/main/java/net/wurstclient/hacks/AntiBlindHack.java b/src/main/java/net/wurstclient/hacks/AntiBlindHack.java index 36ddbdbb6d..bcef170306 100644 --- a/src/main/java/net/wurstclient/hacks/AntiBlindHack.java +++ b/src/main/java/net/wurstclient/hacks/AntiBlindHack.java @@ -24,5 +24,5 @@ public AntiBlindHack() } // See BackgroundRendererMixin, LightmapTextureManagerMixin, - // WorldRendererMixin, ClientPlayerEntityMixin.hasStatusEffect() + // LevelRendererMixin, LocalPlayerMixin.hasEffect() } diff --git a/src/main/java/net/wurstclient/hacks/AutoCompleteHack.java b/src/main/java/net/wurstclient/hacks/AutoCompleteHack.java index 09ad8cd904..341c074b1d 100644 --- a/src/main/java/net/wurstclient/hacks/AutoCompleteHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoCompleteHack.java @@ -158,5 +158,5 @@ public void onRefresh(String draftMessage, lastRefreshTime = System.currentTimeMillis(); } - // See ChatInputSuggestorMixin + // See CommandSuggestionsMixin } diff --git a/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java b/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java index 2f513bde59..182d752618 100644 --- a/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java +++ b/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; diff --git a/src/main/java/net/wurstclient/hacks/AutoMineHack.java b/src/main/java/net/wurstclient/hacks/AutoMineHack.java index 851f1ceb20..7553f667bf 100644 --- a/src/main/java/net/wurstclient/hacks/AutoMineHack.java +++ b/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(); } diff --git a/src/main/java/net/wurstclient/hacks/AutoStealHack.java b/src/main/java/net/wurstclient/hacks/AutoStealHack.java index 09fc5ba6ae..0ace17c808 100644 --- a/src/main/java/net/wurstclient/hacks/AutoStealHack.java +++ b/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 } diff --git a/src/main/java/net/wurstclient/hacks/AutoToolHack.java b/src/main/java/net/wurstclient/hacks/AutoToolHack.java index d969b177dd..dd6a800f9a 100644 --- a/src/main/java/net/wurstclient/hacks/AutoToolHack.java +++ b/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 diff --git a/src/main/java/net/wurstclient/hacks/AutoTotemHack.java b/src/main/java/net/wurstclient/hacks/AutoTotemHack.java index dd3de4c868..0e31c19a1c 100644 --- a/src/main/java/net/wurstclient/hacks/AutoTotemHack.java +++ b/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; } diff --git a/src/main/java/net/wurstclient/hacks/AutoWalkHack.java b/src/main/java/net/wurstclient/hacks/AutoWalkHack.java index 7130f41d1a..14520532bc 100644 --- a/src/main/java/net/wurstclient/hacks/AutoWalkHack.java +++ b/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 diff --git a/src/main/java/net/wurstclient/hacks/BarrierEspHack.java b/src/main/java/net/wurstclient/hacks/BarrierEspHack.java index 2f2cc1f59e..c939c8c434 100644 --- a/src/main/java/net/wurstclient/hacks/BarrierEspHack.java +++ b/src/main/java/net/wurstclient/hacks/BarrierEspHack.java @@ -20,5 +20,5 @@ public BarrierEspHack() setCategory(Category.RENDER); } - // See ClientWorldMixin + // See ClientLevelMixin } diff --git a/src/main/java/net/wurstclient/hacks/CreativeFlightHack.java b/src/main/java/net/wurstclient/hacks/CreativeFlightHack.java index 1913f2ff62..7552b74fec 100644 --- a/src/main/java/net/wurstclient/hacks/CreativeFlightHack.java +++ b/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(); } } diff --git a/src/main/java/net/wurstclient/hacks/FreecamHack.java b/src/main/java/net/wurstclient/hacks/FreecamHack.java index 137c336cb9..051748d96b 100644 --- a/src/main/java/net/wurstclient/hacks/FreecamHack.java +++ b/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 diff --git a/src/main/java/net/wurstclient/hacks/FullbrightHack.java b/src/main/java/net/wurstclient/hacks/FullbrightHack.java index f829012b6e..43b75cb467 100644 --- a/src/main/java/net/wurstclient/hacks/FullbrightHack.java +++ b/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 gammaOption = MC.options.gamma(); - ISimpleOption gammaOption2 = ISimpleOption.get(gammaOption); + IOptionInstance 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 gammaOption = MC.options.gamma(); - ISimpleOption gammaOption2 = ISimpleOption.get(gammaOption); + IOptionInstance 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() } diff --git a/src/main/java/net/wurstclient/hacks/HandNoClipHack.java b/src/main/java/net/wurstclient/hacks/HandNoClipHack.java index bd52d9fbc7..fd275b6f6c 100644 --- a/src/main/java/net/wurstclient/hacks/HandNoClipHack.java +++ b/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() } diff --git a/src/main/java/net/wurstclient/hacks/InvWalkHack.java b/src/main/java/net/wurstclient/hacks/InvWalkHack.java index 2b05360ceb..8d7baaa279 100644 --- a/src/main/java/net/wurstclient/hacks/InvWalkHack.java +++ b/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) diff --git a/src/main/java/net/wurstclient/hacks/MileyCyrusHack.java b/src/main/java/net/wurstclient/hacks/MileyCyrusHack.java index 0d24e17839..a138533f24 100644 --- a/src/main/java/net/wurstclient/hacks/MileyCyrusHack.java +++ b/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 diff --git a/src/main/java/net/wurstclient/hacks/NameTagsHack.java b/src/main/java/net/wurstclient/hacks/NameTagsHack.java index d2ba57acd2..6b0b6c73fb 100644 --- a/src/main/java/net/wurstclient/hacks/NameTagsHack.java +++ b/src/main/java/net/wurstclient/hacks/NameTagsHack.java @@ -79,5 +79,5 @@ public boolean shouldForcePlayerNametags() } // See EntityRenderCommandQueueImpl, EntityRendererMixin, - // LivingEntityRendererMixin, MobEntityRendererMixin + // LivingEntityRendererMixin, MobRendererMixin } diff --git a/src/main/java/net/wurstclient/hacks/NoFireOverlayHack.java b/src/main/java/net/wurstclient/hacks/NoFireOverlayHack.java index 2947573b5b..3534ee3713 100644 --- a/src/main/java/net/wurstclient/hacks/NoFireOverlayHack.java +++ b/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() } diff --git a/src/main/java/net/wurstclient/hacks/NoLevitationHack.java b/src/main/java/net/wurstclient/hacks/NoLevitationHack.java index 8940c456e4..02a5d05df8 100644 --- a/src/main/java/net/wurstclient/hacks/NoLevitationHack.java +++ b/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() } diff --git a/src/main/java/net/wurstclient/hacks/NoOverlayHack.java b/src/main/java/net/wurstclient/hacks/NoOverlayHack.java index b249b1b4e8..8af45ad23e 100644 --- a/src/main/java/net/wurstclient/hacks/NoOverlayHack.java +++ b/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() } diff --git a/src/main/java/net/wurstclient/hacks/NoPumpkinHack.java b/src/main/java/net/wurstclient/hacks/NoPumpkinHack.java index 4b5baa4022..28e9f250c9 100644 --- a/src/main/java/net/wurstclient/hacks/NoPumpkinHack.java +++ b/src/main/java/net/wurstclient/hacks/NoPumpkinHack.java @@ -20,5 +20,5 @@ public NoPumpkinHack() setCategory(Category.RENDER); } - // See IngameHudMixin.onRenderOverlay() + // See GuiMixin.onRenderOverlay() } diff --git a/src/main/java/net/wurstclient/hacks/NoShieldOverlayHack.java b/src/main/java/net/wurstclient/hacks/NoShieldOverlayHack.java index 04ab2e09a4..58ed0abe7a 100644 --- a/src/main/java/net/wurstclient/hacks/NoShieldOverlayHack.java +++ b/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 } diff --git a/src/main/java/net/wurstclient/hacks/NoSlowdownHack.java b/src/main/java/net/wurstclient/hacks/NoSlowdownHack.java index 9a75cb8f29..b7c62f2f59 100644 --- a/src/main/java/net/wurstclient/hacks/NoSlowdownHack.java +++ b/src/main/java/net/wurstclient/hacks/NoSlowdownHack.java @@ -21,5 +21,5 @@ public NoSlowdownHack() } // See BlockMixin.onGetVelocityMultiplier() and - // ClientPlayerEntityMixin.wurstIsUsingItem() + // LocalPlayerMixin.wurstIsUsingItem() } diff --git a/src/main/java/net/wurstclient/hacks/NoVignetteHack.java b/src/main/java/net/wurstclient/hacks/NoVignetteHack.java index b267c4b81b..8193a315e0 100644 --- a/src/main/java/net/wurstclient/hacks/NoVignetteHack.java +++ b/src/main/java/net/wurstclient/hacks/NoVignetteHack.java @@ -20,5 +20,5 @@ public NoVignetteHack() setCategory(Category.RENDER); } - // See IngameHudMixin.onRenderVignetteOverlay() + // See GuiMixin.onRenderVignetteOverlay() } diff --git a/src/main/java/net/wurstclient/hacks/NukerLegitHack.java b/src/main/java/net/wurstclient/hacks/NukerLegitHack.java index e3f1540799..5fc5f83e69 100644 --- a/src/main/java/net/wurstclient/hacks/NukerLegitHack.java +++ b/src/main/java/net/wurstclient/hacks/NukerLegitHack.java @@ -29,7 +29,7 @@ import net.wurstclient.events.UpdateListener; import net.wurstclient.hack.Hack; import net.wurstclient.hacks.nukers.CommonNukerSettings; -import net.wurstclient.mixinterface.IKeyBinding; +import net.wurstclient.mixinterface.IKeyMapping; import net.wurstclient.settings.SliderSetting; import net.wurstclient.settings.SliderSetting.ValueDisplay; import net.wurstclient.settings.SwingHandSetting; @@ -97,7 +97,7 @@ protected void onDisable() EVENTS.remove(RenderListener.class, this); // resets - IKeyBinding.get(MC.options.keyAttack).resetPressedState(); + IKeyMapping.get(MC.options.keyAttack).resetPressedState(); MC.gameMode.stopDestroyBlock(); overlay.resetProgress(); currentBlock = null; @@ -147,7 +147,7 @@ public void onUpdate() // reset if no block was found if(currentBlock == null) { - IKeyBinding.get(MC.options.keyAttack).resetPressedState(); + IKeyMapping.get(MC.options.keyAttack).resetPressedState(); overlay.resetProgress(); } diff --git a/src/main/java/net/wurstclient/hacks/PortalGuiHack.java b/src/main/java/net/wurstclient/hacks/PortalGuiHack.java index 7ded0857c6..35661aaad7 100644 --- a/src/main/java/net/wurstclient/hacks/PortalGuiHack.java +++ b/src/main/java/net/wurstclient/hacks/PortalGuiHack.java @@ -20,5 +20,5 @@ public PortalGuiHack() setCategory(Category.OTHER); } - // See ClientPlayerEntityMixin.beforeUpdateNausea() + // See LocalPlayerMixin.beforeTickNausea() } diff --git a/src/main/java/net/wurstclient/hacks/ReachHack.java b/src/main/java/net/wurstclient/hacks/ReachHack.java index 736826d884..341fef5f15 100644 --- a/src/main/java/net/wurstclient/hacks/ReachHack.java +++ b/src/main/java/net/wurstclient/hacks/ReachHack.java @@ -31,6 +31,6 @@ public double getReachDistance() return range.getValue(); } - // See ClientPlayerEntityMixin.getBlockInteractionRange() and - // ClientPlayerEntityMixin.getEntityInteractionRange() + // See LocalPlayerMixin.blockInteractionRange() and + // LocalPlayerMixin.entityInteractionRange() } diff --git a/src/main/java/net/wurstclient/hacks/RestockHack.java b/src/main/java/net/wurstclient/hacks/RestockHack.java index 970f074eae..4b53de3c52 100644 --- a/src/main/java/net/wurstclient/hacks/RestockHack.java +++ b/src/main/java/net/wurstclient/hacks/RestockHack.java @@ -21,7 +21,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.ItemListSetting; import net.wurstclient.settings.SliderSetting; import net.wurstclient.settings.SliderSetting.ValueDisplay; @@ -86,7 +86,7 @@ public void onUpdate() return; Inventory inv = MC.player.getInventory(); - IClientPlayerInteractionManager im = IMC.getInteractionManager(); + IMultiPlayerGameMode im = IMC.getInteractionManager(); int hotbarSlot = restockSlot.getValueI(); if(hotbarSlot == -1) diff --git a/src/main/java/net/wurstclient/hacks/SafeWalkHack.java b/src/main/java/net/wurstclient/hacks/SafeWalkHack.java index 962f20d63a..8b48b13bbf 100644 --- a/src/main/java/net/wurstclient/hacks/SafeWalkHack.java +++ b/src/main/java/net/wurstclient/hacks/SafeWalkHack.java @@ -12,7 +12,7 @@ import net.wurstclient.Category; import net.wurstclient.SearchTags; 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; @@ -78,7 +78,7 @@ public void onClipAtLedge(boolean clipping) private void setSneaking(boolean sneaking) { - IKeyBinding sneakKey = IKeyBinding.get(MC.options.keyShift); + IKeyMapping sneakKey = IKeyMapping.get(MC.options.keyShift); if(sneaking) sneakKey.setDown(true); @@ -88,5 +88,5 @@ private void setSneaking(boolean sneaking) this.sneaking = sneaking; } - // See ClientPlayerEntityMixin + // See LocalPlayerMixin } diff --git a/src/main/java/net/wurstclient/hacks/SneakHack.java b/src/main/java/net/wurstclient/hacks/SneakHack.java index bb046335e1..7e7ba14f58 100644 --- a/src/main/java/net/wurstclient/hacks/SneakHack.java +++ b/src/main/java/net/wurstclient/hacks/SneakHack.java @@ -12,7 +12,7 @@ import net.wurstclient.events.PostMotionListener; import net.wurstclient.events.PreMotionListener; import net.wurstclient.hack.Hack; -import net.wurstclient.mixinterface.IKeyBinding; +import net.wurstclient.mixinterface.IKeyMapping; import net.wurstclient.settings.CheckboxSetting; import net.wurstclient.settings.EnumSetting; @@ -63,7 +63,7 @@ protected void onDisable() switch(mode.getSelected()) { case LEGIT: - IKeyBinding.get(MC.options.keyShift).resetPressedState(); + IKeyMapping.get(MC.options.keyShift).resetPressedState(); break; case PACKET: @@ -75,7 +75,7 @@ protected void onDisable() @Override public void onPreMotion() { - IKeyBinding sneakKey = IKeyBinding.get(MC.options.keyShift); + IKeyMapping sneakKey = IKeyMapping.get(MC.options.keyShift); switch(mode.getSelected()) { diff --git a/src/main/java/net/wurstclient/hacks/TriggerBotHack.java b/src/main/java/net/wurstclient/hacks/TriggerBotHack.java index 2ecb8f584b..e3c958f196 100644 --- a/src/main/java/net/wurstclient/hacks/TriggerBotHack.java +++ b/src/main/java/net/wurstclient/hacks/TriggerBotHack.java @@ -17,7 +17,7 @@ import net.wurstclient.events.HandleInputListener; import net.wurstclient.events.PreMotionListener; import net.wurstclient.hack.Hack; -import net.wurstclient.mixinterface.IKeyBinding; +import net.wurstclient.mixinterface.IKeyMapping; import net.wurstclient.settings.AttackSpeedSliderSetting; import net.wurstclient.settings.CheckboxSetting; import net.wurstclient.settings.SliderSetting; @@ -112,7 +112,7 @@ protected void onDisable() { if(simulatingMouseClick) { - IKeyBinding.get(MC.options.keyAttack).simulatePress(false); + IKeyMapping.get(MC.options.keyAttack).simulatePress(false); simulatingMouseClick = false; } @@ -126,7 +126,7 @@ public void onPreMotion() if(!simulatingMouseClick) return; - IKeyBinding.get(MC.options.keyAttack).simulatePress(false); + IKeyMapping.get(MC.options.keyAttack).simulatePress(false); simulatingMouseClick = false; } @@ -157,7 +157,7 @@ public void onHandleInput() if(simulateMouseClick.isChecked()) { - IKeyBinding.get(MC.options.keyAttack).simulatePress(true); + IKeyMapping.get(MC.options.keyAttack).simulatePress(true); simulatingMouseClick = true; }else diff --git a/src/main/java/net/wurstclient/hacks/XRayHack.java b/src/main/java/net/wurstclient/hacks/XRayHack.java index ce191272ab..c6f720dcc1 100644 --- a/src/main/java/net/wurstclient/hacks/XRayHack.java +++ b/src/main/java/net/wurstclient/hacks/XRayHack.java @@ -28,7 +28,7 @@ import net.wurstclient.events.ShouldDrawSideListener; import net.wurstclient.events.UpdateListener; import net.wurstclient.hack.Hack; -import net.wurstclient.mixinterface.ISimpleOption; +import net.wurstclient.mixinterface.IOptionInstance; import net.wurstclient.settings.BlockListSetting; import net.wurstclient.settings.CheckboxSetting; import net.wurstclient.settings.SliderSetting; @@ -150,7 +150,7 @@ protected void onDisable() // reset gamma FullbrightHack fullbright = WURST.getHax().fullbrightHack; if(!fullbright.isChangingGamma()) - ISimpleOption.get(MC.options.gamma()) + IOptionInstance.get(MC.options.gamma()) .forceSetValue(fullbright.getDefaultGamma()); } @@ -158,7 +158,7 @@ protected void onDisable() public void onUpdate() { // force gamma to 16 so that ores are bright enough to see - ISimpleOption.get(MC.options.gamma()).forceSetValue(16.0); + IOptionInstance.get(MC.options.gamma()).forceSetValue(16.0); } @Override @@ -253,5 +253,5 @@ public void openBlockListEditor(Screen prevScreen) MC.setScreen(new EditBlockListScreen(prevScreen, ores)); } - // See AbstractBlockRenderContextMixin, RenderLayersMixin + // See AbstractBlockRenderContextMixin, ItemBlockRenderTypesMixin } diff --git a/src/main/java/net/wurstclient/hacks/autofish/FishingSpotManager.java b/src/main/java/net/wurstclient/hacks/autofish/FishingSpotManager.java index 36330548be..06cbb3c5ab 100644 --- a/src/main/java/net/wurstclient/hacks/autofish/FishingSpotManager.java +++ b/src/main/java/net/wurstclient/hacks/autofish/FishingSpotManager.java @@ -17,7 +17,7 @@ import net.minecraft.world.entity.projectile.FishingHook; import net.minecraft.world.phys.Vec3; import net.wurstclient.WurstClient; -import net.wurstclient.mixinterface.IKeyBinding; +import net.wurstclient.mixinterface.IKeyMapping; import net.wurstclient.settings.CheckboxSetting; import net.wurstclient.settings.Setting; import net.wurstclient.settings.SliderSetting; @@ -129,8 +129,8 @@ public boolean onCast() private void moveToNextSpot() { - IKeyBinding forwardKey = IKeyBinding.get(MC.options.keyUp); - IKeyBinding jumpKey = IKeyBinding.get(MC.options.keyJump); + IKeyMapping forwardKey = IKeyMapping.get(MC.options.keyUp); + IKeyMapping jumpKey = IKeyMapping.get(MC.options.keyJump); PositionAndRotation nextPosRot = nextSpot.input(); forwardKey.resetPressedState(); diff --git a/src/main/java/net/wurstclient/mixin/AtmosphericFogModifierMixin.java b/src/main/java/net/wurstclient/mixin/AtmosphericFogEnvironmentMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/AtmosphericFogModifierMixin.java rename to src/main/java/net/wurstclient/mixin/AtmosphericFogEnvironmentMixin.java index 96c1c3eee1..273a188ccb 100644 --- a/src/main/java/net/wurstclient/mixin/AtmosphericFogModifierMixin.java +++ b/src/main/java/net/wurstclient/mixin/AtmosphericFogEnvironmentMixin.java @@ -21,7 +21,7 @@ import net.wurstclient.WurstClient; @Mixin(AtmosphericFogEnvironment.class) -public class AtmosphericFogModifierMixin +public class AtmosphericFogEnvironmentMixin { /** * Removes the foggy overlay in the Overworld (including rain fog), if diff --git a/src/main/java/net/wurstclient/mixin/AbstractBlockStateMixin.java b/src/main/java/net/wurstclient/mixin/BlockStateBaseMixin.java similarity index 93% rename from src/main/java/net/wurstclient/mixin/AbstractBlockStateMixin.java rename to src/main/java/net/wurstclient/mixin/BlockStateBaseMixin.java index 30eb83ab59..870a8086d1 100644 --- a/src/main/java/net/wurstclient/mixin/AbstractBlockStateMixin.java +++ b/src/main/java/net/wurstclient/mixin/BlockStateBaseMixin.java @@ -35,10 +35,9 @@ import net.wurstclient.hacks.HandNoClipHack; @Mixin(BlockStateBase.class) -public abstract class AbstractBlockStateMixin - extends StateHolder +public abstract class BlockStateBaseMixin extends StateHolder { - private AbstractBlockStateMixin(WurstClient wurst, Block owner, + private BlockStateBaseMixin(WurstClient wurst, Block owner, Reference2ObjectArrayMap, Comparable> propertyMap, MapCodec codec) { diff --git a/src/main/java/net/wurstclient/mixin/ChatHudMixin.java b/src/main/java/net/wurstclient/mixin/ChatComponentMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/ChatHudMixin.java rename to src/main/java/net/wurstclient/mixin/ChatComponentMixin.java index c5a91c0b9f..5540ff039e 100644 --- a/src/main/java/net/wurstclient/mixin/ChatHudMixin.java +++ b/src/main/java/net/wurstclient/mixin/ChatComponentMixin.java @@ -30,7 +30,7 @@ import net.wurstclient.events.ChatInputListener.ChatInputEvent; @Mixin(ChatComponent.class) -public class ChatHudMixin +public class ChatComponentMixin { @Shadow @Final diff --git a/src/main/java/net/wurstclient/mixin/ClientCommonNetworkHandlerMixin.java b/src/main/java/net/wurstclient/mixin/ClientCommonPacketListenerImplMixin.java similarity index 93% rename from src/main/java/net/wurstclient/mixin/ClientCommonNetworkHandlerMixin.java rename to src/main/java/net/wurstclient/mixin/ClientCommonPacketListenerImplMixin.java index 170916ded6..7aaa669c67 100644 --- a/src/main/java/net/wurstclient/mixin/ClientCommonNetworkHandlerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientCommonPacketListenerImplMixin.java @@ -21,7 +21,7 @@ import net.wurstclient.events.PacketOutputListener.PacketOutputEvent; @Mixin(ClientCommonPacketListenerImpl.class) -public abstract class ClientCommonNetworkHandlerMixin +public abstract class ClientCommonPacketListenerImplMixin implements ClientCommonPacketListener { @WrapOperation(at = @At(value = "INVOKE", diff --git a/src/main/java/net/wurstclient/mixin/ClientWorldMixin.java b/src/main/java/net/wurstclient/mixin/ClientLevelMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/ClientWorldMixin.java rename to src/main/java/net/wurstclient/mixin/ClientLevelMixin.java index 6ea0f18414..8e85566014 100644 --- a/src/main/java/net/wurstclient/mixin/ClientWorldMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientLevelMixin.java @@ -23,7 +23,7 @@ import net.wurstclient.WurstClient; @Mixin(ClientLevel.class) -public class ClientWorldMixin +public class ClientLevelMixin { @Shadow @Final diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/net/wurstclient/mixin/ClientPacketListenerMixin.java similarity index 92% rename from src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java rename to src/main/java/net/wurstclient/mixin/ClientPacketListenerMixin.java index f353d8d5ea..590f53d0b9 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPacketListenerMixin.java @@ -30,11 +30,11 @@ import net.wurstclient.util.ChatUtils; @Mixin(ClientPacketListener.class) -public abstract class ClientPlayNetworkHandlerMixin +public abstract class ClientPacketListenerMixin extends ClientCommonPacketListenerImpl implements TickablePacketListener, ClientGamePacketListener { - private ClientPlayNetworkHandlerMixin(WurstClient wurst, Minecraft client, + private ClientPacketListenerMixin(WurstClient wurst, Minecraft client, Connection connection, CommonListenerCookie connectionState) { super(client, connection, connectionState); @@ -42,7 +42,7 @@ private ClientPlayNetworkHandlerMixin(WurstClient wurst, Minecraft client, @Inject(at = @At("TAIL"), method = "handleLogin(Lnet/minecraft/network/protocol/game/ClientboundLoginPacket;)V") - public void onOnGameJoin(ClientboundLoginPacket packet, CallbackInfo ci) + public void onHandleLogin(ClientboundLoginPacket packet, CallbackInfo ci) { WurstClient wurst = WurstClient.INSTANCE; if(!wurst.isEnabled()) diff --git a/src/main/java/net/wurstclient/mixin/TelemetryManagerMixin.java b/src/main/java/net/wurstclient/mixin/ClientTelemetryManagerMixin.java similarity index 93% rename from src/main/java/net/wurstclient/mixin/TelemetryManagerMixin.java rename to src/main/java/net/wurstclient/mixin/ClientTelemetryManagerMixin.java index 452503e80e..72c07e3b51 100644 --- a/src/main/java/net/wurstclient/mixin/TelemetryManagerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientTelemetryManagerMixin.java @@ -17,7 +17,7 @@ import net.wurstclient.WurstClient; @Mixin(ClientTelemetryManager.class) -public class TelemetryManagerMixin +public class ClientTelemetryManagerMixin { @Inject(at = @At("HEAD"), method = "getOutsideSessionSender()Lnet/minecraft/client/telemetry/TelemetryEventSender;", diff --git a/src/main/java/net/wurstclient/mixin/ChatInputSuggestorMixin.java b/src/main/java/net/wurstclient/mixin/CommandSuggestionsMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/ChatInputSuggestorMixin.java rename to src/main/java/net/wurstclient/mixin/CommandSuggestionsMixin.java index 135ba51fba..da86a310d4 100644 --- a/src/main/java/net/wurstclient/mixin/ChatInputSuggestorMixin.java +++ b/src/main/java/net/wurstclient/mixin/CommandSuggestionsMixin.java @@ -24,7 +24,7 @@ import net.wurstclient.hacks.AutoCompleteHack; @Mixin(CommandSuggestions.class) -public abstract class ChatInputSuggestorMixin +public abstract class CommandSuggestionsMixin { @Shadow @Final diff --git a/src/main/java/net/wurstclient/mixin/ClientConnectionMixin.java b/src/main/java/net/wurstclient/mixin/ConnectionMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/ClientConnectionMixin.java rename to src/main/java/net/wurstclient/mixin/ConnectionMixin.java index 4c681032eb..898c75c484 100644 --- a/src/main/java/net/wurstclient/mixin/ClientConnectionMixin.java +++ b/src/main/java/net/wurstclient/mixin/ConnectionMixin.java @@ -26,7 +26,7 @@ import net.wurstclient.events.PacketInputListener.PacketInputEvent; @Mixin(Connection.class) -public abstract class ClientConnectionMixin +public abstract class ConnectionMixin extends SimpleChannelInboundHandler> { private ConcurrentLinkedQueue events = diff --git a/src/main/java/net/wurstclient/mixin/GenericContainerScreenMixin.java b/src/main/java/net/wurstclient/mixin/ContainerScreenMixin.java similarity index 90% rename from src/main/java/net/wurstclient/mixin/GenericContainerScreenMixin.java rename to src/main/java/net/wurstclient/mixin/ContainerScreenMixin.java index beea2ffe37..11f844061e 100644 --- a/src/main/java/net/wurstclient/mixin/GenericContainerScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/ContainerScreenMixin.java @@ -22,7 +22,7 @@ import net.wurstclient.hacks.AutoStealHack; @Mixin(ContainerScreen.class) -public abstract class GenericContainerScreenMixin +public abstract class ContainerScreenMixin extends AbstractContainerScreen { @Shadow @@ -33,7 +33,7 @@ public abstract class GenericContainerScreenMixin private final AutoStealHack autoSteal = WurstClient.INSTANCE.getHax().autoStealHack; - public GenericContainerScreenMixin(WurstClient wurst, ChestMenu container, + public ContainerScreenMixin(WurstClient wurst, ChestMenu container, Inventory playerInventory, Component name) { super(container, playerInventory, name); diff --git a/src/main/java/net/wurstclient/mixin/CreativeInventoryScreenMixin.java b/src/main/java/net/wurstclient/mixin/CreativeModeInventoryScreenMixin.java similarity index 90% rename from src/main/java/net/wurstclient/mixin/CreativeInventoryScreenMixin.java rename to src/main/java/net/wurstclient/mixin/CreativeModeInventoryScreenMixin.java index eaef81fd6f..3b04a644b9 100644 --- a/src/main/java/net/wurstclient/mixin/CreativeInventoryScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/CreativeModeInventoryScreenMixin.java @@ -21,10 +21,10 @@ import net.wurstclient.WurstClient; @Mixin(CreativeModeInventoryScreen.class) -public abstract class CreativeInventoryScreenMixin +public abstract class CreativeModeInventoryScreenMixin extends AbstractContainerScreen { - private CreativeInventoryScreenMixin(WurstClient wurst, + private CreativeModeInventoryScreenMixin(WurstClient wurst, ItemPickerMenu screenHandler, Inventory inventory, Component title) { super(screenHandler, inventory, title); diff --git a/src/main/java/net/wurstclient/mixin/DimensionOrBossFogModifierMixin.java b/src/main/java/net/wurstclient/mixin/DimensionOrBossFogEnvironmentMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/DimensionOrBossFogModifierMixin.java rename to src/main/java/net/wurstclient/mixin/DimensionOrBossFogEnvironmentMixin.java index 37a3edde4c..413d4f137c 100644 --- a/src/main/java/net/wurstclient/mixin/DimensionOrBossFogModifierMixin.java +++ b/src/main/java/net/wurstclient/mixin/DimensionOrBossFogEnvironmentMixin.java @@ -21,7 +21,7 @@ import net.wurstclient.WurstClient; @Mixin(DimensionOrBossFogEnvironment.class) -public class DimensionOrBossFogModifierMixin +public class DimensionOrBossFogEnvironmentMixin { /** * Removes the thick fog in the Nether and during the Ender Dragon fight, diff --git a/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java b/src/main/java/net/wurstclient/mixin/DirectJoinServerScreenMixin.java similarity index 87% rename from src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java rename to src/main/java/net/wurstclient/mixin/DirectJoinServerScreenMixin.java index 335db09a7d..abd57b3bb3 100644 --- a/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/DirectJoinServerScreenMixin.java @@ -22,13 +22,13 @@ import net.wurstclient.util.LastServerRememberer; @Mixin(DirectJoinServerScreen.class) -public class DirectConnectScreenMixin extends Screen +public class DirectJoinServerScreenMixin extends Screen { @Shadow @Final private ServerData serverData; - private DirectConnectScreenMixin(WurstClient wurst, Component title) + private DirectJoinServerScreenMixin(WurstClient wurst, Component title) { super(title); } diff --git a/src/main/java/net/wurstclient/mixin/DownloaderMixin.java b/src/main/java/net/wurstclient/mixin/DownloadQueueMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/DownloaderMixin.java rename to src/main/java/net/wurstclient/mixin/DownloadQueueMixin.java index d7ac68d5b0..617c35bf93 100644 --- a/src/main/java/net/wurstclient/mixin/DownloaderMixin.java +++ b/src/main/java/net/wurstclient/mixin/DownloadQueueMixin.java @@ -24,7 +24,7 @@ import net.wurstclient.WurstClient; @Mixin(DownloadQueue.class) -public abstract class DownloaderMixin implements AutoCloseable +public abstract class DownloadQueueMixin implements AutoCloseable { @Shadow @Final diff --git a/src/main/java/net/wurstclient/mixin/IngameHudMixin.java b/src/main/java/net/wurstclient/mixin/GuiMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/IngameHudMixin.java rename to src/main/java/net/wurstclient/mixin/GuiMixin.java index 2a317045fe..f51851fa8f 100644 --- a/src/main/java/net/wurstclient/mixin/IngameHudMixin.java +++ b/src/main/java/net/wurstclient/mixin/GuiMixin.java @@ -23,7 +23,7 @@ import net.wurstclient.hack.HackList; @Mixin(Gui.class) -public class IngameHudMixin +public class GuiMixin { // runs after renderScoreboardSidebar() // and before playerListHud.setVisible() diff --git a/src/main/java/net/wurstclient/mixin/RenderLayersMixin.java b/src/main/java/net/wurstclient/mixin/ItemBlockRenderTypesMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/RenderLayersMixin.java rename to src/main/java/net/wurstclient/mixin/ItemBlockRenderTypesMixin.java index 4a1ee85b02..fa811a5cae 100644 --- a/src/main/java/net/wurstclient/mixin/RenderLayersMixin.java +++ b/src/main/java/net/wurstclient/mixin/ItemBlockRenderTypesMixin.java @@ -19,7 +19,7 @@ import net.wurstclient.WurstClient; @Mixin(ItemBlockRenderTypes.class) -public abstract class RenderLayersMixin +public abstract class ItemBlockRenderTypesMixin { /** * Puts all blocks on the translucent layer if Opacity X-Ray is enabled. diff --git a/src/main/java/net/wurstclient/mixin/HeldItemRendererMixin.java b/src/main/java/net/wurstclient/mixin/ItemInHandRendererMixin.java similarity index 96% rename from src/main/java/net/wurstclient/mixin/HeldItemRendererMixin.java rename to src/main/java/net/wurstclient/mixin/ItemInHandRendererMixin.java index 8587f384b0..1e17b3d2ed 100644 --- a/src/main/java/net/wurstclient/mixin/HeldItemRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/ItemInHandRendererMixin.java @@ -23,7 +23,7 @@ import net.wurstclient.WurstClient; @Mixin(ItemInHandRenderer.class) -public abstract class HeldItemRendererMixin +public abstract class ItemInHandRendererMixin { /** * This mixin is injected into the `BLOCK` case of the `item.getUseAction()` diff --git a/src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java b/src/main/java/net/wurstclient/mixin/JoinMultiplayerScreenMixin.java similarity index 93% rename from src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java rename to src/main/java/net/wurstclient/mixin/JoinMultiplayerScreenMixin.java index 6af3aa397f..3aa6635636 100644 --- a/src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/JoinMultiplayerScreenMixin.java @@ -27,11 +27,11 @@ import net.wurstclient.util.LastServerRememberer; @Mixin(JoinMultiplayerScreen.class) -public class MultiplayerScreenMixin extends Screen +public class JoinMultiplayerScreenMixin extends Screen { private Button lastServerButton; - private MultiplayerScreenMixin(WurstClient wurst, Component title) + private JoinMultiplayerScreenMixin(WurstClient wurst, Component title) { super(title); } diff --git a/src/main/java/net/wurstclient/mixin/ControlsListWidgetMixin.java b/src/main/java/net/wurstclient/mixin/KeyBindsListMixin.java similarity index 90% rename from src/main/java/net/wurstclient/mixin/ControlsListWidgetMixin.java rename to src/main/java/net/wurstclient/mixin/KeyBindsListMixin.java index f3a85f97b0..b6256f4e37 100644 --- a/src/main/java/net/wurstclient/mixin/ControlsListWidgetMixin.java +++ b/src/main/java/net/wurstclient/mixin/KeyBindsListMixin.java @@ -22,11 +22,11 @@ import net.wurstclient.WurstClient; @Mixin(KeyBindsList.class) -public abstract class ControlsListWidgetMixin +public abstract class KeyBindsListMixin extends ContainerObjectSelectionList { - public ControlsListWidgetMixin(WurstClient wurst, Minecraft client, - int width, int height, int y, int itemHeight) + public KeyBindsListMixin(WurstClient wurst, Minecraft client, int width, + int height, int y, int itemHeight) { super(client, width, height, y, itemHeight); } diff --git a/src/main/java/net/wurstclient/mixin/KeyBindingMixin.java b/src/main/java/net/wurstclient/mixin/KeyMappingMixin.java similarity index 86% rename from src/main/java/net/wurstclient/mixin/KeyBindingMixin.java rename to src/main/java/net/wurstclient/mixin/KeyMappingMixin.java index fbb62110fc..63d3af41b9 100644 --- a/src/main/java/net/wurstclient/mixin/KeyBindingMixin.java +++ b/src/main/java/net/wurstclient/mixin/KeyMappingMixin.java @@ -20,17 +20,17 @@ import net.minecraft.client.input.KeyEvent; import net.minecraft.client.input.MouseButtonInfo; import net.wurstclient.WurstClient; -import net.wurstclient.mixinterface.IKeyBinding; +import net.wurstclient.mixinterface.IKeyMapping; @Mixin(KeyMapping.class) -public abstract class KeyBindingMixin implements IKeyBinding +public abstract class KeyMappingMixin implements IKeyMapping { @Shadow private InputConstants.Key key; @Override @Unique - @Deprecated // use IKeyBinding.resetPressedState() instead + @Deprecated // use IKeyMapping.resetPressedState() instead public void wurst_resetPressedState() { Window window = WurstClient.MC.getWindow(); @@ -44,7 +44,7 @@ public void wurst_resetPressedState() @Override @Unique - @Deprecated // use IKeyBinding.simulatePress() instead + @Deprecated // use IKeyMapping.simulatePress() instead public void wurst_simulatePress(boolean pressed) { Minecraft mc = WurstClient.MC; diff --git a/src/main/java/net/wurstclient/mixin/KeyboardMixin.java b/src/main/java/net/wurstclient/mixin/KeyboardHandlerMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/KeyboardMixin.java rename to src/main/java/net/wurstclient/mixin/KeyboardHandlerMixin.java index 4735697576..1f1ae53baf 100644 --- a/src/main/java/net/wurstclient/mixin/KeyboardMixin.java +++ b/src/main/java/net/wurstclient/mixin/KeyboardHandlerMixin.java @@ -18,7 +18,7 @@ import net.wurstclient.events.KeyPressListener.KeyPressEvent; @Mixin(KeyboardHandler.class) -public class KeyboardMixin +public class KeyboardHandlerMixin { @Inject(at = @At("HEAD"), method = "keyPress(JILnet/minecraft/client/input/KeyEvent;)V") diff --git a/src/main/java/net/wurstclient/mixin/WorldMixin.java b/src/main/java/net/wurstclient/mixin/LevelMixin.java similarity index 93% rename from src/main/java/net/wurstclient/mixin/WorldMixin.java rename to src/main/java/net/wurstclient/mixin/LevelMixin.java index 74b4bcce83..95d8de0958 100644 --- a/src/main/java/net/wurstclient/mixin/WorldMixin.java +++ b/src/main/java/net/wurstclient/mixin/LevelMixin.java @@ -18,7 +18,7 @@ import net.wurstclient.hacks.NoWeatherHack; @Mixin(Level.class) -public abstract class WorldMixin implements LevelAccessor, AutoCloseable +public abstract class LevelMixin implements LevelAccessor, AutoCloseable { @Inject(at = @At("HEAD"), method = "getRainLevel(F)F", cancellable = true) private void onGetRainGradient(float delta, diff --git a/src/main/java/net/wurstclient/mixin/WorldRendererMixin.java b/src/main/java/net/wurstclient/mixin/LevelRendererMixin.java similarity index 96% rename from src/main/java/net/wurstclient/mixin/WorldRendererMixin.java rename to src/main/java/net/wurstclient/mixin/LevelRendererMixin.java index 2d6cbb1fa5..ab2ce5c1e0 100644 --- a/src/main/java/net/wurstclient/mixin/WorldRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/LevelRendererMixin.java @@ -27,7 +27,7 @@ import net.wurstclient.events.RenderListener.RenderEvent; @Mixin(LevelRenderer.class) -public class WorldRendererMixin +public class LevelRendererMixin { @Inject(at = @At("HEAD"), method = "doesMobEffectBlockSky(Lnet/minecraft/client/Camera;)Z", diff --git a/src/main/java/net/wurstclient/mixin/FluidRendererMixin.java b/src/main/java/net/wurstclient/mixin/LiquidBlockRendererMixin.java similarity index 96% rename from src/main/java/net/wurstclient/mixin/FluidRendererMixin.java rename to src/main/java/net/wurstclient/mixin/LiquidBlockRendererMixin.java index 2c8e09e4c1..13d0de794b 100644 --- a/src/main/java/net/wurstclient/mixin/FluidRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/LiquidBlockRendererMixin.java @@ -29,7 +29,7 @@ import net.wurstclient.hacks.XRayHack; @Mixin(LiquidBlockRenderer.class) -public class FluidRendererMixin +public class LiquidBlockRendererMixin { @Unique private static final ThreadLocal currentOpacity = diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java b/src/main/java/net/wurstclient/mixin/LocalPlayerMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java rename to src/main/java/net/wurstclient/mixin/LocalPlayerMixin.java index 102ce998c2..8941c5a96b 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/net/wurstclient/mixin/LocalPlayerMixin.java @@ -43,11 +43,11 @@ import net.wurstclient.events.PreMotionListener.PreMotionEvent; import net.wurstclient.events.UpdateListener.UpdateEvent; import net.wurstclient.hack.HackList; -import net.wurstclient.mixinterface.IClientPlayerEntity; +import net.wurstclient.mixinterface.ILocalPlayer; @Mixin(LocalPlayer.class) -public class ClientPlayerEntityMixin extends AbstractClientPlayer - implements IClientPlayerEntity +public class LocalPlayerMixin extends AbstractClientPlayer + implements ILocalPlayer { @Shadow @Final @@ -55,7 +55,7 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayer private Screen tempCurrentScreen; - public ClientPlayerEntityMixin(WurstClient wurst, ClientLevel world, + public LocalPlayerMixin(WurstClient wurst, ClientLevel world, GameProfile profile) { super(world, profile); diff --git a/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java b/src/main/java/net/wurstclient/mixin/MinecraftMixin.java similarity index 90% rename from src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java rename to src/main/java/net/wurstclient/mixin/MinecraftMixin.java index 342a1a95e5..9024eb505f 100644 --- a/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java +++ b/src/main/java/net/wurstclient/mixin/MinecraftMixin.java @@ -39,14 +39,14 @@ import net.wurstclient.events.HandleInputListener.HandleInputEvent; import net.wurstclient.events.LeftClickListener.LeftClickEvent; import net.wurstclient.events.RightClickListener.RightClickEvent; -import net.wurstclient.mixinterface.IClientPlayerEntity; -import net.wurstclient.mixinterface.IClientPlayerInteractionManager; -import net.wurstclient.mixinterface.IMinecraftClient; +import net.wurstclient.mixinterface.ILocalPlayer; +import net.wurstclient.mixinterface.IMinecraft; +import net.wurstclient.mixinterface.IMultiPlayerGameMode; @Mixin(Minecraft.class) -public abstract class MinecraftClientMixin +public abstract class MinecraftMixin extends ReentrantBlockableEventLoop - implements WindowEventHandler, IMinecraftClient + implements WindowEventHandler, IMinecraft { @Shadow @Final @@ -62,7 +62,7 @@ public abstract class MinecraftClientMixin private User wurstSession; private ProfileKeyPairManager wurstProfileKeys; - private MinecraftClientMixin(WurstClient wurst, String name) + private MinecraftMixin(WurstClient wurst, String name) { super(name); } @@ -203,15 +203,15 @@ private void onIsOptionalTelemetryEnabledByApi( } @Override - public IClientPlayerEntity getPlayer() + public ILocalPlayer getPlayer() { - return (IClientPlayerEntity)player; + return (ILocalPlayer)player; } @Override - public IClientPlayerInteractionManager getInteractionManager() + public IMultiPlayerGameMode getInteractionManager() { - return (IClientPlayerInteractionManager)gameMode; + return (IMultiPlayerGameMode)gameMode; } @Override diff --git a/src/main/java/net/wurstclient/mixin/StatusEffectInstanceMixin.java b/src/main/java/net/wurstclient/mixin/MobEffectInstanceMixin.java similarity index 92% rename from src/main/java/net/wurstclient/mixin/StatusEffectInstanceMixin.java rename to src/main/java/net/wurstclient/mixin/MobEffectInstanceMixin.java index 803a0a7859..d26b2564a1 100644 --- a/src/main/java/net/wurstclient/mixin/StatusEffectInstanceMixin.java +++ b/src/main/java/net/wurstclient/mixin/MobEffectInstanceMixin.java @@ -16,7 +16,7 @@ import net.wurstclient.WurstClient; @Mixin(MobEffectInstance.class) -public abstract class StatusEffectInstanceMixin +public abstract class MobEffectInstanceMixin implements Comparable { @Inject(at = @At("HEAD"), diff --git a/src/main/java/net/wurstclient/mixin/MobEntityRendererMixin.java b/src/main/java/net/wurstclient/mixin/MobRendererMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/MobEntityRendererMixin.java rename to src/main/java/net/wurstclient/mixin/MobRendererMixin.java index 4aeb345837..bd7ab27629 100644 --- a/src/main/java/net/wurstclient/mixin/MobEntityRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/MobRendererMixin.java @@ -17,7 +17,7 @@ import net.wurstclient.WurstClient; @Mixin(MobRenderer.class) -public abstract class MobEntityRendererMixin +public abstract class MobRendererMixin { /** * Makes name-tagged mobs always show their name tags if configured in diff --git a/src/main/java/net/wurstclient/mixin/BlockModelRendererMixin.java b/src/main/java/net/wurstclient/mixin/ModelBlockRendererMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/BlockModelRendererMixin.java rename to src/main/java/net/wurstclient/mixin/ModelBlockRendererMixin.java index a59a333b61..d454ddf9b8 100644 --- a/src/main/java/net/wurstclient/mixin/BlockModelRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/ModelBlockRendererMixin.java @@ -27,7 +27,7 @@ import net.wurstclient.hacks.XRayHack; @Mixin(ModelBlockRenderer.class) -public abstract class BlockModelRendererMixin implements ItemLike +public abstract class ModelBlockRendererMixin implements ItemLike { private static ThreadLocal currentOpacity = ThreadLocal.withInitial(() -> 1F); diff --git a/src/main/java/net/wurstclient/mixin/MouseMixin.java b/src/main/java/net/wurstclient/mixin/MouseHandlerMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/MouseMixin.java rename to src/main/java/net/wurstclient/mixin/MouseHandlerMixin.java index 5b40327634..58accdf714 100644 --- a/src/main/java/net/wurstclient/mixin/MouseMixin.java +++ b/src/main/java/net/wurstclient/mixin/MouseHandlerMixin.java @@ -23,7 +23,7 @@ import net.wurstclient.events.MouseUpdateListener.MouseUpdateEvent; @Mixin(MouseHandler.class) -public class MouseMixin +public class MouseHandlerMixin { @Shadow private double accumulatedDX; diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayerInteractionManagerMixin.java b/src/main/java/net/wurstclient/mixin/MultiPlayerGameModeMixin.java similarity index 93% rename from src/main/java/net/wurstclient/mixin/ClientPlayerInteractionManagerMixin.java rename to src/main/java/net/wurstclient/mixin/MultiPlayerGameModeMixin.java index 114471bb49..3a29ce43d2 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/net/wurstclient/mixin/MultiPlayerGameModeMixin.java @@ -36,11 +36,10 @@ import net.wurstclient.events.BlockBreakingProgressListener.BlockBreakingProgressEvent; import net.wurstclient.events.PlayerAttacksEntityListener.PlayerAttacksEntityEvent; import net.wurstclient.events.StopUsingItemListener.StopUsingItemEvent; -import net.wurstclient.mixinterface.IClientPlayerInteractionManager; +import net.wurstclient.mixinterface.IMultiPlayerGameMode; @Mixin(MultiPlayerGameMode.class) -public abstract class ClientPlayerInteractionManagerMixin - implements IClientPlayerInteractionManager +public abstract class MultiPlayerGameModeMixin implements IMultiPlayerGameMode { @Shadow @Final diff --git a/src/main/java/net/wurstclient/mixin/SimpleOptionMixin.java b/src/main/java/net/wurstclient/mixin/OptionInstanceMixin.java similarity index 85% rename from src/main/java/net/wurstclient/mixin/SimpleOptionMixin.java rename to src/main/java/net/wurstclient/mixin/OptionInstanceMixin.java index 6e84b09e34..31b27b3528 100644 --- a/src/main/java/net/wurstclient/mixin/SimpleOptionMixin.java +++ b/src/main/java/net/wurstclient/mixin/OptionInstanceMixin.java @@ -16,10 +16,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; -import net.wurstclient.mixinterface.ISimpleOption; +import net.wurstclient.mixinterface.IOptionInstance; @Mixin(OptionInstance.class) -public class SimpleOptionMixin implements ISimpleOption +public class OptionInstanceMixin implements IOptionInstance { @Shadow T value; diff --git a/src/main/java/net/wurstclient/mixin/PackScreenMixin.java b/src/main/java/net/wurstclient/mixin/PackSelectionScreenMixin.java similarity index 87% rename from src/main/java/net/wurstclient/mixin/PackScreenMixin.java rename to src/main/java/net/wurstclient/mixin/PackSelectionScreenMixin.java index cce34fe620..0fc83a9033 100644 --- a/src/main/java/net/wurstclient/mixin/PackScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/PackSelectionScreenMixin.java @@ -18,9 +18,9 @@ import net.wurstclient.WurstClient; @Mixin(PackSelectionScreen.class) -public class PackScreenMixin extends Screen +public class PackSelectionScreenMixin extends Screen { - private PackScreenMixin(WurstClient wurst, Component title) + private PackSelectionScreenMixin(WurstClient wurst, Component title) { super(title); } diff --git a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java b/src/main/java/net/wurstclient/mixin/PauseScreenMixin.java similarity index 94% rename from src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java rename to src/main/java/net/wurstclient/mixin/PauseScreenMixin.java index b391fd24f2..64e8b7f4f5 100644 --- a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/PauseScreenMixin.java @@ -31,7 +31,7 @@ import net.wurstclient.options.WurstOptionsScreen; @Mixin(PauseScreen.class) -public abstract class GameMenuScreenMixin extends Screen +public abstract class PauseScreenMixin extends Screen { @Unique private static final ResourceLocation WURST_TEXTURE = @@ -40,7 +40,7 @@ public abstract class GameMenuScreenMixin extends Screen @Unique private Button wurstOptionsButton; - private GameMenuScreenMixin(WurstClient wurst, Component title) + private PauseScreenMixin(WurstClient wurst, Component title) { super(title); } diff --git a/src/main/java/net/wurstclient/mixin/InGameOverlayRendererMixin.java b/src/main/java/net/wurstclient/mixin/ScreenEffectRendererMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/InGameOverlayRendererMixin.java rename to src/main/java/net/wurstclient/mixin/ScreenEffectRendererMixin.java index 8aa6558114..3b8aa2e780 100644 --- a/src/main/java/net/wurstclient/mixin/InGameOverlayRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/ScreenEffectRendererMixin.java @@ -22,7 +22,7 @@ import net.wurstclient.WurstClient; @Mixin(ScreenEffectRenderer.class) -public class InGameOverlayRendererMixin +public class ScreenEffectRendererMixin { @ModifyConstant( method = "renderFire(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;)V", diff --git a/src/main/java/net/wurstclient/mixin/AllowedAddressResolverMixin.java b/src/main/java/net/wurstclient/mixin/ServerNameResolverMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/AllowedAddressResolverMixin.java rename to src/main/java/net/wurstclient/mixin/ServerNameResolverMixin.java index be7dc7d129..e4e2afa5ef 100644 --- a/src/main/java/net/wurstclient/mixin/AllowedAddressResolverMixin.java +++ b/src/main/java/net/wurstclient/mixin/ServerNameResolverMixin.java @@ -24,7 +24,7 @@ import net.wurstclient.WurstClient; @Mixin(ServerNameResolver.class) -public class AllowedAddressResolverMixin +public class ServerNameResolverMixin { @Shadow @Final diff --git a/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java b/src/main/java/net/wurstclient/mixin/SkinManagerMixin.java similarity index 95% rename from src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java rename to src/main/java/net/wurstclient/mixin/SkinManagerMixin.java index f514eccdee..50bc159759 100644 --- a/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java +++ b/src/main/java/net/wurstclient/mixin/SkinManagerMixin.java @@ -30,7 +30,7 @@ import net.wurstclient.util.json.WsonObject; @Mixin(SkinManager.class) -public abstract class PlayerSkinProviderMixin +public abstract class SkinManagerMixin { @Unique private static HashMap capes; diff --git a/src/main/java/net/wurstclient/mixin/LabelCommandRendererMixin.java b/src/main/java/net/wurstclient/mixin/StorageMixin.java similarity index 96% rename from src/main/java/net/wurstclient/mixin/LabelCommandRendererMixin.java rename to src/main/java/net/wurstclient/mixin/StorageMixin.java index 56495c17e1..7c1300f289 100644 --- a/src/main/java/net/wurstclient/mixin/LabelCommandRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/StorageMixin.java @@ -30,7 +30,7 @@ import net.wurstclient.hacks.NameTagsHack; @Mixin(NameTagFeatureRenderer.Storage.class) -public class LabelCommandRendererMixin +public class StorageMixin { @Shadow @Final diff --git a/src/main/java/net/wurstclient/mixin/TextVisitFactoryMixin.java b/src/main/java/net/wurstclient/mixin/StringDecomposerMixin.java similarity index 93% rename from src/main/java/net/wurstclient/mixin/TextVisitFactoryMixin.java rename to src/main/java/net/wurstclient/mixin/StringDecomposerMixin.java index c6ce8e1012..5a13528f72 100644 --- a/src/main/java/net/wurstclient/mixin/TextVisitFactoryMixin.java +++ b/src/main/java/net/wurstclient/mixin/StringDecomposerMixin.java @@ -15,7 +15,7 @@ import net.wurstclient.WurstClient; @Mixin(StringDecomposer.class) -public abstract class TextVisitFactoryMixin +public abstract class StringDecomposerMixin { @ModifyArg(at = @At(value = "INVOKE", target = "Lnet/minecraft/util/StringDecomposer;iterateFormatted(Ljava/lang/String;ILnet/minecraft/network/chat/Style;Lnet/minecraft/network/chat/Style;Lnet/minecraft/util/FormattedCharSink;)Z", diff --git a/src/main/java/net/wurstclient/mixin/RenderTickCounterDynamicMixin.java b/src/main/java/net/wurstclient/mixin/TimerMixin.java similarity index 92% rename from src/main/java/net/wurstclient/mixin/RenderTickCounterDynamicMixin.java rename to src/main/java/net/wurstclient/mixin/TimerMixin.java index 3e9a378aaf..a59d50a426 100644 --- a/src/main/java/net/wurstclient/mixin/RenderTickCounterDynamicMixin.java +++ b/src/main/java/net/wurstclient/mixin/TimerMixin.java @@ -18,7 +18,7 @@ import net.wurstclient.WurstClient; @Mixin(DeltaTracker.Timer.class) -public abstract class RenderTickCounterDynamicMixin +public abstract class TimerMixin { @Shadow public float deltaTicks; diff --git a/src/main/java/net/wurstclient/mixin/ChunkOcclusionGraphBuilderMixin.java b/src/main/java/net/wurstclient/mixin/VisGraphMixin.java similarity index 93% rename from src/main/java/net/wurstclient/mixin/ChunkOcclusionGraphBuilderMixin.java rename to src/main/java/net/wurstclient/mixin/VisGraphMixin.java index 9f60d70e39..8d34fee3a6 100644 --- a/src/main/java/net/wurstclient/mixin/ChunkOcclusionGraphBuilderMixin.java +++ b/src/main/java/net/wurstclient/mixin/VisGraphMixin.java @@ -18,7 +18,7 @@ import net.wurstclient.events.SetOpaqueCubeListener.SetOpaqueCubeEvent; @Mixin(VisGraph.class) -public class ChunkOcclusionGraphBuilderMixin +public class VisGraphMixin { @Inject(at = @At("HEAD"), method = "setOpaque(Lnet/minecraft/core/BlockPos;)V", diff --git a/src/main/java/net/wurstclient/mixinterface/IKeyBinding.java b/src/main/java/net/wurstclient/mixinterface/IKeyMapping.java similarity index 85% rename from src/main/java/net/wurstclient/mixinterface/IKeyBinding.java rename to src/main/java/net/wurstclient/mixinterface/IKeyMapping.java index c58c671fe1..152fb1ce4a 100644 --- a/src/main/java/net/wurstclient/mixinterface/IKeyBinding.java +++ b/src/main/java/net/wurstclient/mixinterface/IKeyMapping.java @@ -9,7 +9,7 @@ import net.minecraft.client.KeyMapping; -public interface IKeyBinding +public interface IKeyMapping { /** * Resets the pressed state to whether or not the user is actually pressing @@ -41,12 +41,12 @@ public default KeyMapping asVanilla() } /** - * Returns the given KeyBinding object as an IKeyBinding, allowing you to + * Returns the given KeyMapping object as an IKeyMapping, allowing you to * access the resetPressedState() method. */ - public static IKeyBinding get(KeyMapping kb) + public static IKeyMapping get(KeyMapping kb) { - return (IKeyBinding)kb; + return (IKeyMapping)kb; } /** diff --git a/src/main/java/net/wurstclient/mixinterface/IClientPlayerEntity.java b/src/main/java/net/wurstclient/mixinterface/ILocalPlayer.java similarity index 88% rename from src/main/java/net/wurstclient/mixinterface/IClientPlayerEntity.java rename to src/main/java/net/wurstclient/mixinterface/ILocalPlayer.java index 85dab8985c..c8fbb53b11 100644 --- a/src/main/java/net/wurstclient/mixinterface/IClientPlayerEntity.java +++ b/src/main/java/net/wurstclient/mixinterface/ILocalPlayer.java @@ -7,7 +7,7 @@ */ package net.wurstclient.mixinterface; -public interface IClientPlayerEntity +public interface ILocalPlayer { public boolean isTouchingWaterBypass(); } diff --git a/src/main/java/net/wurstclient/mixinterface/IMinecraftClient.java b/src/main/java/net/wurstclient/mixinterface/IMinecraft.java similarity index 73% rename from src/main/java/net/wurstclient/mixinterface/IMinecraftClient.java rename to src/main/java/net/wurstclient/mixinterface/IMinecraft.java index 339641d006..ece58578bd 100644 --- a/src/main/java/net/wurstclient/mixinterface/IMinecraftClient.java +++ b/src/main/java/net/wurstclient/mixinterface/IMinecraft.java @@ -9,11 +9,11 @@ import net.minecraft.client.User; -public interface IMinecraftClient +public interface IMinecraft { - public IClientPlayerInteractionManager getInteractionManager(); + public IMultiPlayerGameMode getInteractionManager(); - public IClientPlayerEntity getPlayer(); + public ILocalPlayer getPlayer(); public User getWurstSession(); diff --git a/src/main/java/net/wurstclient/mixinterface/IClientPlayerInteractionManager.java b/src/main/java/net/wurstclient/mixinterface/IMultiPlayerGameMode.java similarity index 92% rename from src/main/java/net/wurstclient/mixinterface/IClientPlayerInteractionManager.java rename to src/main/java/net/wurstclient/mixinterface/IMultiPlayerGameMode.java index 68758492b5..b106ee642d 100644 --- a/src/main/java/net/wurstclient/mixinterface/IClientPlayerInteractionManager.java +++ b/src/main/java/net/wurstclient/mixinterface/IMultiPlayerGameMode.java @@ -14,7 +14,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -public interface IClientPlayerInteractionManager +public interface IMultiPlayerGameMode { public void windowClick_PICKUP(int slot); diff --git a/src/main/java/net/wurstclient/mixinterface/ISimpleOption.java b/src/main/java/net/wurstclient/mixinterface/IOptionInstance.java similarity index 65% rename from src/main/java/net/wurstclient/mixinterface/ISimpleOption.java rename to src/main/java/net/wurstclient/mixinterface/IOptionInstance.java index c413677e9d..346bbcb9dd 100644 --- a/src/main/java/net/wurstclient/mixinterface/ISimpleOption.java +++ b/src/main/java/net/wurstclient/mixinterface/IOptionInstance.java @@ -9,7 +9,7 @@ import net.minecraft.client.OptionInstance; -public interface ISimpleOption +public interface IOptionInstance { /** * Forces the value of the option to the specified value, even if it's @@ -18,12 +18,12 @@ public interface ISimpleOption public void forceSetValue(T newValue); /** - * Returns the given SimpleOption object as an ISimpleOption, allowing you - * to access the forceSetValue() method. + * Returns the given OptionInstance object as an IOptionInstance, allowing + * you to access the forceSetValue() method. */ @SuppressWarnings("unchecked") - public static ISimpleOption get(OptionInstance option) + public static IOptionInstance get(OptionInstance option) { - return (ISimpleOption)(Object)option; + return (IOptionInstance)(Object)option; } } diff --git a/src/main/java/net/wurstclient/other_features/NoChatReportsOtf.java b/src/main/java/net/wurstclient/other_features/NoChatReportsOtf.java index 9126277953..1c549e6cba 100644 --- a/src/main/java/net/wurstclient/other_features/NoChatReportsOtf.java +++ b/src/main/java/net/wurstclient/other_features/NoChatReportsOtf.java @@ -159,6 +159,6 @@ public Category getCategory() return Category.CHAT; } - // See ChatHudMixin, ClientPlayNetworkHandlerMixin.onOnServerMetadata(), - // MinecraftClientMixin.onGetProfileKeys() + // See ChatComponentMixin, ClientPacketListenerMixin.onHandleLogin(), + // MinecraftMixin.onGetProfileKeys() } diff --git a/src/main/java/net/wurstclient/util/BlockPlacer.java b/src/main/java/net/wurstclient/util/BlockPlacer.java index 9ac597b054..b22384b117 100644 --- a/src/main/java/net/wurstclient/util/BlockPlacer.java +++ b/src/main/java/net/wurstclient/util/BlockPlacer.java @@ -17,7 +17,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; import net.wurstclient.WurstClient; -import net.wurstclient.mixinterface.IMinecraftClient; +import net.wurstclient.mixinterface.IMinecraft; import net.wurstclient.util.BlockBreaker.BlockBreakingParams; public enum BlockPlacer @@ -26,7 +26,7 @@ public enum BlockPlacer private static final WurstClient WURST = WurstClient.INSTANCE; private static final Minecraft MC = WurstClient.MC; - private static final IMinecraftClient IMC = WurstClient.IMC; + private static final IMinecraft IMC = WurstClient.IMC; public static boolean placeOneBlock(BlockPos pos) { diff --git a/src/main/java/net/wurstclient/util/InventoryUtils.java b/src/main/java/net/wurstclient/util/InventoryUtils.java index 6cef7f9052..a276477504 100644 --- a/src/main/java/net/wurstclient/util/InventoryUtils.java +++ b/src/main/java/net/wurstclient/util/InventoryUtils.java @@ -16,15 +16,15 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.wurstclient.WurstClient; -import net.wurstclient.mixinterface.IClientPlayerInteractionManager; -import net.wurstclient.mixinterface.IMinecraftClient; +import net.wurstclient.mixinterface.IMultiPlayerGameMode; +import net.wurstclient.mixinterface.IMinecraft; public enum InventoryUtils { ; private static final Minecraft MC = WurstClient.MC; - private static final IMinecraftClient IMC = WurstClient.IMC; + private static final IMinecraft IMC = WurstClient.IMC; public static int indexOf(Item item) { @@ -207,7 +207,7 @@ public static boolean selectItem(Predicate predicate, public static boolean selectItem(int slot) { Inventory inventory = MC.player.getInventory(); - IClientPlayerInteractionManager im = IMC.getInteractionManager(); + IMultiPlayerGameMode im = IMC.getInteractionManager(); // if the slot is negative, abort and return false if(slot < 0) diff --git a/src/main/java/net/wurstclient/util/OverlayRenderer.java b/src/main/java/net/wurstclient/util/OverlayRenderer.java index 280177619d..6d51490108 100644 --- a/src/main/java/net/wurstclient/util/OverlayRenderer.java +++ b/src/main/java/net/wurstclient/util/OverlayRenderer.java @@ -14,12 +14,12 @@ import net.minecraft.util.Mth; import net.minecraft.world.phys.AABB; import net.wurstclient.WurstClient; -import net.wurstclient.mixinterface.IMinecraftClient; +import net.wurstclient.mixinterface.IMinecraft; public final class OverlayRenderer { protected static final Minecraft MC = WurstClient.MC; - protected static final IMinecraftClient IMC = WurstClient.IMC; + protected static final IMinecraft IMC = WurstClient.IMC; private float progress; private float prevProgress; diff --git a/src/main/resources/wurst.mixins.json b/src/main/resources/wurst.mixins.json index 1ff95fc85f..91755633cd 100644 --- a/src/main/resources/wurst.mixins.json +++ b/src/main/resources/wurst.mixins.json @@ -4,72 +4,72 @@ "compatibilityLevel": "JAVA_21", "mixins": [], "client": [ - "AbstractBlockStateMixin", "AbstractSignEditScreenMixin", - "AllowedAddressResolverMixin", - "AtmosphericFogModifierMixin", + "AtmosphericFogEnvironmentMixin", "BlockEntityRenderDispatcherMixin", "BlockMixin", - "BlockModelRendererMixin", + "BlockStateBaseMixin", "CactusBlockMixin", "CameraMixin", - "ChatHudMixin", - "ChatInputSuggestorMixin", + "ChatComponentMixin", "ChatScreenMixin", - "ChunkOcclusionGraphBuilderMixin", - "ClientCommonNetworkHandlerMixin", - "ClientConnectionMixin", - "ClientPlayerEntityMixin", - "ClientPlayerInteractionManagerMixin", - "ClientPlayNetworkHandlerMixin", - "ClientWorldMixin", - "ControlsListWidgetMixin", - "CreativeInventoryScreenMixin", + "ClientCommonPacketListenerImplMixin", + "ClientLevelMixin", + "ClientPacketListenerMixin", + "ClientTelemetryManagerMixin", + "CommandSuggestionsMixin", + "ConnectionMixin", + "ContainerScreenMixin", + "CreativeModeInventoryScreenMixin", "DeathScreenMixin", - "DimensionOrBossFogModifierMixin", - "DirectConnectScreenMixin", + "DimensionOrBossFogEnvironmentMixin", + "DirectJoinServerScreenMixin", "DisconnectedScreenMixin", - "DownloaderMixin", + "DownloadQueueMixin", "EntityMixin", "EntityRendererMixin", - "FluidRendererMixin", "FogRendererMixin", - "GameMenuScreenMixin", "GameRendererMixin", - "GenericContainerScreenMixin", - "HeldItemRendererMixin", - "indigo.AbstractTerrainRenderContextMixin", - "indigo.BlockRenderInfoMixin", - "IngameHudMixin", - "InGameOverlayRendererMixin", - "KeyBindingMixin", - "KeyboardMixin", - "LabelCommandRendererMixin", + "GuiMixin", + "ItemBlockRenderTypesMixin", + "ItemInHandRendererMixin", + "JoinMultiplayerScreenMixin", + "KeyBindsListMixin", + "KeyboardHandlerMixin", + "KeyMappingMixin", "LanguageManagerMixin", + "LevelMixin", + "LevelRendererMixin", + "LiquidBlockRendererMixin", "LivingEntityMixin", "LivingEntityRendererMixin", - "MinecraftClientMixin", - "MobEntityRendererMixin", - "MouseMixin", - "MultiplayerScreenMixin", - "PackScreenMixin", - "PlayerSkinProviderMixin", + "LocalPlayerMixin", + "MinecraftMixin", + "MobEffectInstanceMixin", + "MobRendererMixin", + "ModelBlockRendererMixin", + "MouseHandlerMixin", + "MultiPlayerGameModeMixin", + "OptionInstanceMixin", + "PackSelectionScreenMixin", + "PauseScreenMixin", "PowderSnowBlockMixin", - "RenderLayersMixin", - "RenderTickCounterDynamicMixin", + "ScreenEffectRendererMixin", "ScreenMixin", + "ServerNameResolverMixin", "ShulkerBoxScreenMixin", - "SimpleOptionMixin", - "sodium.AbstractBlockRenderContextMixin", - "sodium.BlockRendererMixin", - "sodium.DefaultFluidRendererMixin", + "SkinManagerMixin", "StatsScreenMixin", - "StatusEffectInstanceMixin", - "TelemetryManagerMixin", - "TextVisitFactoryMixin", + "StorageMixin", + "StringDecomposerMixin", + "TimerMixin", "TitleScreenMixin", - "WorldMixin", - "WorldRendererMixin" + "VisGraphMixin", + "indigo.AbstractTerrainRenderContextMixin", + "indigo.BlockRenderInfoMixin", + "sodium.AbstractBlockRenderContextMixin", + "sodium.BlockRendererMixin", + "sodium.DefaultFluidRendererMixin" ], "injectors": { "defaultRequire": 1