diff --git a/common/src/main/java/me/pandamods/pandalib/config/PandaLibConfig.java b/common/src/main/java/me/pandamods/pandalib/config/PandaLibConfig.java index 84b77b5..4380340 100644 --- a/common/src/main/java/me/pandamods/pandalib/config/PandaLibConfig.java +++ b/common/src/main/java/me/pandamods/pandalib/config/PandaLibConfig.java @@ -40,11 +40,11 @@ public static > E register(Class } public static ClientConfigHolder registerClient(Class configClass) { - return PandaLibConfig.>register(configClass, ClientConfigHolder::new); + return PandaLibConfig.register(configClass, ClientConfigHolder::new); } public static CommonConfigHolder registerCommon(Class configClass) { - return PandaLibConfig.>register(configClass, CommonConfigHolder::new); + return PandaLibConfig.register(configClass, CommonConfigHolder::new); } public static Optional> getConfig(ResourceLocation resourceLocation) { @@ -72,7 +72,7 @@ public static Map, ConfigHolder> getConfigs(String modId) { * * @param modID the mod ID of the configuration * @return the configuration screen - * @deprecated The config menu screen api is still in development, this is just here for quick support with future versions, + * @deprecated The config menu api will be added in the future, this is just here for quick support with future versions, * this method is deprecated and returns null. */ @Deprecated @@ -86,7 +86,7 @@ public static Screen getConfigScreen(String modID) { * @param parent the parent screen * @param modID the mod ID of the configuration * @return the configuration screen - * @deprecated The config menu screen API is still in development, this is just here for quick support with future versions, + * @deprecated The config menu api will be added in the future, this is just here for quick support with future versions, * this method is deprecated and returns null. */ @Deprecated @@ -99,7 +99,7 @@ public static Screen getConfigScreen(Screen parent, String modID) { * * @param configClass the class of the config data * @return the configuration screen - * @deprecated The config menu screen API is still in development, this is just here for quick support with future versions, + * @deprecated The config menu api will be added in the future, this is just here for quick support with future versions, * this method is deprecated and returns null. */ @Deprecated @@ -113,7 +113,7 @@ public static Screen getConfigScreen(Class configClass * @param parent the parent screen * @param configClass the class of the config data * @return the configuration screen - * @deprecated The config menu screen API is still in development, this is just here for quick support with future versions, + * @deprecated The config menu api will be added in the future, this is just here for quick support with future versions, * this method is deprecated and returns null. */ @Deprecated diff --git a/common/src/main/java/me/pandamods/pandalib/mixin/accessor/AbstractWidgetAccessor.java b/common/src/main/java/me/pandamods/pandalib/mixin/accessor/AbstractWidgetAccessor.java deleted file mode 100644 index 1402e3b..0000000 --- a/common/src/main/java/me/pandamods/pandalib/mixin/accessor/AbstractWidgetAccessor.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2024 Oliver Froberg (The Panda Oliver) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package me.pandamods.pandalib.mixin.accessor; - -import net.minecraft.client.gui.components.AbstractWidget; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(AbstractWidget.class) -public interface AbstractWidgetAccessor { - @Accessor("x") - void pandaLib$setX(int x); - - @Accessor("y") - void pandaLib$setY(int y); - - @Accessor("width") - void pandaLib$setWidth(int width); - - @Accessor("height") - void pandaLib$setHeight(int height); -} diff --git a/common/src/main/java/me/pandamods/pandalib/networking/NetworkContext.java b/common/src/main/java/me/pandamods/pandalib/networking/NetworkContext.java index 0facb7b..ff23792 100644 --- a/common/src/main/java/me/pandamods/pandalib/networking/NetworkContext.java +++ b/common/src/main/java/me/pandamods/pandalib/networking/NetworkContext.java @@ -24,6 +24,9 @@ public NetworkContext(Player player, Env envDirection) { this.envDirection = envDirection; } + /** + * @return The Sender if this was sent to the server or the receiver if this was sent to a client + */ public Player getPlayer() { return player; } diff --git a/common/src/main/java/me/pandamods/pandalib/platform/Services.java b/common/src/main/java/me/pandamods/pandalib/platform/Services.java index e711925..4a2e810 100644 --- a/common/src/main/java/me/pandamods/pandalib/platform/Services.java +++ b/common/src/main/java/me/pandamods/pandalib/platform/Services.java @@ -21,6 +21,7 @@ import java.util.ServiceLoader; +@SuppressWarnings("unused") public class Services { private static final Logger LOGGER = LogUtils.getLogger(); diff --git a/common/src/main/java/me/pandamods/pandalib/utils/AssimpUtils.java b/common/src/main/java/me/pandamods/pandalib/utils/AssimpUtils.java index 31169ae..07f9e00 100644 --- a/common/src/main/java/me/pandamods/pandalib/utils/AssimpUtils.java +++ b/common/src/main/java/me/pandamods/pandalib/utils/AssimpUtils.java @@ -18,9 +18,11 @@ import java.util.Objects; +@SuppressWarnings("unused") public class AssimpUtils { + // Conversion methods - @SuppressWarnings("unused") + public static Matrix4f toMatrix4f(AIMatrix4x4 aiMatrix) { return new Matrix4f( aiMatrix.a1(), aiMatrix.b1(), aiMatrix.c1(), aiMatrix.d1(), @@ -29,8 +31,7 @@ public static Matrix4f toMatrix4f(AIMatrix4x4 aiMatrix) { aiMatrix.a4(), aiMatrix.b4(), aiMatrix.c4(), aiMatrix.d4() ); } - - @SuppressWarnings("unused") + public static Matrix3f toMatrix3f(AIMatrix3x3 aiMatrix) { return new Matrix3f( aiMatrix.a1(), aiMatrix.b1(), aiMatrix.c1(), @@ -38,24 +39,21 @@ public static Matrix3f toMatrix3f(AIMatrix3x3 aiMatrix) { aiMatrix.a3(), aiMatrix.b3(), aiMatrix.c3() ); } - - @SuppressWarnings("unused") + public static Vector3f toVector3f(AIVector3D vector) { return new Vector3f(vector.x(), vector.y(), vector.z()); } - @SuppressWarnings("unused") public static Vector2f toVector2f(AIVector2D vector) { return new Vector2f(vector.x(), vector.y()); } - - @SuppressWarnings("unused") + public static Quaternionf toQuaternionf(AIQuaternion quaternion) { return new Quaternionf(quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w()); } // Equals methods - @SuppressWarnings("unused") + public static boolean AINodeEqualsAINode(AINode node1, AINode node2) { boolean namesEqual = Objects.equals(node1.mName().dataString(), node2.mName().dataString()); boolean parentsEqual = (node1.mParent() != null) == (node2.mParent() != null); @@ -66,8 +64,7 @@ public static boolean AINodeEqualsAINode(AINode node1, AINode node2) { boolean meshesEqual = node1.mNumMeshes() == node2.mNumMeshes(); return namesEqual && parentsEqual && childrenEqual && meshesEqual; } - - @SuppressWarnings("unused") + public static boolean AINodeEqualsNode(AINode aiNode, Node node) { boolean namesEqual = Objects.equals(aiNode.mName().dataString(), node.getName()); boolean parentsEqual = (aiNode.mParent() != null) == (node.getParent() != null); diff --git a/common/src/main/java/me/pandamods/pandalib/utils/BlockUtils.java b/common/src/main/java/me/pandamods/pandalib/utils/BlockUtils.java index 7c45d13..3414e79 100644 --- a/common/src/main/java/me/pandamods/pandalib/utils/BlockUtils.java +++ b/common/src/main/java/me/pandamods/pandalib/utils/BlockUtils.java @@ -20,6 +20,7 @@ import net.minecraft.world.level.block.state.properties.AttachFace; import net.minecraft.world.level.block.state.properties.BlockStateProperties; +@SuppressWarnings("unused") public class BlockUtils { public static void translateBlock(BlockState blockState, PoseStack poseStack) { poseStack.translate(0.5f, 0.5f, 0.5f); diff --git a/common/src/main/java/me/pandamods/pandalib/utils/ClassUtils.java b/common/src/main/java/me/pandamods/pandalib/utils/ClassUtils.java index ae1b9bf..708ba74 100644 --- a/common/src/main/java/me/pandamods/pandalib/utils/ClassUtils.java +++ b/common/src/main/java/me/pandamods/pandalib/utils/ClassUtils.java @@ -15,6 +15,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; +@SuppressWarnings("unused") public class ClassUtils { public static T constructUnsafely(Class cls) { try { diff --git a/common/src/main/java/me/pandamods/pandalib/utils/MathUtils.java b/common/src/main/java/me/pandamods/pandalib/utils/MathUtils.java index ed2d6b6..d57d37b 100644 --- a/common/src/main/java/me/pandamods/pandalib/utils/MathUtils.java +++ b/common/src/main/java/me/pandamods/pandalib/utils/MathUtils.java @@ -17,6 +17,7 @@ import org.joml.Quaternionf; import org.joml.Vector3f; +@SuppressWarnings("unused") public class MathUtils { public static Matrix4f lerpMatrix(Matrix4f matrix, Matrix4f other, float alpha) { return lerpMatrix(matrix, other, alpha, new Matrix4f()); diff --git a/common/src/main/java/me/pandamods/pandalib/utils/PLSpriteCoordinateExpander.java b/common/src/main/java/me/pandamods/pandalib/utils/PLSpriteCoordinateExpander.java index f4cb9e8..fd5f6d1 100644 --- a/common/src/main/java/me/pandamods/pandalib/utils/PLSpriteCoordinateExpander.java +++ b/common/src/main/java/me/pandamods/pandalib/utils/PLSpriteCoordinateExpander.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; @Environment(value=EnvType.CLIENT) +@SuppressWarnings("unused") public class PLSpriteCoordinateExpander implements VertexConsumer { private final VertexConsumer delegate; private final TextureAtlasSprite sprite; diff --git a/common/src/main/java/me/pandamods/pandalib/utils/PrintUtils.java b/common/src/main/java/me/pandamods/pandalib/utils/PrintUtils.java index 3dd91a9..a9c9dfb 100644 --- a/common/src/main/java/me/pandamods/pandalib/utils/PrintUtils.java +++ b/common/src/main/java/me/pandamods/pandalib/utils/PrintUtils.java @@ -17,88 +17,79 @@ import java.text.NumberFormat; +@SuppressWarnings("unused") public class PrintUtils { + // Vector2 - @SuppressWarnings("unused") + public static String getVector2String(Vector2fc vector) { return getVector2String(vector.x(), vector.y()); } - - @SuppressWarnings("unused") + public static String getVector2String(Vector2dc vector) { return getVector2String(vector.x(), vector.y()); } - - @SuppressWarnings("unused") + public static String getVector2String(Vector2ic vector) { return getVector2String(vector.x(), vector.y()); } - - @SuppressWarnings("unused") + public static String getVector2String(double x, double y) { return "Vector2[" + x + ", " + y + "]"; } // Vector3 - @SuppressWarnings("unused") + public static String getVector3String(Vector3fc vector) { return getVector3String(vector.x(), vector.y(), vector.z()); } - - @SuppressWarnings("unused") + public static String getVector3String(Vector3dc vector) { return getVector3String(vector.x(), vector.y(), vector.z()); } - @SuppressWarnings("unused") public static String getVector3String(Vector3ic vector) { return getVector3String(vector.x(), vector.y(), vector.z()); } - @SuppressWarnings("unused") public static String getVector3String(double x, double y, double z) { return "Vector3[" + x + ", " + y + ", " + z + "]"; } // Vector4 - @SuppressWarnings("unused") + public static String getVector4String(Vector4fc vector) { return getVector4String(vector.x(), vector.y(), vector.z(), vector.w()); } - @SuppressWarnings("unused") public static String getVector4String(Vector4dc vector) { return getVector4String(vector.x(), vector.y(), vector.z(), vector.w()); } - @SuppressWarnings("unused") public static String getVector4String(Vector4ic vector) { return getVector4String(vector.x(), vector.y(), vector.z(), vector.w()); } - @SuppressWarnings("unused") public static String getVector4String(double x, double y, double z, double w) { return "Vector4[" + x + ", " + y + ", " + z + ", " + w + "]"; } // Quaternion - @SuppressWarnings("unused") + public static String getQuaternionString(Quaternionfc quaternion) { return getQuaternionString(quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w()); } - @SuppressWarnings("unused") public static String getQuaternionString(Quaterniondc quaternion) { return getQuaternionString(quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w()); } - @SuppressWarnings("unused") private static String getQuaternionString(double x, double y, double z, double w) { return "Quaternion[" + x + ", " + y + ", " + z + ", " + w + "]"; } // Matrix3 - @SuppressWarnings("unused") + public static String getMatrix3String(Matrix3fc matrix) { return "Matrix3[" + "\n| Rotation (Euler): " + getVector3String(matrix.getEulerAnglesXYZ(new Vector3f())) + @@ -107,7 +98,6 @@ public static String getMatrix3String(Matrix3fc matrix) { "\n]"; } - @SuppressWarnings("unused") public static String getMatrix3String(Matrix3dc matrix) { return "Matrix3[" + "\n| Rotation (Euler): " + getVector3String(matrix.getEulerAnglesXYZ(new Vector3d())) + @@ -117,7 +107,7 @@ public static String getMatrix3String(Matrix3dc matrix) { } // Matrix4 - @SuppressWarnings("unused") + public static String getMatrix4String(Matrix4fc matrix) { return "Matrix4[" + "\n| Translation: " + getVector3String(matrix.getTranslation(new Vector3f())) + @@ -126,8 +116,7 @@ public static String getMatrix4String(Matrix4fc matrix) { "\n\\ Scale: " + getVector3String(matrix.getScale(new Vector3f())) + "\n]"; } - - @SuppressWarnings("unused") + public static String getMatrix4String(Matrix4dc matrix) { return "Matrix4[" + "\n| Translation: " + getVector3String(matrix.getTranslation(new Vector3d())) + diff --git a/common/src/main/java/me/pandamods/pandalib/utils/PriorityMap.java b/common/src/main/java/me/pandamods/pandalib/utils/PriorityMap.java deleted file mode 100644 index e037f02..0000000 --- a/common/src/main/java/me/pandamods/pandalib/utils/PriorityMap.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (C) 2024 Oliver Froberg (The Panda Oliver) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package me.pandamods.pandalib.utils; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.*; -import java.util.function.BiConsumer; -import java.util.function.Supplier; - -public class PriorityMap implements Map { - private final Map> maps; - - private final Supplier> mapSupplier; - - public PriorityMap() { - this.mapSupplier = HashMap::new; - this.maps = new HashMap<>(); - } - - @Override - public int size() { - return maps.values().stream().mapToInt(Map::size).sum(); - } - - @Override - public boolean isEmpty() { - return maps.isEmpty(); - } - - @Override - public boolean containsKey(Object key) { - return maps.containsKey(key); - } - - @Override - public boolean containsValue(Object value) { - return maps.containsValue(value); - } - - @Override - public V get(Object key) { - List priorities = new ArrayList<>(maps.keySet()); - priorities.sort(Comparator.reverseOrder()); - for (Integer priority : priorities) { - Map map = maps.get(priority); - return map.get(key); - } - return null; - } - - public V put(int priority, K key, V value) { - if (!maps.containsKey(priority)) { - maps.put(priority, mapSupplier.get()); - } - Map map = maps.get(priority); - return map.put(key, value); - } - - @Nullable - @Override - public V put(K key, V value) { - return put(0, key, value); - } - - public V remove(int priority, Object key) { - V value = null; - if (maps.containsKey(priority)) { - value = maps.get(priority).remove(key); - if (maps.get(priority).isEmpty()) - maps.remove(priority); - } - return value; - } - - @Override - public V remove(Object key) { - return remove(0, key); - } - - public void putAll(int priority, @NotNull Map m) { - if (!maps.containsKey(priority)) { - maps.put(priority, mapSupplier.get()); - } - maps.get(priority).putAll(m); - } - - @Override - public void putAll(@NotNull Map m) { - putAll(0, m); - } - - @Override - public void clear() { - maps.clear(); - } - - @NotNull - @Override - public Set keySet() { - Set keys = new HashSet<>(); - List priorities = new ArrayList<>(maps.keySet()); - priorities.sort(Comparator.reverseOrder()); - for (Integer priority : priorities) { - Map map = maps.get(priority); - keys.addAll(map.keySet()); - } - return keys; - } - - @NotNull - @Override - public Collection values() { - List values = new ArrayList<>(); - List priorities = new ArrayList<>(maps.keySet()); - priorities.sort(Comparator.reverseOrder()); - for (Integer priority : priorities) { - Map map = maps.get(priority); - values.addAll(map.values()); - } - return values; - } - - @NotNull - @Override - public Set> entrySet() { - Set> entries = new HashSet<>(); - List priorities = new ArrayList<>(maps.keySet()); - priorities.sort(Comparator.reverseOrder()); - for (Integer priority : priorities) { - Map map = maps.get(priority); - entries.addAll(map.entrySet()); - } - return entries; - } -} diff --git a/common/src/main/resources/pandalib-common.mixins.json b/common/src/main/resources/pandalib-common.mixins.json index 241b733..78467cf 100644 --- a/common/src/main/resources/pandalib-common.mixins.json +++ b/common/src/main/resources/pandalib-common.mixins.json @@ -3,9 +3,7 @@ "package": "me.pandamods.pandalib.mixin", "compatibilityLevel": "JAVA_21", "minVersion": "0.8", - "client": [ - "accessor.AbstractWidgetAccessor" - ], + "client": [], "mixins": [], "injectors": { "defaultRequire": 1