fix: suppress message about custom model data component type mismatch

oddlama · Jan 3, 2025 · 518aa1b · 518aa1b
1 parent c4dd43b
commit 518aa1b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
 	`java-library`
-	id("io.papermc.paperweight.userdev") version "1.7.7"
+	id("io.papermc.paperweight.userdev") version "2.0.0-beta.11"
 	id("xyz.jpenilla.run-paper") version "2.3.1" // Adds runServer and runMojangMappedServer tasks for testing
 }
 

diff --git a/flake.nix b/flake.nix
@@ -11,7 +11,6 @@
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
     };
   };
 

diff --git a/vane-core/src/main/java/org/oddlama/vane/core/item/ExistingItemConverter.java b/vane-core/src/main/java/org/oddlama/vane/core/item/ExistingItemConverter.java
@@ -28,6 +28,9 @@ private CustomItem from_old_item(final ItemStack item_stack) {
 
         // If lookups fail, we return null and nothing will be done.
         String new_item_key = null;
+		if (meta.getCustomModelDataComponent().getFloats().isEmpty()) {
+			return null;
+		}
         switch (meta.getCustomModelData()) {
             case 7758190:
                 new_item_key = "vane_trifles:wooden_sickle";