ChestBoat test

Arbee4ever · Apr 11, 2022 · 7b4c9ff · 7b4c9ff
1 parent 63bb0c5
commit 7b4c9ff
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/src/main/java/net/arbee/addola/Addola.java b/src/main/java/net/arbee/addola/Addola.java
@@ -1,17 +1,10 @@
 package net.arbee.addola;
 
-import net.arbee.addola.entity.vehicle.ChestBoatEntity;
-import net.arbee.addola.registries.AddolaEntities;
-import net.arbee.addola.registries.AddolaItems;
 import net.arbee.addola.registries.AddolaCommands;
+import net.arbee.addola.registries.AddolaEntities;
 import net.arbee.addola.registries.AddolaGamerules;
+import net.arbee.addola.registries.AddolaItems;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
-import net.minecraft.entity.EntityDimensions;
-import net.minecraft.entity.EntityType;
-import net.minecraft.entity.SpawnGroup;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 
 public class Addola implements ModInitializer {
     public static final String MOD_NAME = "Addola";
@@ -20,7 +13,7 @@ public class Addola implements ModInitializer {
     public void onInitialize() {
         AddolaGamerules.setupGamerules();
         AddolaCommands.setupCommands();
-        AddolaItems.setupItems();
         AddolaEntities.setupEntities();
+        AddolaItems.setupItems();
     }
 }
diff --git a/src/main/java/net/arbee/addola/AddolaClient.java b/src/main/java/net/arbee/addola/AddolaClient.java
@@ -36,18 +36,8 @@ public class AddolaClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        BuiltinItemRendererRegistry.INSTANCE.register(Items.ACACIA_BOAT, new BoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(Items.OAK_BOAT, new BoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(Items.BIRCH_BOAT, new BoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(Items.DARK_OAK_BOAT, new BoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(Items.JUNGLE_BOAT, new BoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(Items.SPRUCE_BOAT, new BoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(AddolaItems.OAK_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(AddolaItems.SPRUCE_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(AddolaItems.BIRCH_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(AddolaItems.JUNGLE_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(AddolaItems.ACACIA_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
-        BuiltinItemRendererRegistry.INSTANCE.register(AddolaItems.DARKOAK_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
+        AddolaItems.setupItemRenderers();
+
         EntityRendererRegistry.INSTANCE.register(AddolaEntities.CHESTBOAT, (dispatcher, context) -> new ChestBoatEntityRenderer(dispatcher));
 
         receiveEntityPacket();

diff --git a/src/main/java/net/arbee/addola/client/render/BoatItemRenderer.java b/src/main/java/net/arbee/addola/client/render/BoatItemRenderer.java
@@ -10,7 +10,6 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.registry.Registry;
 
 
 public class BoatItemRenderer implements BuiltinItemRendererRegistry.DynamicItemRenderer {

diff --git a/src/main/java/net/arbee/addola/registries/AddolaItems.java b/src/main/java/net/arbee/addola/registries/AddolaItems.java
@@ -1,9 +1,13 @@
 package net.arbee.addola.registries;
 
+import net.arbee.addola.client.render.BoatItemRenderer;
+import net.arbee.addola.client.render.ChestBoatItemRenderer;
 import net.arbee.addola.item.ChestBoatItem;
+import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry;
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
@@ -23,4 +27,19 @@ public static void setupItems() {
         Registry.register(Registry.ITEM, new Identifier("addola", "birch_chestboat"), BIRCH_CHESTBOAT_ITEM);
         Registry.register(Registry.ITEM, new Identifier("addola", "spruce_chestboat"), SPRUCE_CHESTBOAT_ITEM);
     }
+
+    public static void setupItemRenderers() {
+        BuiltinItemRendererRegistry.INSTANCE.register(Items.ACACIA_BOAT, new BoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(Items.OAK_BOAT, new BoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(Items.BIRCH_BOAT, new BoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(Items.DARK_OAK_BOAT, new BoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(Items.JUNGLE_BOAT, new BoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(Items.SPRUCE_BOAT, new BoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(OAK_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(SPRUCE_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(BIRCH_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(JUNGLE_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(ACACIA_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
+        BuiltinItemRendererRegistry.INSTANCE.register(DARKOAK_CHESTBOAT_ITEM, new ChestBoatItemRenderer());
+    }
 }