Skip to content

Commit 0071a4a

Browse files
committed
chore: minor code cleanup
Signed-off-by: rooot <hey@rooot.gay>
1 parent 3479fbb commit 0071a4a

File tree

12 files changed

+11
-28
lines changed

12 files changed

+11
-28
lines changed

src/main/java/net/foxes4life/foxclient/MainClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import net.minecraft.client.option.KeyBinding;
1717
import org.lwjgl.glfw.GLFW;
1818

19-
2019
public class MainClient implements ClientModInitializer {
2120
private static final KeyBinding toggleInfoHud = new KeyBinding("key.foxclient.toggle-info-hud", GLFW.GLFW_KEY_F6, "category.foxclient.main");
2221
private static final KeyBinding clientConfig = new KeyBinding("key.foxclient.configKey", GLFW.GLFW_KEY_RIGHT_CONTROL, "category.foxclient.main");

src/main/java/net/foxes4life/foxclient/gui/ArmorHud.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
import net.minecraft.client.font.TextRenderer;
1111
import net.minecraft.client.gui.DrawContext;
1212
import net.minecraft.client.network.ClientPlayerEntity;
13-
import net.minecraft.client.render.item.ItemRenderer;
1413
import net.minecraft.entity.EquipmentSlot;
1514
import net.minecraft.item.ItemStack;
16-
import net.minecraft.registry.Registries;
17-
import net.minecraft.util.Identifier;
1815

1916
public class ArmorHud {
2017
private final MinecraftClient client;

src/main/java/net/foxes4life/foxclient/gui/InfoHud.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.foxes4life.foxclient.gui;
22

3-
import com.google.common.collect.Lists;
43
import net.foxes4life.foxclient.Main;
54
import net.foxes4life.foxclient.configuration.FoxClientSetting;
65
import net.foxes4life.foxclient.util.ClientUtils;
@@ -14,10 +13,7 @@
1413
import net.minecraft.util.Identifier;
1514
import net.minecraft.util.math.BlockPos;
1615

17-
import java.awt.*;
18-
import java.util.HashMap;
1916
import java.util.LinkedHashMap;
20-
import java.util.List;
2117
import java.util.Map;
2218

2319
public class InfoHud {

src/main/java/net/foxes4life/foxclient/mixin/CameraMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import net.minecraft.entity.player.PlayerEntity;
99
import org.spongepowered.asm.mixin.Mixin;
1010
import org.spongepowered.asm.mixin.Shadow;
11+
import org.spongepowered.asm.mixin.Unique;
1112
import org.spongepowered.asm.mixin.injection.At;
1213
import org.spongepowered.asm.mixin.injection.Inject;
1314
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -17,6 +18,7 @@ public abstract class CameraMixin {
1718
@Shadow
1819
protected abstract void setRotation(float yaw, float pitch);
1920

21+
@Unique
2022
private boolean startFreelook = true;
2123

2224
@Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/Camera;setRotation(FF)V", ordinal = 0, shift = At.Shift.AFTER))

src/main/java/net/foxes4life/foxclient/mixin/ClientPlayNetworkHandlerMixin.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import net.minecraft.network.ClientConnection;
1010
import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
1111
import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
12-
import net.minecraft.text.Text;
13-
import org.spongepowered.asm.mixin.Final;
1412
import org.spongepowered.asm.mixin.Mixin;
15-
import org.spongepowered.asm.mixin.Shadow;
1613
import org.spongepowered.asm.mixin.injection.At;
1714
import org.spongepowered.asm.mixin.injection.Inject;
1815
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

src/main/java/net/foxes4life/foxclient/mixin/EntityMixin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
import net.minecraft.entity.Entity;
77
import net.minecraft.util.math.MathHelper;
88
import org.spongepowered.asm.mixin.Mixin;
9+
import org.spongepowered.asm.mixin.Unique;
910
import org.spongepowered.asm.mixin.injection.At;
1011
import org.spongepowered.asm.mixin.injection.Inject;
1112
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1213

1314
@Mixin(Entity.class)
1415
public class EntityMixin implements Freelook {
15-
private float cameraY;
16-
private float cameraX;
16+
@Unique private float cameraY;
17+
@Unique private float cameraX;
1718

1819
@Inject(method = "changeLookDirection", at = @At("HEAD"), cancellable = true)
1920
public void changeLookDirection(double cursorDeltaX, double cursorDeltaY, CallbackInfo ci) {

src/main/java/net/foxes4life/foxclient/mixin/InGameHUDMixin.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.spongepowered.asm.mixin.Final;
1515
import org.spongepowered.asm.mixin.Mixin;
1616
import org.spongepowered.asm.mixin.Shadow;
17+
import org.spongepowered.asm.mixin.Unique;
1718
import org.spongepowered.asm.mixin.injection.At;
1819
import org.spongepowered.asm.mixin.injection.Inject;
1920
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -26,9 +27,9 @@ public abstract class InGameHUDMixin {
2627

2728
@Shadow protected abstract void renderHotbarItem(DrawContext context, int x, int y, RenderTickCounter tickCounter, PlayerEntity player, ItemStack stack, int seed);
2829

29-
private static InfoHud infoHud = null;
30-
private static ArmorHud armorHud = null;
31-
private static BlockHud blockHud = null;
30+
@Unique private static InfoHud infoHud = null;
31+
@Unique private static ArmorHud armorHud = null;
32+
@Unique private static BlockHud blockHud = null;
3233

3334
@Inject(at = @At("HEAD"), method = "render")
3435
public void render(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {

src/main/java/net/foxes4life/foxclient/screen/settings/ui/CategoryButton.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import net.minecraft.client.MinecraftClient;
55
import net.minecraft.client.font.TextRenderer;
66
import net.minecraft.client.gui.DrawContext;
7-
import net.minecraft.client.util.math.MatrixStack;
87
import net.minecraft.text.Text;
98
import net.minecraft.util.math.MathHelper;
109

@@ -23,11 +22,6 @@ public void onPress() {
2322
super.onPress();
2423
}
2524

26-
/*@Override
27-
public void appendNarrations(NarrationMessageBuilder builder) {
28-
29-
}*/
30-
3125
@Override
3226
public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
3327
MinecraftClient minecraftClient = MinecraftClient.getInstance();

src/main/java/net/foxes4life/foxclient/ui/Progressbar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.minecraft.client.gui.DrawContext;
44

5-
import java.awt.*;
5+
import java.awt.Color;
66

77
public class Progressbar {
88
public int x;

src/main/java/net/foxes4life/foxclient/ui/button/FoxClientMiniButton.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
import net.minecraft.client.MinecraftClient;
55
import net.minecraft.client.gui.DrawContext;
66
import net.minecraft.client.gui.screen.ButtonTextures;
7-
import net.minecraft.client.gui.screen.Screen;
87
import net.minecraft.client.gui.widget.TexturedButtonWidget;
98
import net.minecraft.text.Text;
10-
import net.minecraft.util.Identifier;
119

1210
public class FoxClientMiniButton extends TexturedButtonWidget {
1311
private final Text tooltip;

0 commit comments

Comments
 (0)