echo boats are now the default when summoning a deeper darker boat

KyaniteMods · Mar 29, 2024 · c00bffa · c00bffa
1 parent 6cd94ed
commit c00bffa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/kyanite/deeperdarker/client/render/DDBoatRenderer.java b/src/main/java/com/kyanite/deeperdarker/client/render/DDBoatRenderer.java
@@ -48,6 +48,6 @@ public Pair<ResourceLocation, ListModel<Boat>> getModelWithLocation(Boat boat) {
         Pair<ResourceLocation, ListModel<Boat>> model = null;
         if(boat instanceof DDBoat ddBoat) model = BOAT_RESOURCES.get(ddBoat.getWoodType());
         if(boat instanceof DDChestBoat ddChestBoat) model = BOAT_RESOURCES.get(ddChestBoat.getWoodType());
-        return model == null ? BOAT_RESOURCES.get("bloom") : model;
+        return model == null ? BOAT_RESOURCES.get(DDBlocks.ECHO.name()) : model;
     }
 }
diff --git a/src/main/java/com/kyanite/deeperdarker/content/entities/DDBoat.java b/src/main/java/com/kyanite/deeperdarker/content/entities/DDBoat.java
@@ -1,5 +1,6 @@
 package com.kyanite.deeperdarker.content.entities;
 
+import com.kyanite.deeperdarker.content.DDBlocks;
 import com.kyanite.deeperdarker.content.DDEntities;
 import com.kyanite.deeperdarker.content.DDItems;
 import net.minecraft.nbt.CompoundTag;
@@ -32,12 +33,12 @@ public DDBoat(Level level, double x, double y, double z, String woodType) {
     @Override
     protected void defineSynchedData() {
         super.defineSynchedData();
-        this.entityData.define(WOOD_TYPE, "echo");
+        this.entityData.define(WOOD_TYPE, DDBlocks.ECHO.name());
     }
 
     @Override
     public Item getDropItem() {
-        return this.entityData.get(WOOD_TYPE).equals("echo") ? DDItems.ECHO_BOAT.get() : DDItems.BLOOM_BOAT.get();
+        return this.entityData.get(WOOD_TYPE).equals(DDBlocks.BLOOM.name()) ? DDItems.BLOOM_BOAT.get() : DDItems.ECHO_BOAT.get();
     }
 
     @Override

diff --git a/src/main/java/com/kyanite/deeperdarker/content/entities/DDChestBoat.java b/src/main/java/com/kyanite/deeperdarker/content/entities/DDChestBoat.java
@@ -1,5 +1,6 @@
 package com.kyanite.deeperdarker.content.entities;
 
+import com.kyanite.deeperdarker.content.DDBlocks;
 import com.kyanite.deeperdarker.content.DDEntities;
 import com.kyanite.deeperdarker.content.DDItems;
 import net.minecraft.nbt.CompoundTag;
@@ -33,12 +34,12 @@ public DDChestBoat(Level level, double x, double y, double z, String woodType) {
     @Override
     protected void defineSynchedData() {
         super.defineSynchedData();
-        this.entityData.define(WOOD_TYPE, "echo");
+        this.entityData.define(WOOD_TYPE, DDBlocks.ECHO.name());
     }
 
     @Override
     public Item getDropItem() {
-        return this.entityData.get(WOOD_TYPE).equals("echo") ? DDItems.ECHO_CHEST_BOAT.get() : DDItems.BLOOM_CHEST_BOAT.get();
+        return this.entityData.get(WOOD_TYPE).equals(DDBlocks.BLOOM.name()) ? DDItems.BLOOM_CHEST_BOAT.get() : DDItems.ECHO_CHEST_BOAT.get();
     }
 
     @Override