fix: 🐛 Fixed boats and minecarts to show title in their guis

Author: P3pp3rF1y

gradle.properties

@@ -13,7 +13,7 @@ loader_version_range=[4,)
 mod_id=sophisticatedstorageinmotion
 mod_name=Sophisticated Storage In Motion
 mod_license=All Rights Reserved
-mod_version=0.10.25
+mod_version=0.10.26
 mod_group_id=net.p3pp3rf1y
 mod_authors=P3pp3rF1y
 mod_description=Sophisticated Storage on moving entities.

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/MovingStorageItemRenderer.java

@@ -24,7 +24,7 @@ public void render(@Nullable D data, ItemDisplayContext displayContext, PoseStac
 
 		T movingStorage = getMovingStorage(mc);
 		setMovingStoragePropertiesFromData(movingStorage, data);
-		movingStorage.getStorageHolder().setStorageItemFrom(data.storageItem(), false);
+		movingStorage.getStorageHolder().setStorageItem(data.storageItem());
 
 		poseStack.pushPose();
 		poseStack.translate(0.5, 0, 0.5);

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/EntityStorageHolder.java

@@ -71,7 +71,7 @@ protected boolean isOwnContainer(Player player) {
 		return false;
 	}
 
-	public void setStorageItemFromMovingStorage(ItemStack movingStorageStack, boolean setupDefaults) {
+	public void setStorageItemAndCustomNameFromMovingStorageStack(ItemStack movingStorageStack, boolean setupDefaults) {
 		SimpleItemContent storageItemContents = movingStorageStack.get(ModDataComponents.STORAGE_ITEM.get());
 		if (storageItemContents == null) {
 			ItemStack barrel = new ItemStack(ModBlocks.BARREL_ITEM.get());
@@ -81,6 +81,10 @@ public void setStorageItemFromMovingStorage(ItemStack movingStorageStack, boolea
 			ItemStack storageItem = storageItemContents.copy();
 			setStorageItemFrom(storageItem, setupDefaults);
 		}
+		Component customName = movingStorageStack.get(DataComponents.CUSTOM_NAME);
+		if (customName != null) {
+			getEntity().setCustomName(customName);
+		}
 	}
 
 	@Override

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/StorageBoat.java

@@ -39,12 +39,9 @@
 import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModItems;
 import net.p3pp3rf1y.sophisticatedstorageinmotion.item.StorageBoatItem;
 
-import javax.annotation.Nullable;
 import java.util.Locale;
-import java.util.Optional;
 
 public class StorageBoat extends ChestBoat implements IMovingStorageEntity {
-	private static final EntityDataAccessor<Optional<Component>> DATA_CUSTOM_NAME = SynchedEntityData.defineId(StorageBoat.class, EntityDataSerializers.OPTIONAL_COMPONENT);
 	static final EntityDataAccessor<ItemStack> DATA_STORAGE_ITEM = SynchedEntityData.defineId(StorageBoat.class, EntityDataSerializers.ITEM_STACK);
 	static final EntityDataAccessor<WoodType> DATA_WOOD_TYPE = SynchedEntityData.defineId(StorageBoat.class, ModEntities.WOOD_TYPE_SERIALIZER.get());
 
@@ -71,7 +68,6 @@ public StorageBoat(Level level, double x, double y, double z) {
 	protected void defineSynchedData(SynchedEntityData.Builder builder) {
 		super.defineSynchedData(builder);
 		builder.define(DATA_STORAGE_ITEM, ItemStack.EMPTY);
-		builder.define(DATA_CUSTOM_NAME, Optional.empty());
 		builder.define(DATA_WOOD_TYPE, WoodType.OAK);
 	}
 
@@ -154,11 +150,6 @@ public void onSyncedDataUpdated(EntityDataAccessor<?> key) {
 		}
 	}
 
-	@Override
-	public void setCustomName(@Nullable Component customName) {
-		entityData.set(DATA_CUSTOM_NAME, Optional.ofNullable(customName));
-	}
-
 	private Component getWoodName(WoodType type) {
 		return Component.translatable("wood_name." + SophisticatedStorage.MOD_ID + "." + type.name().toLowerCase(Locale.ROOT));
 	}

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/StorageMinecart.java

@@ -33,11 +33,7 @@
 import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModEntities;
 import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModItems;
 
-import javax.annotation.Nullable;
-import java.util.Optional;
-
 public class StorageMinecart extends MinecartChest implements IMovingStorageEntity {
-	private static final EntityDataAccessor<Optional<Component>> DATA_CUSTOM_NAME = SynchedEntityData.defineId(StorageMinecart.class, EntityDataSerializers.OPTIONAL_COMPONENT);
 	static final EntityDataAccessor<ItemStack> DATA_STORAGE_ITEM = SynchedEntityData.defineId(StorageMinecart.class, EntityDataSerializers.ITEM_STACK);
 
 	private final EntityStorageHolder<StorageMinecart> entityStorageHolder;
@@ -63,7 +59,6 @@ public StorageMinecart(Level level, double x, double y, double z) {
 	protected void defineSynchedData(SynchedEntityData.Builder builder) {
 		super.defineSynchedData(builder);
 		builder.define(DATA_STORAGE_ITEM, ItemStack.EMPTY);
-		builder.define(DATA_CUSTOM_NAME, Optional.empty());
 	}
 
 	@Override
@@ -134,11 +129,6 @@ public void onSyncedDataUpdated(EntityDataAccessor<?> key) {
 		}
 	}
 
-	@Override
-	public void setCustomName(@Nullable Component customName) {
-		entityData.set(DATA_CUSTOM_NAME, Optional.ofNullable(customName));
-	}
-
 	@Override
 	protected Component getTypeName() {
 		return Component.translatable(StorageInMotionTranslationHelper.INSTANCE.translEntity("storage_minecart"), getStorageItem().getHoverName());

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/StorageBoatItem.java

@@ -169,7 +169,7 @@ public InteractionResult use(Level level, Player player, InteractionHand hand) {
 	private static StorageBoat createBoat(Level level, @Nullable Player player, ItemStack stack, double x, double y, double z) {
 		StorageBoat boat = new StorageBoat(level, x, y, z);
 		EntityStorageHolder<?> storageHolder = boat.getStorageHolder();
-		storageHolder.setStorageItemFromMovingStorage(stack, true);
+		storageHolder.setStorageItemAndCustomNameFromMovingStorageStack(stack, true);
 		storageHolder.onPlace();
 
 		boat.setWoodType(StorageBoatItem.getWoodType(stack));

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/StorageMinecartItem.java

@@ -115,7 +115,7 @@ public InteractionResult useOn(UseOnContext context) {
 	private static StorageMinecart createMinecart(ServerLevel serverlevel, BlockPos blockpos, double ascendingOffset, ItemStack stack, @Nullable Player player) {
 		StorageMinecart minecart = new StorageMinecart(serverlevel, blockpos.getX() + 0.5, blockpos.getY() + 0.0625 + ascendingOffset, blockpos.getZ() + 0.5);
 		EntityStorageHolder<?> storageHolder = minecart.getStorageHolder();
-		storageHolder.setStorageItemFromMovingStorage(stack, true);
+		storageHolder.setStorageItemAndCustomNameFromMovingStorageStack(stack, true);
 		storageHolder.onPlace();
 		EntityType.createDefaultStackConfig(serverlevel, stack, player).accept(minecart);
 		return minecart;