2.3.3 Hotfix

Author: MeAlam1

changelog.md

@@ -1,15 +1,18 @@
-# 2.3.2 Hotfix
+# 2.3.3 Hotfix
 
 ## Warning:
 
 * **This is a major update with extensive changes. While everything has been tested privately, the sheer size means bugs
   may still occur. Please report any issues on GitHub or message `@me_alam` on Discord.**
 * **The version will remain minor until stability and feature completeness are confirmed.**
 
+## Changed
+
+* All the Rendering NullPointerExceptions are now Custom Exceptions for better debugging.
+
 ## Fixed
 
-* Annotated Model(Layers) and Renderers to only be called on the Client on the Fabric and NeoForge Side. This should
-  prevent any issues with the server trying to call the rendering methods.
+* If a Mod has a broken Controller JSON, it will now be ignored instead of causing the game to crash.
 
 ## Epilogue
 

common/src/main/java/software/bluelib/BlueLibConstants.java

@@ -59,7 +59,7 @@ public static <T> ServiceLoader<T> loadAll(@NotNull Class<T> pClazz) {
 	public static final String MOD_NAME = "BlueLib";
 
 	@NotNull
-	public static final String VERSION = "2.3.2";
+	public static final String VERSION = "2.3.3";
 
 	@Nullable
 	public static MinecraftServer server;

common/src/main/java/software/bluelib/api/exception/nulls/AnimatableNullException.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 BlueLib Contributors
+ *
+ * This Source Code Form is subject to the terms of the MIT License.
+ * If a copy of the MIT License was not distributed with this file,
+ * You can obtain one at https://opensource.org/licenses/MIT.
+ */
+package software.bluelib.api.exception.nulls;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings({ "unused" })
+public class AnimatableNullException extends NullPointerException {
+
+	private final List<String> messages;
+
+	public AnimatableNullException(String pMessage) {
+		super(pMessage);
+		this.messages = Collections.singletonList(pMessage);
+	}
+
+	public AnimatableNullException(List<String> pMessages) {
+		super(pMessages != null && !pMessages.isEmpty() ? pMessages.getFirst() : null);
+		this.messages = pMessages == null ? Collections.emptyList() : Collections.unmodifiableList(pMessages);
+	}
+
+	@NotNull
+	public AnimatableNullException withMessage(String pMessage) {
+		List<String> newMessages = new ArrayList<>(this.messages);
+		newMessages.add(pMessage);
+		return new AnimatableNullException(newMessages);
+	}
+
+	@Override
+	public String getLocalizedMessage() {
+		StringJoiner joiner = new StringJoiner("\n");
+		for (int i = 0; i < messages.size(); i++) {
+			joiner.add((i == 0 ? "" : "-> ") + messages.get(i));
+		}
+		return joiner.toString();
+	}
+
+	@Override
+	public String toString() {
+		return "AnimatableNullException: " + getLocalizedMessage();
+	}
+}

common/src/main/java/software/bluelib/api/exception/nulls/EntityNullException.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 BlueLib Contributors
+ *
+ * This Source Code Form is subject to the terms of the MIT License.
+ * If a copy of the MIT License was not distributed with this file,
+ * You can obtain one at https://opensource.org/licenses/MIT.
+ */
+package software.bluelib.api.exception.nulls;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings({ "unused" })
+public class EntityNullException extends NullPointerException {
+
+	private final List<String> messages;
+
+	public EntityNullException(String pMessage) {
+		super(pMessage);
+		this.messages = Collections.singletonList(pMessage);
+	}
+
+	public EntityNullException(List<String> pMessages) {
+		super(pMessages != null && !pMessages.isEmpty() ? pMessages.getFirst() : null);
+		this.messages = pMessages == null ? Collections.emptyList() : Collections.unmodifiableList(pMessages);
+	}
+
+	@NotNull
+	public EntityNullException withMessage(String pMessage) {
+		List<String> newMessages = new ArrayList<>(this.messages);
+		newMessages.add(pMessage);
+		return new EntityNullException(newMessages);
+	}
+
+	@Override
+	public String getLocalizedMessage() {
+		StringJoiner joiner = new StringJoiner("\n");
+		for (int i = 0; i < messages.size(); i++) {
+			joiner.add((i == 0 ? "" : "-> ") + messages.get(i));
+		}
+		return joiner.toString();
+	}
+
+	@Override
+	public String toString() {
+		return "EntityNullException: " + getLocalizedMessage();
+	}
+}

common/src/main/java/software/bluelib/api/exception/nulls/EquipmentSlotNullException.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 BlueLib Contributors
+ *
+ * This Source Code Form is subject to the terms of the MIT License.
+ * If a copy of the MIT License was not distributed with this file,
+ * You can obtain one at https://opensource.org/licenses/MIT.
+ */
+package software.bluelib.api.exception.nulls;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings({ "unused" })
+public class EquipmentSlotNullException extends NullPointerException {
+
+	private final List<String> messages;
+
+	public EquipmentSlotNullException(String pMessage) {
+		super(pMessage);
+		this.messages = Collections.singletonList(pMessage);
+	}
+
+	public EquipmentSlotNullException(List<String> pMessages) {
+		super(pMessages != null && !pMessages.isEmpty() ? pMessages.getFirst() : null);
+		this.messages = pMessages == null ? Collections.emptyList() : Collections.unmodifiableList(pMessages);
+	}
+
+	@NotNull
+	public EquipmentSlotNullException withMessage(String pMessage) {
+		List<String> newMessages = new ArrayList<>(this.messages);
+		newMessages.add(pMessage);
+		return new EquipmentSlotNullException(newMessages);
+	}
+
+	@Override
+	public String getLocalizedMessage() {
+		StringJoiner joiner = new StringJoiner("\n");
+		for (int i = 0; i < messages.size(); i++) {
+			joiner.add((i == 0 ? "" : "-> ") + messages.get(i));
+		}
+		return joiner.toString();
+	}
+
+	@Override
+	public String toString() {
+		return "EquipmentSlotNullException: " + getLocalizedMessage();
+	}
+}

common/src/main/java/software/bluelib/api/exception/nulls/ItemDisplayContextNullException.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 BlueLib Contributors
+ *
+ * This Source Code Form is subject to the terms of the MIT License.
+ * If a copy of the MIT License was not distributed with this file,
+ * You can obtain one at https://opensource.org/licenses/MIT.
+ */
+package software.bluelib.api.exception.nulls;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings({ "unused" })
+public class ItemDisplayContextNullException extends NullPointerException {
+
+	private final List<String> messages;
+
+	public ItemDisplayContextNullException(String pMessage) {
+		super(pMessage);
+		this.messages = Collections.singletonList(pMessage);
+	}
+
+	public ItemDisplayContextNullException(List<String> pMessages) {
+		super(pMessages != null && !pMessages.isEmpty() ? pMessages.getFirst() : null);
+		this.messages = pMessages == null ? Collections.emptyList() : Collections.unmodifiableList(pMessages);
+	}
+
+	@NotNull
+	public ItemDisplayContextNullException withMessage(String pMessage) {
+		List<String> newMessages = new ArrayList<>(this.messages);
+		newMessages.add(pMessage);
+		return new ItemDisplayContextNullException(newMessages);
+	}
+
+	@Override
+	public String getLocalizedMessage() {
+		StringJoiner joiner = new StringJoiner("\n");
+		for (int i = 0; i < messages.size(); i++) {
+			joiner.add((i == 0 ? "" : "-> ") + messages.get(i));
+		}
+		return joiner.toString();
+	}
+
+	@Override
+	public String toString() {
+		return "ItemDisplayContextNullException: " + getLocalizedMessage();
+	}
+}

common/src/main/java/software/bluelib/api/exception/nulls/ItemStackNullException.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 BlueLib Contributors
+ *
+ * This Source Code Form is subject to the terms of the MIT License.
+ * If a copy of the MIT License was not distributed with this file,
+ * You can obtain one at https://opensource.org/licenses/MIT.
+ */
+package software.bluelib.api.exception.nulls;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings({ "unused" })
+public class ItemStackNullException extends NullPointerException {
+
+	private final List<String> messages;
+
+	public ItemStackNullException(String pMessage) {
+		super(pMessage);
+		this.messages = Collections.singletonList(pMessage);
+	}
+
+	public ItemStackNullException(List<String> pMessages) {
+		super(pMessages != null && !pMessages.isEmpty() ? pMessages.getFirst() : null);
+		this.messages = pMessages == null ? Collections.emptyList() : Collections.unmodifiableList(pMessages);
+	}
+
+	@NotNull
+	public ItemStackNullException withMessage(String pMessage) {
+		List<String> newMessages = new ArrayList<>(this.messages);
+		newMessages.add(pMessage);
+		return new ItemStackNullException(newMessages);
+	}
+
+	@Override
+	public String getLocalizedMessage() {
+		StringJoiner joiner = new StringJoiner("\n");
+		for (int i = 0; i < messages.size(); i++) {
+			joiner.add((i == 0 ? "" : "-> ") + messages.get(i));
+		}
+		return joiner.toString();
+	}
+
+	@Override
+	public String toString() {
+		return "ItemStackNullException: " + getLocalizedMessage();
+	}
+}

common/src/main/java/software/bluelib/api/exception/AnimatableException.java renamed to common/src/main/java/software/bluelib/api/exception/nulls/ModelNullException.java

@@ -5,7 +5,7 @@
  * If a copy of the MIT License was not distributed with this file,
  * You can obtain one at https://opensource.org/licenses/MIT.
  */
-package software.bluelib.api.exception;
+package software.bluelib.api.exception.nulls;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,25 +14,25 @@
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings({ "unused" })
-public class AnimatableException extends NullPointerException {
+public class ModelNullException extends NullPointerException {
 
 	private final List<String> messages;
 
-	public AnimatableException(String pMessage) {
+	public ModelNullException(String pMessage) {
 		super(pMessage);
 		this.messages = Collections.singletonList(pMessage);
 	}
 
-	public AnimatableException(List<String> pMessages) {
+	public ModelNullException(List<String> pMessages) {
 		super(pMessages != null && !pMessages.isEmpty() ? pMessages.getFirst() : null);
 		this.messages = pMessages == null ? Collections.emptyList() : Collections.unmodifiableList(pMessages);
 	}
 
 	@NotNull
-	public AnimatableException withMessage(String pMessage) {
+	public ModelNullException withMessage(String pMessage) {
 		List<String> newMessages = new ArrayList<>(this.messages);
 		newMessages.add(pMessage);
-		return new AnimatableException(newMessages);
+		return new ModelNullException(newMessages);
 	}
 
 	@Override
@@ -46,6 +46,6 @@ public String getLocalizedMessage() {
 
 	@Override
 	public String toString() {
-		return "AnimatableException: " + getLocalizedMessage();
+		return "ModelNullException: " + getLocalizedMessage();
 	}
 }

common/src/main/java/software/bluelib/api/exception/nulls/RenderTypeNullException.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 BlueLib Contributors
+ *
+ * This Source Code Form is subject to the terms of the MIT License.
+ * If a copy of the MIT License was not distributed with this file,
+ * You can obtain one at https://opensource.org/licenses/MIT.
+ */
+package software.bluelib.api.exception.nulls;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings({ "unused" })
+public class RenderTypeNullException extends NullPointerException {
+
+	private final List<String> messages;
+
+	public RenderTypeNullException(String pMessage) {
+		super(pMessage);
+		this.messages = Collections.singletonList(pMessage);
+	}
+
+	public RenderTypeNullException(List<String> pMessages) {
+		super(pMessages != null && !pMessages.isEmpty() ? pMessages.getFirst() : null);
+		this.messages = pMessages == null ? Collections.emptyList() : Collections.unmodifiableList(pMessages);
+	}
+
+	@NotNull
+	public RenderTypeNullException withMessage(String pMessage) {
+		List<String> newMessages = new ArrayList<>(this.messages);
+		newMessages.add(pMessage);
+		return new RenderTypeNullException(newMessages);
+	}
+
+	@Override
+	public String getLocalizedMessage() {
+		StringJoiner joiner = new StringJoiner("\n");
+		for (int i = 0; i < messages.size(); i++) {
+			joiner.add((i == 0 ? "" : "-> ") + messages.get(i));
+		}
+		return joiner.toString();
+	}
+
+	@Override
+	public String toString() {
+		return "RenderTypeNullException: " + getLocalizedMessage();
+	}
+}