From 7f54459ecad346b40555965e41e0fe6f2384dd39 Mon Sep 17 00:00:00 2001 From: Florian Kostenzer Date: Fri, 30 Jul 2021 14:58:53 +0200 Subject: [PATCH 1/2] Fix getItemStackDisplayName on Servers --- .../gregicadditions/blocks/GAMetalCasingItemBlock.java | 9 +++------ src/main/java/gregicadditions/blocks/GAOreItemBlock.java | 1 - .../mysticalagriculture/items/ItemEssence.java | 8 +++----- .../mysticalagriculture/items/ItemTierSeed.java | 5 +++-- .../gregicadditions/item/behaviors/WasteBehavior.java | 9 ++++----- .../pipelike/opticalfiber/ItemBlockOpticalFiber.java | 6 +++--- 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/gregicadditions/blocks/GAMetalCasingItemBlock.java b/src/main/java/gregicadditions/blocks/GAMetalCasingItemBlock.java index 55dd3ef9d..cad6bc8f6 100644 --- a/src/main/java/gregicadditions/blocks/GAMetalCasingItemBlock.java +++ b/src/main/java/gregicadditions/blocks/GAMetalCasingItemBlock.java @@ -1,13 +1,10 @@ package gregicadditions.blocks; import gregtech.api.unification.material.type.Material; +import gregtech.api.util.LocalisationUtils; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - public class GAMetalCasingItemBlock extends ItemBlock { private final GAMetalCasing metalCasingBlock; @@ -30,10 +27,10 @@ public IBlockState getBlockState(ItemStack stack) { } @Override - @SideOnly(Side.CLIENT) + @SuppressWarnings("deprecation") public String getItemStackDisplayName(ItemStack stack) { Material material = getBlockState(stack).getValue(metalCasingBlock.variantProperty); - return I18n.format("tile.ga_metal_casing.material.name", material.getLocalizedName()); + return LocalisationUtils.format("tile.ga_metal_casing.material.name", material.getLocalizedName()); } diff --git a/src/main/java/gregicadditions/blocks/GAOreItemBlock.java b/src/main/java/gregicadditions/blocks/GAOreItemBlock.java index ed47bed50..769de981a 100644 --- a/src/main/java/gregicadditions/blocks/GAOreItemBlock.java +++ b/src/main/java/gregicadditions/blocks/GAOreItemBlock.java @@ -18,7 +18,6 @@ public GAOreItemBlock(GABlockOre oreBlock) { } @Override - @SideOnly(Side.CLIENT) public String getItemStackDisplayName(ItemStack stack) { IBlockState blockState = getBlockState(stack); StoneType stoneType = blockState.getValue(oreBlock.STONE_TYPE); diff --git a/src/main/java/gregicadditions/integrations/mysticalagriculture/items/ItemEssence.java b/src/main/java/gregicadditions/integrations/mysticalagriculture/items/ItemEssence.java index 8af966e88..052496f75 100644 --- a/src/main/java/gregicadditions/integrations/mysticalagriculture/items/ItemEssence.java +++ b/src/main/java/gregicadditions/integrations/mysticalagriculture/items/ItemEssence.java @@ -3,10 +3,8 @@ import com.blakebr0.cucumber.iface.IColoredItem; import com.blakebr0.cucumber.item.ItemBase; import gregtech.api.unification.material.type.Material; -import net.minecraft.client.resources.I18n; +import gregtech.api.util.LocalisationUtils; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemEssence extends ItemBase implements IColoredItem { @@ -18,9 +16,9 @@ public ItemEssence(Material material) { } @Override - @SideOnly(Side.CLIENT) + @SuppressWarnings("deprecation") public String getItemStackDisplayName(ItemStack stack) { - return I18n.format("item.ga_essence.material.name", material.getLocalizedName()); + return LocalisationUtils.format("item.ga_essence.material.name", material.getLocalizedName()); } @Override diff --git a/src/main/java/gregicadditions/integrations/mysticalagriculture/items/ItemTierSeed.java b/src/main/java/gregicadditions/integrations/mysticalagriculture/items/ItemTierSeed.java index 5adb9f569..4aa0de3b1 100644 --- a/src/main/java/gregicadditions/integrations/mysticalagriculture/items/ItemTierSeed.java +++ b/src/main/java/gregicadditions/integrations/mysticalagriculture/items/ItemTierSeed.java @@ -6,6 +6,7 @@ import com.blakebr0.mysticalagriculture.items.ItemSeed; import com.blakebr0.mysticalagriculture.lib.Tooltips; import gregtech.api.unification.material.type.Material; +import gregtech.api.util.LocalisationUtils; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; @@ -31,9 +32,9 @@ public ItemTierSeed(Block crops, Material material, int tier) { } @Override - @SideOnly(Side.CLIENT) + @SuppressWarnings("deprecation") public String getItemStackDisplayName(ItemStack stack) { - return I18n.format("item.ga_seed.material.name", material.getLocalizedName()); + return LocalisationUtils.format("item.ga_seed.material.name", material.getLocalizedName()); } @Override diff --git a/src/main/java/gregicadditions/item/behaviors/WasteBehavior.java b/src/main/java/gregicadditions/item/behaviors/WasteBehavior.java index da2d6f5b4..a198fdceb 100644 --- a/src/main/java/gregicadditions/item/behaviors/WasteBehavior.java +++ b/src/main/java/gregicadditions/item/behaviors/WasteBehavior.java @@ -3,10 +3,9 @@ import gregtech.api.items.metaitem.stats.IItemColorProvider; import gregtech.api.items.metaitem.stats.IItemNameProvider; import gregtech.api.unification.material.type.Material; +import gregtech.api.util.LocalisationUtils; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WasteBehavior implements IItemColorProvider, IItemNameProvider { @@ -41,11 +40,11 @@ public int getItemStackColor(ItemStack itemStack, int i) { } @Override - @SideOnly(Side.CLIENT) + @SuppressWarnings("deprecation") public String getItemStackDisplayName(ItemStack itemStack, String unlocalizedName) { if (material != null) - return I18n.format(unlocalizedName, material.getLocalizedName()); + return LocalisationUtils.format(unlocalizedName, material.getLocalizedName()); else - return I18n.format(unlocalizedName, I18n.format(this.unlocalizedName)); + return LocalisationUtils.format(unlocalizedName, I18n.format(this.unlocalizedName)); } } diff --git a/src/main/java/gregicadditions/pipelike/opticalfiber/ItemBlockOpticalFiber.java b/src/main/java/gregicadditions/pipelike/opticalfiber/ItemBlockOpticalFiber.java index 89880deba..84bd54944 100644 --- a/src/main/java/gregicadditions/pipelike/opticalfiber/ItemBlockOpticalFiber.java +++ b/src/main/java/gregicadditions/pipelike/opticalfiber/ItemBlockOpticalFiber.java @@ -4,7 +4,7 @@ import gregtech.api.GTValues; import gregtech.api.pipenet.block.ItemBlockPipe; import gregtech.api.unification.ore.OrePrefix; -import gregtech.api.util.GTUtility; +import gregtech.api.util.LocalisationUtils; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; @@ -21,12 +21,12 @@ public ItemBlockOpticalFiber(BlockOpticalFiber block) { super(block); } - @SideOnly(Side.CLIENT) + @SuppressWarnings("deprecation") public String getItemStackDisplayName(ItemStack stack) { OpticalFiberSize pipeType = blockPipe.getItemPipeType(stack); OrePrefix orePrefix = pipeType.getOrePrefix(); String specfiedUnlocalized = "item.oreprefix." + orePrefix.name(); - return I18n.format(specfiedUnlocalized); + return LocalisationUtils.format(specfiedUnlocalized); } @Override From ec067f16b94c3541d5ac5358d7134ea7f0c0d186 Mon Sep 17 00:00:00 2001 From: Florian Kostenzer Date: Fri, 30 Jul 2021 15:04:40 +0200 Subject: [PATCH 2/2] Fix missed I18n call --- src/main/java/gregicadditions/item/behaviors/WasteBehavior.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregicadditions/item/behaviors/WasteBehavior.java b/src/main/java/gregicadditions/item/behaviors/WasteBehavior.java index a198fdceb..0d9fc420b 100644 --- a/src/main/java/gregicadditions/item/behaviors/WasteBehavior.java +++ b/src/main/java/gregicadditions/item/behaviors/WasteBehavior.java @@ -45,6 +45,6 @@ public String getItemStackDisplayName(ItemStack itemStack, String unlocalizedNam if (material != null) return LocalisationUtils.format(unlocalizedName, material.getLocalizedName()); else - return LocalisationUtils.format(unlocalizedName, I18n.format(this.unlocalizedName)); + return LocalisationUtils.format(unlocalizedName, LocalisationUtils.format(this.unlocalizedName)); } }