Skip to content

Commit 46720e2

Browse files
ThePandaOliverThePandaOliver
committed
Remove unused classes and apply annotations for clarity
Deleted `AbstractWidgetAccessor` and `PriorityMap` due to redundancy. Added `@SuppressWarnings("unused")` annotations across various utility classes to indicate intentional unused elements. Minor comment updates were also made for better future readability.
1 parent b871891 commit 46720e2

File tree

12 files changed

+36
-223
lines changed

12 files changed

+36
-223
lines changed

‎common/src/main/java/me/pandamods/pandalib/config/PandaLibConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ public static <T extends ConfigData, E extends ConfigHolder<T>> E register(Class
4040
}
4141

4242
public static <T extends ConfigData> ClientConfigHolder<T> registerClient(Class<T> configClass) {
43-
return PandaLibConfig.<T, ClientConfigHolder<T>>register(configClass, ClientConfigHolder::new);
43+
return PandaLibConfig.register(configClass, ClientConfigHolder::new);
4444
}
4545

4646
public static <T extends ConfigData> CommonConfigHolder<T> registerCommon(Class<T> configClass) {
47-
return PandaLibConfig.<T, CommonConfigHolder<T>>register(configClass, CommonConfigHolder::new);
47+
return PandaLibConfig.register(configClass, CommonConfigHolder::new);
4848
}
4949

5050
public static Optional<ConfigHolder<? extends ConfigData>> getConfig(ResourceLocation resourceLocation) {
@@ -72,7 +72,7 @@ public static Map<Class<?>, ConfigHolder<?>> getConfigs(String modId) {
7272
*
7373
* @param modID the mod ID of the configuration
7474
* @return the configuration screen
75-
* @deprecated The config menu screen api is still in development, this is just here for quick support with future versions,
75+
* @deprecated The config menu api will be added in the future, this is just here for quick support with future versions,
7676
* this method is deprecated and returns null.
7777
*/
7878
@Deprecated
@@ -86,7 +86,7 @@ public static Screen getConfigScreen(String modID) {
8686
* @param parent the parent screen
8787
* @param modID the mod ID of the configuration
8888
* @return the configuration screen
89-
* @deprecated The config menu screen API is still in development, this is just here for quick support with future versions,
89+
* @deprecated The config menu api will be added in the future, this is just here for quick support with future versions,
9090
* this method is deprecated and returns null.
9191
*/
9292
@Deprecated
@@ -99,7 +99,7 @@ public static Screen getConfigScreen(Screen parent, String modID) {
9999
*
100100
* @param configClass the class of the config data
101101
* @return the configuration screen
102-
* @deprecated The config menu screen API is still in development, this is just here for quick support with future versions,
102+
* @deprecated The config menu api will be added in the future, this is just here for quick support with future versions,
103103
* this method is deprecated and returns null.
104104
*/
105105
@Deprecated
@@ -113,7 +113,7 @@ public static <T extends ConfigData> Screen getConfigScreen(Class<T> configClass
113113
* @param parent the parent screen
114114
* @param configClass the class of the config data
115115
* @return the configuration screen
116-
* @deprecated The config menu screen API is still in development, this is just here for quick support with future versions,
116+
* @deprecated The config menu api will be added in the future, this is just here for quick support with future versions,
117117
* this method is deprecated and returns null.
118118
*/
119119
@Deprecated

‎common/src/main/java/me/pandamods/pandalib/mixin/accessor/AbstractWidgetAccessor.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎common/src/main/java/me/pandamods/pandalib/networking/NetworkContext.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ public NetworkContext(Player player, Env envDirection) {
2424
this.envDirection = envDirection;
2525
}
2626

27+
/**
28+
* @return The Sender if this was sent to the server or the receiver if this was sent to a client
29+
*/
2730
public Player getPlayer() {
2831
return player;
2932
}

‎common/src/main/java/me/pandamods/pandalib/platform/Services.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.util.ServiceLoader;
2323

24+
@SuppressWarnings("unused")
2425
public class Services {
2526
private static final Logger LOGGER = LogUtils.getLogger();
2627

‎common/src/main/java/me/pandamods/pandalib/utils/AssimpUtils.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818

1919
import java.util.Objects;
2020

21+
@SuppressWarnings("unused")
2122
public class AssimpUtils {
23+
2224
// Conversion methods
23-
@SuppressWarnings("unused")
25+
2426
public static Matrix4f toMatrix4f(AIMatrix4x4 aiMatrix) {
2527
return new Matrix4f(
2628
aiMatrix.a1(), aiMatrix.b1(), aiMatrix.c1(), aiMatrix.d1(),
@@ -29,33 +31,29 @@ public static Matrix4f toMatrix4f(AIMatrix4x4 aiMatrix) {
2931
aiMatrix.a4(), aiMatrix.b4(), aiMatrix.c4(), aiMatrix.d4()
3032
);
3133
}
32-
33-
@SuppressWarnings("unused")
34+
3435
public static Matrix3f toMatrix3f(AIMatrix3x3 aiMatrix) {
3536
return new Matrix3f(
3637
aiMatrix.a1(), aiMatrix.b1(), aiMatrix.c1(),
3738
aiMatrix.a2(), aiMatrix.b2(), aiMatrix.c2(),
3839
aiMatrix.a3(), aiMatrix.b3(), aiMatrix.c3()
3940
);
4041
}
41-
42-
@SuppressWarnings("unused")
42+
4343
public static Vector3f toVector3f(AIVector3D vector) {
4444
return new Vector3f(vector.x(), vector.y(), vector.z());
4545
}
4646

47-
@SuppressWarnings("unused")
4847
public static Vector2f toVector2f(AIVector2D vector) {
4948
return new Vector2f(vector.x(), vector.y());
5049
}
51-
52-
@SuppressWarnings("unused")
50+
5351
public static Quaternionf toQuaternionf(AIQuaternion quaternion) {
5452
return new Quaternionf(quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w());
5553
}
5654

5755
// Equals methods
58-
@SuppressWarnings("unused")
56+
5957
public static boolean AINodeEqualsAINode(AINode node1, AINode node2) {
6058
boolean namesEqual = Objects.equals(node1.mName().dataString(), node2.mName().dataString());
6159
boolean parentsEqual = (node1.mParent() != null) == (node2.mParent() != null);
@@ -66,8 +64,7 @@ public static boolean AINodeEqualsAINode(AINode node1, AINode node2) {
6664
boolean meshesEqual = node1.mNumMeshes() == node2.mNumMeshes();
6765
return namesEqual && parentsEqual && childrenEqual && meshesEqual;
6866
}
69-
70-
@SuppressWarnings("unused")
67+
7168
public static boolean AINodeEqualsNode(AINode aiNode, Node node) {
7269
boolean namesEqual = Objects.equals(aiNode.mName().dataString(), node.getName());
7370
boolean parentsEqual = (aiNode.mParent() != null) == (node.getParent() != null);

‎common/src/main/java/me/pandamods/pandalib/utils/BlockUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import net.minecraft.world.level.block.state.properties.AttachFace;
2121
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
2222

23+
@SuppressWarnings("unused")
2324
public class BlockUtils {
2425
public static void translateBlock(BlockState blockState, PoseStack poseStack) {
2526
poseStack.translate(0.5f, 0.5f, 0.5f);

‎common/src/main/java/me/pandamods/pandalib/utils/ClassUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.lang.reflect.Constructor;
1616
import java.lang.reflect.Field;
1717

18+
@SuppressWarnings("unused")
1819
public class ClassUtils {
1920
public static <T> T constructUnsafely(Class<T> cls) {
2021
try {

‎common/src/main/java/me/pandamods/pandalib/utils/MathUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.joml.Quaternionf;
1818
import org.joml.Vector3f;
1919

20+
@SuppressWarnings("unused")
2021
public class MathUtils {
2122
public static Matrix4f lerpMatrix(Matrix4f matrix, Matrix4f other, float alpha) {
2223
return lerpMatrix(matrix, other, alpha, new Matrix4f());

‎common/src/main/java/me/pandamods/pandalib/utils/PLSpriteCoordinateExpander.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1919

2020
@Environment(value=EnvType.CLIENT)
21+
@SuppressWarnings("unused")
2122
public class PLSpriteCoordinateExpander implements VertexConsumer {
2223
private final VertexConsumer delegate;
2324
private final TextureAtlasSprite sprite;

‎common/src/main/java/me/pandamods/pandalib/utils/PrintUtils.java

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,88 +17,79 @@
1717

1818
import java.text.NumberFormat;
1919

20+
@SuppressWarnings("unused")
2021
public class PrintUtils {
22+
2123
// Vector2
22-
@SuppressWarnings("unused")
24+
2325
public static String getVector2String(Vector2fc vector) {
2426
return getVector2String(vector.x(), vector.y());
2527
}
26-
27-
@SuppressWarnings("unused")
28+
2829
public static String getVector2String(Vector2dc vector) {
2930
return getVector2String(vector.x(), vector.y());
3031
}
31-
32-
@SuppressWarnings("unused")
32+
3333
public static String getVector2String(Vector2ic vector) {
3434
return getVector2String(vector.x(), vector.y());
3535
}
36-
37-
@SuppressWarnings("unused")
36+
3837
public static String getVector2String(double x, double y) {
3938
return "Vector2[" + x + ", " + y + "]";
4039
}
4140

4241
// Vector3
43-
@SuppressWarnings("unused")
42+
4443
public static String getVector3String(Vector3fc vector) {
4544
return getVector3String(vector.x(), vector.y(), vector.z());
4645
}
47-
48-
@SuppressWarnings("unused")
46+
4947
public static String getVector3String(Vector3dc vector) {
5048
return getVector3String(vector.x(), vector.y(), vector.z());
5149
}
5250

53-
@SuppressWarnings("unused")
5451
public static String getVector3String(Vector3ic vector) {
5552
return getVector3String(vector.x(), vector.y(), vector.z());
5653
}
5754

58-
@SuppressWarnings("unused")
5955
public static String getVector3String(double x, double y, double z) {
6056
return "Vector3[" + x + ", " + y + ", " + z + "]";
6157
}
6258

6359
// Vector4
64-
@SuppressWarnings("unused")
60+
6561
public static String getVector4String(Vector4fc vector) {
6662
return getVector4String(vector.x(), vector.y(), vector.z(), vector.w());
6763
}
6864

69-
@SuppressWarnings("unused")
7065
public static String getVector4String(Vector4dc vector) {
7166
return getVector4String(vector.x(), vector.y(), vector.z(), vector.w());
7267
}
7368

74-
@SuppressWarnings("unused")
7569
public static String getVector4String(Vector4ic vector) {
7670
return getVector4String(vector.x(), vector.y(), vector.z(), vector.w());
7771
}
7872

79-
@SuppressWarnings("unused")
8073
public static String getVector4String(double x, double y, double z, double w) {
8174
return "Vector4[" + x + ", " + y + ", " + z + ", " + w + "]";
8275
}
8376

8477
// Quaternion
85-
@SuppressWarnings("unused")
78+
8679
public static String getQuaternionString(Quaternionfc quaternion) {
8780
return getQuaternionString(quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w());
8881
}
8982

90-
@SuppressWarnings("unused")
9183
public static String getQuaternionString(Quaterniondc quaternion) {
9284
return getQuaternionString(quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w());
9385
}
9486

95-
@SuppressWarnings("unused")
9687
private static String getQuaternionString(double x, double y, double z, double w) {
9788
return "Quaternion[" + x + ", " + y + ", " + z + ", " + w + "]";
9889
}
9990

10091
// Matrix3
101-
@SuppressWarnings("unused")
92+
10293
public static String getMatrix3String(Matrix3fc matrix) {
10394
return "Matrix3[" +
10495
"\n| Rotation (Euler): " + getVector3String(matrix.getEulerAnglesXYZ(new Vector3f())) +
@@ -107,7 +98,6 @@ public static String getMatrix3String(Matrix3fc matrix) {
10798
"\n]";
10899
}
109100

110-
@SuppressWarnings("unused")
111101
public static String getMatrix3String(Matrix3dc matrix) {
112102
return "Matrix3[" +
113103
"\n| Rotation (Euler): " + getVector3String(matrix.getEulerAnglesXYZ(new Vector3d())) +
@@ -117,7 +107,7 @@ public static String getMatrix3String(Matrix3dc matrix) {
117107
}
118108

119109
// Matrix4
120-
@SuppressWarnings("unused")
110+
121111
public static String getMatrix4String(Matrix4fc matrix) {
122112
return "Matrix4[" +
123113
"\n| Translation: " + getVector3String(matrix.getTranslation(new Vector3f())) +
@@ -126,8 +116,7 @@ public static String getMatrix4String(Matrix4fc matrix) {
126116
"\n\\ Scale: " + getVector3String(matrix.getScale(new Vector3f())) +
127117
"\n]";
128118
}
129-
130-
@SuppressWarnings("unused")
119+
131120
public static String getMatrix4String(Matrix4dc matrix) {
132121
return "Matrix4[" +
133122
"\n| Translation: " + getVector3String(matrix.getTranslation(new Vector3d())) +

0 commit comments

Comments
 (0)