upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-11 15:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove i18n. it's dumb shit

Browse Source
This commit is contained in:
GlodBlock committed 2022-06-05 23:39:51 +08:00
1 parent c7b2ef5511
commit 7c4a3fa349
5 files changed
+11 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java
+1 -2
View File
@@ -154,8 +154,7 @@ public class ContainerFluidPatternTerminal extends FCBasePartContainer implement
super.doAction(player, action, slotId, id);
return;
}
if ((slot instanceof SlotFakeCraftingMatrix || slot instanceof SlotPatternOutputs) && stack != null
&& (stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isContainer(stack))) {
if ((slot instanceof SlotFakeCraftingMatrix || slot instanceof SlotPatternOutputs) && (stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isContainer(stack))) {
FluidStack fluid = null;
switch (action) {
case PICKUP_OR_SET_DOWN:
src/main/java/com/glodblock/github/common/item/ItemBasicFluidStorageCell.java
+2 -2
View File
@@ -29,12 +29,12 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.ForgeEventFactory;
@@ -102,7 +102,7 @@ public class ItemBasicFluidStorageCell extends AEBaseItem implements IStorageFlu
@Override
public String getItemStackDisplayName(ItemStack stack) {
return I18n.format("item.fluid_storage." + this.totalBytes / 1024 + ".name");
return StatCollector.translateToLocalFormatted("item.fluid_storage." + this.totalBytes / 1024 + ".name");
}
@Override
src/main/java/com/glodblock/github/common/item/ItemBasicFluidStoragePart.java
+2 -2
View File
@@ -7,11 +7,11 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.I18n;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import java.util.HashMap;
import java.util.List;
@@ -39,7 +39,7 @@ public class ItemBasicFluidStoragePart extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
int meta = stack.getItemDamage();
return I18n.format("item.fluid_part." + meta + ".name");
return StatCollector.translateToLocalFormatted("item.fluid_part." + meta + ".name");
}
@Override
src/main/java/com/glodblock/github/common/item/ItemFluidDrop.java
+3 -3
View File
@@ -11,7 +11,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.I18n;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -19,6 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@@ -46,7 +46,7 @@ public class ItemFluidDrop extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
FluidStack fluid = getFluidStack(stack);
return I18n.format("item.fluid_drop.name", fluid == null ? "???" : fluid.getLocalizedName());
return StatCollector.translateToLocalFormatted("item.fluid_drop.name", fluid == null ? "???" : fluid.getLocalizedName());
}
@Override
@@ -57,7 +57,7 @@ public class ItemFluidDrop extends Item {
if (fluid != null) {
tooltip.add(String.format(EnumChatFormatting.GRAY + "%s, 1 mB", fluid.getLocalizedName()));
} else {
tooltip.add(EnumChatFormatting.RED + I18n.format(NameConst.TT_INVALID_FLUID));
tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted(NameConst.TT_INVALID_FLUID));
}
}
src/main/java/com/glodblock/github/common/item/ItemFluidPacket.java
+3 -3
View File
@@ -9,13 +9,13 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -43,11 +43,11 @@ public class ItemFluidPacket extends Item {
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean flags) {
FluidStack fluid = getFluidStack(stack);
if (fluid != null) {
for (String line : I18n.format(NameConst.TT_FLUID_PACKET).split("\\\\n")) {
for (String line : StatCollector.translateToLocalFormatted(NameConst.TT_FLUID_PACKET).split("\\\\n")) {
tooltip.add(EnumChatFormatting.GRAY + line);
}
} else {
tooltip.add(EnumChatFormatting.RED + I18n.format(NameConst.TT_INVALID_FLUID));
tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted(NameConst.TT_INVALID_FLUID));
}
}