Bug，解决，好耶！

CSneko · Oct 9, 2024 · 2518cdf · 2518cdf
1 parent f00cc9a
commit 2518cdf
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 5 deletions.
diff --git a/common/src/main/java/org/cneko/toneko/common/mod/items/NekoArmor.java b/common/src/main/java/org/cneko/toneko/common/mod/items/NekoArmor.java
@@ -24,12 +24,12 @@
 import software.bernie.geckolib.renderer.GeoArmorRenderer;
 import software.bernie.geckolib.util.GeckoLibUtil;
 
-import javax.annotation.Nullable;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 public abstract class NekoArmor<N extends Item & GeoItem> extends DyeableArmorItem implements GeoItem {
     public final AnimatableInstanceCache cache;
+    private final Supplier<Object> renderProvider = GeoItem.makeRenderer(this);
     public NekoArmor(ArmorMaterial material, Type type, Properties settings) {
         super(material, type, settings);
         SingletonGeoAnimatable.registerSyncedAnimatable(this);
@@ -87,7 +87,7 @@ public AnimatableInstanceCache getAnimatableInstanceCache() {
 
     @Override
     public Supplier<Object> getRenderProvider() {
-        return null;
+        return this.renderProvider;
     }
 
 

diff --git a/...main/resources/data/c/tags/item/ears.json → ...ain/resources/data/c/tags/items/ears.json b/...main/resources/data/c/tags/item/ears.json → ...ain/resources/data/c/tags/items/ears.json
diff --git a/...ata/c/tags/item/nuggets/iron_nuggets.json → ...ta/c/tags/items/nuggets/iron_nuggets.json b/...ata/c/tags/item/nuggets/iron_nuggets.json → ...ta/c/tags/items/nuggets/iron_nuggets.json
diff --git a/...ain/resources/data/c/tags/item/tails.json → ...in/resources/data/c/tags/items/tails.json b/...ain/resources/data/c/tags/item/tails.json → ...in/resources/data/c/tags/items/tails.json
diff --git a/...main/resources/data/c/tags/item/wool.json → ...ain/resources/data/c/tags/items/wool.json b/...main/resources/data/c/tags/item/wool.json → ...ain/resources/data/c/tags/items/wool.json
diff --git a/...es/data/toneko/recipe/neko_collector.json → ...s/data/toneko/recipes/neko_collector.json b/...es/data/toneko/recipe/neko_collector.json → ...s/data/toneko/recipes/neko_collector.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "id": "toneko:neko_collector",
+    "item": "toneko:neko_collector",
     "count": 1
   }
 }
diff --git a/...sources/data/toneko/recipe/neko_ears.json → ...ources/data/toneko/recipes/neko_ears.json b/...sources/data/toneko/recipe/neko_ears.json → ...ources/data/toneko/recipes/neko_ears.json
@@ -9,7 +9,7 @@
     }
   },
   "result": {
-    "id": "toneko:neko_ears",
+    "item": "toneko:neko_ears",
     "count": 1
   }
 }
diff --git a/...sources/data/toneko/recipe/neko_tail.json → ...ources/data/toneko/recipes/neko_tail.json b/...sources/data/toneko/recipe/neko_tail.json → ...ources/data/toneko/recipes/neko_tail.json
@@ -12,7 +12,7 @@
     }
   },
   "result": {
-    "id": "toneko:neko_tail",
+    "item": "toneko:neko_tail",
     "count": 1
   }
 }
diff --git a/...s/data/trinkets/tags/item/chest/back.json → .../data/trinkets/tags/items/chest/back.json b/...s/data/trinkets/tags/item/chest/back.json → .../data/trinkets/tags/items/chest/back.json
diff --git a/...s/data/trinkets/tags/item/feet/shoes.json → .../data/trinkets/tags/items/feet/shoes.json b/...s/data/trinkets/tags/item/feet/shoes.json → .../data/trinkets/tags/items/feet/shoes.json
diff --git a/...ces/data/trinkets/tags/item/head/hat.json → ...es/data/trinkets/tags/items/head/hat.json b/...ces/data/trinkets/tags/item/head/hat.json → ...es/data/trinkets/tags/items/head/hat.json
diff --git a/fabric/src/main/java/org/cneko/toneko/fabric/entities/NekoEntity.java b/fabric/src/main/java/org/cneko/toneko/fabric/entities/NekoEntity.java
@@ -72,6 +72,11 @@ public NekoEntity(EntityType<? extends NekoEntity> entityType, Level level) {
         this.cache = GeckoLibUtil.createInstanceCache(this);
     }
 
+    protected void defineSynchedData() {
+        super.defineSynchedData();
+        this.entityData.define(SKIN_DATA_ID,"grmmy");
+    }
+
     @Override
     public void readAdditionalSaveData(@NotNull CompoundTag nbt) {
         super.readAdditionalSaveData(nbt);