RepoMirrors/kami-blue
1
0
Fork 1
mirror of https://github.com/kami-blue/client synced 2025-02-03 22:11:49 +00:00
Code Issues Releases Wiki Activity

[cleanup] Minecraft#displayGuiScreen Mixin (#1619)

Browse Source
This commit is contained in:
DifferentPerson 2020-11-24 07:06:15 -08:00 committed by GitHub
parent bce71c3bf9
commit 21a75f65fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/java/me/zeroeightsix/kami/mixin/client/MixinMinecraft.java
View File

@ -5,7 +5,6 @@ import me.zeroeightsix.kami.event.events.GuiScreenEvent;
import me.zeroeightsix.kami.module.modules.combat.CrystalAura; import me.zeroeightsix.kami.module.modules.combat.CrystalAura;
import me.zeroeightsix.kami.module.modules.misc.DiscordRPC; import me.zeroeightsix.kami.module.modules.misc.DiscordRPC;
import me.zeroeightsix.kami.util.ConfigUtils; import me.zeroeightsix.kami.util.ConfigUtils;
import me.zeroeightsix.kami.util.Wrapper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.audio.SoundHandler;
import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityPlayerSP;
@ -14,17 +13,15 @@ import net.minecraft.client.multiplayer.PlayerControllerMP;
import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/** /**
@ -59,58 +56,13 @@ public class MixinMinecraft {
} }
} }
@Inject(method = "displayGuiScreen", at = @At("HEAD"), cancellable = true) @ModifyVariable(method = "displayGuiScreen", at = @At("HEAD"), argsOnly = true)
public void displayGuiScreen(GuiScreen guiScreenIn, CallbackInfo info) { public GuiScreen editDisplayGuiScreen(GuiScreen guiScreenIn) {
GuiScreenEvent.Closed screenEvent = new GuiScreenEvent.Closed(Wrapper.getMinecraft().currentScreen); GuiScreenEvent.Closed screenEvent = new GuiScreenEvent.Closed(this.currentScreen);
KamiEventBus.INSTANCE.post(screenEvent); KamiEventBus.INSTANCE.post(screenEvent);
GuiScreenEvent.Displayed screenEvent1 = new GuiScreenEvent.Displayed(guiScreenIn); GuiScreenEvent.Displayed screenEvent1 = new GuiScreenEvent.Displayed(guiScreenIn);
KamiEventBus.INSTANCE.post(screenEvent1); KamiEventBus.INSTANCE.post(screenEvent1);
guiScreenIn = screenEvent1.getScreen(); return screenEvent1.getScreen();
if (guiScreenIn == null && this.world == null) {
guiScreenIn = new GuiMainMenu();
} else if (guiScreenIn == null && this.player.getHealth() <= 0.0F) {
guiScreenIn = new GuiGameOver(null);
}
GuiScreen old = this.currentScreen;
net.minecraftforge.client.event.GuiOpenEvent event = new net.minecraftforge.client.event.GuiOpenEvent(guiScreenIn);
if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) return;
guiScreenIn = event.getGui();
if (old != null && guiScreenIn != old) {
old.onGuiClosed();
}
if (guiScreenIn instanceof GuiMainMenu || guiScreenIn instanceof GuiMultiplayer) {
this.gameSettings.showDebugInfo = false;
this.ingameGUI.getChatGUI().clearChatMessages(true);
}
this.currentScreen = guiScreenIn;
if (guiScreenIn != null) {
Minecraft.getMinecraft().setIngameNotInFocus();
KeyBinding.unPressAllKeys();
while (Mouse.next()) {
}
while (Keyboard.next()) {
}
ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
int i = scaledresolution.getScaledWidth();
int j = scaledresolution.getScaledHeight();
guiScreenIn.setWorldAndResolution(Minecraft.getMinecraft(), i, j);
this.skipRenderWorld = false;
} else {
this.soundHandler.resumeSounds();
Minecraft.getMinecraft().setIngameFocus();
}
info.cancel();
} }
@Inject(method = "run", at = @At(value = "INVOKE", @Inject(method = "run", at = @At(value = "INVOKE",