Skip to content

Commit 909b4f9

Browse files
committed
Now the code is back to I18n with a SideOnly annotation because apparently I only want to translate it on the client (what makes sense)
1 parent 58ce671 commit 909b4f9

9 files changed

Lines changed: 35 additions & 10 deletions

File tree

src/main/java/mayus/zpmmod/craftingItems/ItemDiaHardenedIron.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.item.ItemStack;
77
import net.minecraft.util.text.TextComponentTranslation;
88
import net.minecraft.world.World;
9+
import net.minecraftforge.fml.relauncher.Side;
10+
import net.minecraftforge.fml.relauncher.SideOnly;
911

1012
import javax.annotation.Nullable;
1113
import java.util.List;
@@ -18,9 +20,10 @@ public ItemDiaHardenedIron()
1820
setTranslationKey("diamond_hardened_iron");
1921
}
2022

23+
@SideOnly(Side.CLIENT)
2124
@Override
2225
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
23-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.craftingItem").getFormattedText());
26+
tooltip.add(I18n.format("item.zpmmod.tooltip.craftingItem"));
2427
}
2528
}
2629

src/main/java/mayus/zpmmod/craftingItems/ItemDimObsidian.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.item.ItemStack;
77
import net.minecraft.util.text.TextComponentTranslation;
88
import net.minecraft.world.World;
9+
import net.minecraftforge.fml.relauncher.Side;
10+
import net.minecraftforge.fml.relauncher.SideOnly;
911

1012
import javax.annotation.Nullable;
1113
import java.util.List;
@@ -18,9 +20,10 @@ public ItemDimObsidian()
1820
setTranslationKey("dimensional_obsidian");
1921
}
2022

23+
@SideOnly(Side.CLIENT)
2124
@Override
2225
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
23-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.craftingItem").getFormattedText());
26+
tooltip.add(I18n.format("item.zpmmod.tooltip.craftingItem"));
2427
}
2528

2629
}

src/main/java/mayus/zpmmod/craftingItems/ItemElectrode.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.item.ItemStack;
77
import net.minecraft.util.text.TextComponentTranslation;
88
import net.minecraft.world.World;
9+
import net.minecraftforge.fml.relauncher.Side;
10+
import net.minecraftforge.fml.relauncher.SideOnly;
911

1012
import javax.annotation.Nullable;
1113
import java.util.List;
@@ -16,8 +18,9 @@ public ItemElectrode()
1618
setTranslationKey("electrode");
1719
}
1820

21+
@SideOnly(Side.CLIENT)
1922
@Override
2023
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
21-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.craftingItem").getFormattedText());
24+
tooltip.add(I18n.format("item.zpmmod.tooltip.craftingItem"));
2225
}
2326
}

src/main/java/mayus/zpmmod/craftingItems/ItemEnderstar.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.item.ItemStack;
77
import net.minecraft.util.text.TextComponentTranslation;
88
import net.minecraft.world.World;
9+
import net.minecraftforge.fml.relauncher.Side;
10+
import net.minecraftforge.fml.relauncher.SideOnly;
911

1012
import javax.annotation.Nullable;
1113
import java.util.List;
@@ -16,8 +18,9 @@ public ItemEnderstar()
1618
setTranslationKey("enderstar");
1719
}
1820

21+
@SideOnly(Side.CLIENT)
1922
@Override
2023
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
21-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.craftingItem").getFormattedText());
24+
tooltip.add(I18n.format("item.zpmmod.tooltip.craftingItem"));
2225
}
2326
}

src/main/java/mayus/zpmmod/craftingItems/ItemHardenedDimStar.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.item.ItemStack;
77
import net.minecraft.util.text.TextComponentTranslation;
88
import net.minecraft.world.World;
9+
import net.minecraftforge.fml.relauncher.Side;
10+
import net.minecraftforge.fml.relauncher.SideOnly;
911

1012
import javax.annotation.Nullable;
1113
import java.util.List;
@@ -17,9 +19,10 @@ public ItemHardenedDimStar()
1719
setTranslationKey("hardened_dimensional_star");
1820
}
1921

22+
@SideOnly(Side.CLIENT)
2023
@Override
2124
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
22-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.craftingItem").getFormattedText());
25+
tooltip.add(I18n.format("item.zpmmod.tooltip.craftingItem"));
2326
}
2427

2528
}

src/main/java/mayus/zpmmod/craftingItems/ItemZPMcasing.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.item.ItemStack;
77
import net.minecraft.util.text.TextComponentTranslation;
88
import net.minecraft.world.World;
9+
import net.minecraftforge.fml.relauncher.Side;
10+
import net.minecraftforge.fml.relauncher.SideOnly;
911

1012
import javax.annotation.Nullable;
1113
import java.util.List;
@@ -17,8 +19,9 @@ public ItemZPMcasing()
1719
setTranslationKey("zpm_casing");
1820
}
1921

22+
@SideOnly(Side.CLIENT)
2023
@Override
2124
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
22-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.craftingItem").getFormattedText());
25+
tooltip.add(I18n.format("item.zpmmod.tooltip.craftingItem"));
2326
}
2427
}

src/main/java/mayus/zpmmod/craftingItems/ItemZPMcore.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.item.ItemStack;
77
import net.minecraft.util.text.TextComponentTranslation;
88
import net.minecraft.world.World;
9+
import net.minecraftforge.fml.relauncher.Side;
10+
import net.minecraftforge.fml.relauncher.SideOnly;
911

1012
import javax.annotation.Nullable;
1113
import java.util.List;
@@ -17,8 +19,9 @@ public ItemZPMcore()
1719
setTranslationKey("zpm_core");
1820
}
1921

22+
@SideOnly(Side.CLIENT)
2023
@Override
2124
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
22-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.craftingItem").getFormattedText());
25+
tooltip.add(I18n.format("item.zpmmod.tooltip.craftingItem"));
2326
}
2427
}

src/main/java/mayus/zpmmod/craftingItems/ItemZPMholder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.item.ItemStack;
77
import net.minecraft.util.text.TextComponentTranslation;
88
import net.minecraft.world.World;
9+
import net.minecraftforge.fml.relauncher.Side;
10+
import net.minecraftforge.fml.relauncher.SideOnly;
911

1012
import javax.annotation.Nullable;
1113
import java.util.List;
@@ -17,8 +19,9 @@ public ItemZPMholder()
1719
setTranslationKey("zpm_holder");
1820
}
1921

22+
@SideOnly(Side.CLIENT)
2023
@Override
2124
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
22-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.craftingItem").getFormattedText());
25+
tooltip.add(I18n.format("item.zpmmod.tooltip.craftingItem"));
2326
}
2427
}

src/main/java/mayus/zpmmod/itemZPM/ItemZPM.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ public int getRGBDurabilityForDisplay(ItemStack stack) {
8686
}
8787

8888
@Override
89+
@SideOnly(Side.CLIENT)
8990
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
90-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.storedEnergy").getFormattedText() + " " + getEnergyStorage(stack).getEnergyStored() + " RF");
91-
tooltip.add(new TextComponentTranslation("item.zpmmod.tooltip.controllerInstructions").getFormattedText());
91+
tooltip.add(I18n.format("item.zpmmod.tooltip.storedEnergy") + " " + getEnergyStorage(stack).getEnergyStored() + " RF");
92+
tooltip.add(I18n.format("item.zpmmod.tooltip.controllerInstructions"));
9293
}
9394
}

0 commit comments

Comments
 (0)