From 9a514321b14997339ffeebec1fd93f40d1db6ced Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 22 Dec 2023 11:59:55 -0600 Subject: [PATCH] item text cleanup, NEED TRANSLATORS! --- .../train/common/items/ItemRollingStock.java | 13 +++++++------ src/main/resources/assets/tc/lang/en_US.lang | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/main/java/train/common/items/ItemRollingStock.java b/src/main/java/train/common/items/ItemRollingStock.java index 8a8be9ee4..f5e567a63 100644 --- a/src/main/java/train/common/items/ItemRollingStock.java +++ b/src/main/java/train/common/items/ItemRollingStock.java @@ -115,13 +115,9 @@ public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlaye } } - if(getEntity().transportFuelType()!=null && !getEntity().transportFuelType().equals("")) { - par3List.add(EnumChatFormatting.RED + t("menu.item.fueltype") + ": " + - t("menu.item."+getEntity().transportFuelType().toLowerCase())); - } - StringBuilder s = new StringBuilder(); - par3List.add(EnumChatFormatting.RED + t("menu.item.types")+":"); + s.append(t("menu.item.types")); + s.append(": "); if (getEntity() instanceof Locomotive){ s.append(t("menu.item.locomotive")+", "); if(entity instanceof IPassenger){ @@ -151,6 +147,11 @@ public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlaye par3List.add(EnumChatFormatting.RED +s.toString()); + if(getEntity().transportFuelType()!=null && !getEntity().transportFuelType().equals("")) { + par3List.add(EnumChatFormatting.RED + t("menu.item.fueltype") + ": " + + t("menu.item."+getEntity().transportFuelType().toLowerCase())); + } + par3List.add(EnumChatFormatting.GREEN + t("menu.item.weight") +": " + getEntity().weightKg() + "kg"); if (getEntity().transportTopSpeed()!=0){ par3List.add(EnumChatFormatting.GREEN + t("menu.item.speed") +": " + getEntity().transportTopSpeed() +" km/h"); diff --git a/src/main/resources/assets/tc/lang/en_US.lang b/src/main/resources/assets/tc/lang/en_US.lang index 1678ad608..26ce5b1dc 100644 --- a/src/main/resources/assets/tc/lang/en_US.lang +++ b/src/main/resources/assets/tc/lang/en_US.lang @@ -872,6 +872,24 @@ builder.up.name=Up builder.down.name=Down builder.currElev.name=Current elevation builder.reqElev.name=Requested elevation +menu.item.slots=Slots +menu.item.passenger=Max Riders +menu.item.isizeof=Inventory +menu.item.freight=Freight +menu.item.passenger=Passenger +menu.item.tanker=Tanker +menu.item.tender=Tender +menu.item.workcart=Workbench Cart +menu.item.rollingstock=Rollingstock +menu.item.locomotive=Locomotive +menu.item.fueltype=Fuel +menu.item.steam=Steam +menu.item.diesel=Diesel +menu.item.electric=Electric +menu.item.types=Type +menu.item.mhp=MHP +menu.item.speed=Top Speed +menu.item.weight=Weight train.owner.name=You are not the owner! train.locked.name=Locked