fix: suppress message about custom model data component type mismatch

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

Hide file tree

Showing 4 changed files with 5 additions and 8 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";

diff --git a/vane-portals/src/main/java/org/oddlama/vane/portals/entity/FloatingItem.java b/vane-portals/src/main/java/org/oddlama/vane/portals/entity/FloatingItem.java
@@ -21,7 +21,7 @@ public FloatingItem(final World world, double x, double y, double z) {
         setPos(x, y, z);
     }
 
-    public FloatingItem(EntityType<? extends ItemEntity> entitytypes, Level world) {
+    public FloatingItem(EntityType<Entity> entitytypes, Level world) {
         super(entitytypes, world);
         setSilent(true);
         setInvulnerable(true);
@@ -73,11 +73,6 @@ public void readAdditionalSaveData(CompoundTag nbt) {}
     @Override
     public void addAdditionalSaveData(CompoundTag nbt) {}
 
-    @Override
-    public boolean serializeEntity(CompoundTag nbt) {
-        return false;
-    }
-
     @Override
     public boolean save(CompoundTag nbt) {
         return false;