Skip to content

Commit 78e3377

Browse files
spotless
1 parent 4b73e2b commit 78e3377

File tree

7 files changed

+23
-12
lines changed

7 files changed

+23
-12
lines changed

src/main/java/com/gregtechceu/gtceu/api/mui/animation/AnimatorManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.List;
1111

1212
public class AnimatorManager {
13+
1314
public static final AnimatorManager INSTANCE = new AnimatorManager();
1415

1516
private static final List<IAnimator> animators = new ArrayList<>(16);
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.gregtechceu.gtceu.client;
22

3-
import lombok.AllArgsConstructor;
4-
import lombok.Getter;
53
import net.minecraftforge.eventbus.api.Cancelable;
64
import net.minecraftforge.eventbus.api.Event;
75

6+
import lombok.AllArgsConstructor;
7+
import lombok.Getter;
8+
89
/**
910
* Fired when the corresponding GLFW event is triggered, before Minecraft's handling.
1011
* Cancelling this event will also cancel further handling by Minecraft, like firing the
@@ -14,6 +15,7 @@
1415
@Getter
1516
@Cancelable
1617
public class CharTypedEvent extends Event {
18+
1719
private final char codepoint;
1820
private final int modifiers;
1921
}

src/main/java/com/gregtechceu/gtceu/client/EarlyKeyPressEvent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.gregtechceu.gtceu.client;
22

3-
import lombok.AllArgsConstructor;
4-
import lombok.Getter;
53
import net.minecraftforge.client.event.InputEvent.Key;
64
import net.minecraftforge.client.event.ScreenEvent.KeyPressed;
75
import net.minecraftforge.eventbus.api.Cancelable;
86
import net.minecraftforge.eventbus.api.Event;
97

8+
import lombok.AllArgsConstructor;
9+
import lombok.Getter;
10+
1011
/**
1112
* Fired when the corresponding GLFW event is triggered, before Minecraft's handling.
1213
* Cancelling this event will also cancel further handling by Minecraft, like detecting
@@ -17,6 +18,7 @@
1718
@Getter
1819
@Cancelable
1920
public class EarlyKeyPressEvent extends Event {
21+
2022
private final int key;
2123
private final int scanCode;
2224
private final int action;

src/main/java/com/gregtechceu/gtceu/client/mui/screen/ClientScreenHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ private static boolean doAction(@Nullable ModularScreen muiScreen, Predicate<Mod
314314
* This replicates vanilla behavior while also injecting custom behavior for consistency
315315
*/
316316
public static boolean handleKeyboardInput(@Nullable ModularScreen muiScreen, Screen mcScreen,
317-
boolean isPress, InputPhase inputPhase,
318-
int keyCode, int scanCode, int modifiers) {
317+
boolean isPress, InputPhase inputPhase,
318+
int keyCode, int scanCode, int modifiers) {
319319
if (isPress) {
320320
// pressing a key
321321
return inputPhase.isEarly() ? doAction(muiScreen, ms -> ms.keyPressed(keyCode, scanCode, modifiers)) :

src/main/java/com/gregtechceu/gtceu/client/mui/screen/ModularScreen.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.jetbrains.annotations.MustBeInvokedByOverriders;
4646
import org.jetbrains.annotations.NotNull;
4747
import org.jetbrains.annotations.Nullable;
48-
import org.lwjgl.opengl.GL11;
4948

5049
import java.util.*;
5150
import java.util.function.Consumer;

src/main/java/com/gregtechceu/gtceu/client/renderer/monitor/MonitorGuiRenderer.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.gregtechceu.gtceu.core.mixins.client.GuiGraphicsAccessor;
2121
import com.gregtechceu.gtceu.utils.GTUtil;
2222

23-
import com.mojang.blaze3d.platform.InputConstants;
2423
import net.minecraft.client.gui.GuiGraphics;
2524
import net.minecraft.client.gui.screens.Screen;
2625
import net.minecraft.client.renderer.MultiBufferSource;
@@ -33,6 +32,7 @@
3332
import net.minecraftforge.common.MinecraftForge;
3433
import net.minecraftforge.eventbus.api.SubscribeEvent;
3534

35+
import com.mojang.blaze3d.platform.InputConstants;
3636
import com.mojang.blaze3d.vertex.PoseStack;
3737
import com.mojang.datafixers.util.Pair;
3838
import org.joml.Vector2d;
@@ -89,21 +89,25 @@ public void openClientInWorldUI(InWorldMUIOpenEvent event) {
8989

9090
@SubscribeEvent
9191
public void keyPressedEvent(EarlyKeyPressEvent event) {
92-
if (mouseX < 0 || mouseX > width || mouseY < 0 || mouseY > height || MCHelper.getCurrentScreen() != null) return;
92+
if (mouseX < 0 || mouseX > width || mouseY < 0 || mouseY > height || MCHelper.getCurrentScreen() != null)
93+
return;
9394
screen.getContext().updateLatestKey(event.getKey(), event.getScanCode(), event.getModifiers());
94-
boolean early = ClientScreenHandler.handleKeyboardInput(screen, vanillaScreen, event.getAction() == InputConstants.PRESS,
95+
boolean early = ClientScreenHandler.handleKeyboardInput(screen, vanillaScreen,
96+
event.getAction() == InputConstants.PRESS,
9597
ClientScreenHandler.InputPhase.EARLY, event.getKey(), event.getScanCode(), event.getModifiers());
9698
if (early) event.setCanceled(true);
9799
else {
98-
boolean late = ClientScreenHandler.handleKeyboardInput(screen, vanillaScreen, event.getAction() == InputConstants.PRESS,
100+
boolean late = ClientScreenHandler.handleKeyboardInput(screen, vanillaScreen,
101+
event.getAction() == InputConstants.PRESS,
99102
ClientScreenHandler.InputPhase.LATE, event.getKey(), event.getScanCode(), event.getModifiers());
100103
if (late) event.setCanceled(true);
101104
}
102105
}
103106

104107
@SubscribeEvent
105108
public void charTyped(CharTypedEvent event) {
106-
if (mouseX < 0 || mouseX > width || mouseY < 0 || mouseY > height || MCHelper.getCurrentScreen() != null) return;
109+
if (mouseX < 0 || mouseX > width || mouseY < 0 || mouseY > height || MCHelper.getCurrentScreen() != null)
110+
return;
107111
screen.getContext().updateLatestTypedChar(event.getCodepoint(), event.getModifiers());
108112
if (screen.charTyped(event.getCodepoint(), event.getModifiers())) event.setCanceled(true);
109113
}

src/main/java/com/gregtechceu/gtceu/core/mixins/KeyboardHandlerMixin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import com.gregtechceu.gtceu.client.CharTypedEvent;
44
import com.gregtechceu.gtceu.client.EarlyKeyPressEvent;
5+
56
import net.minecraft.client.KeyboardHandler;
67
import net.minecraft.client.Minecraft;
78
import net.minecraftforge.common.MinecraftForge;
9+
810
import org.spongepowered.asm.mixin.Final;
911
import org.spongepowered.asm.mixin.Mixin;
1012
import org.spongepowered.asm.mixin.Shadow;
@@ -14,6 +16,7 @@
1416

1517
@Mixin(KeyboardHandler.class)
1618
public class KeyboardHandlerMixin {
19+
1720
@Shadow
1821
@Final
1922
private Minecraft minecraft;

0 commit comments

Comments
 (0)