diff --git a/gradle.properties b/gradle.properties index 4dd32989..c3c949ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ minecraft_version=1.12.2 mappings_version=stable_39 forge_version=14.23.5.2847 mod_version=9.8.8 -homebaked=024-sddsd2332 +homebaked=030-sddsd2332 mcmp_version=2.5.3 jei_version=4.15.0.289 diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index b15f89f3..dec04cd1 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -276,6 +276,13 @@ public void registerItemRenders() { registerItemRender(MekanismItems.TierInstaller); registerItemRender(MekanismItems.OtherDust); + registerItemRender(MekanismItems.PlutoniumPellet); + registerItemRender(MekanismItems.AntimatterPellet); + registerItemRender(MekanismItems.ReprocessedFissileFragment); + registerItemRender(MekanismItems.YellowCakeUranium); + registerItemRender(MekanismItems.PoloniumPellet); + + // registerItemRender(MekanismItems.MekaSuitHelmet); // registerItemRender(MekanismItems.MekaSuitChest); diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index e4b150bb..bb0ecf46 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -44,8 +44,7 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { String capacityInfo = stored + " / " + (tileEntity.tier.getStorage() == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : tileEntity.tier.getStorage()); fontRenderer.drawString(tileEntity.getName(), (xSize / 2) - (fontRenderer.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); fontRenderer.drawString(capacityInfo, 45, 40, 0x33ff99); - renderScaledText(LangUtils.localize("gui.gas") + ": " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() - : LangUtils.localize("gui.none")), 45, 49, 0x33ff99, 112); + renderScaledText(LangUtils.localize("gui.gas") + ": " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() : LangUtils.localize("gui.none")), 45, 49, 0x33ff99, 112); fontRenderer.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); String name = LangUtils.localize(tileEntity.dumping.getLangKey()); fontRenderer.drawString(name, 156 - fontRenderer.getStringWidth(name), 73, 0x404040); diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java index 8c490be4..669503df 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -18,7 +18,7 @@ public class ChemicalWasherRecipeCategory registry) { // registry.register(init(MekaSuitHelmet, "MekaSuitHelmet")); // registry.register(init(MekaSuitChest, "MekaSuitChest")); + + registry.register(init(PlutoniumPellet,"PlutoniumPellet")); + registry.register(init(AntimatterPellet,"AntimatterPellet")); + registry.register(init(ReprocessedFissileFragment,"ReprocessedFissileFragment")); + registry.register(init(YellowCakeUranium,"YellowCakeUranium")); + registry.register(init(PoloniumPellet, "PoloniumPellet")); } public static Item init(Item item, String name) { diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java index 18dc2112..4193fb47 100644 --- a/src/main/java/mekanism/common/block/BlockGlowPanel.java +++ b/src/main/java/mekanism/common/block/BlockGlowPanel.java @@ -45,7 +45,7 @@ public class BlockGlowPanel extends BlockTileDrops implements ITileEntityProvide public BlockGlowPanel() { super(Material.PISTON); - setCreativeTab(Mekanism.tabMekanism); + setCreativeTab(Mekanism.tabMekanismAddition); setHardness(1F); setResistance(10F); } diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 36ff1782..5ac6ab39 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -22,7 +22,7 @@ public class BlockObsidianTNT extends Block { public BlockObsidianTNT() { super(Material.TNT); - setCreativeTab(Mekanism.tabMekanism); + setCreativeTab(Mekanism.tabMekanismAddition); } @Override diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 00059ce2..9d3e924e 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -30,7 +30,7 @@ public BlockPlastic(PlasticBlockType blockType) { type = blockType; setHardness(type == PlasticBlockType.REINFORCED ? 50F : 5F); setResistance(type == PlasticBlockType.REINFORCED ? 2000F : 10F); - setCreativeTab(Mekanism.tabMekanism); + setCreativeTab(Mekanism.tabMekanismAddition); if (type == PlasticBlockType.SLICK) { slipperiness = 0.98F; } diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index ab6b526a..047c23d5 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -22,7 +22,7 @@ public BlockPlasticFence() { super(BlockPlastic.PLASTIC, BlockPlastic.PLASTIC.getMaterialMapColor()); setHardness(5F); setResistance(10F); - setCreativeTab(Mekanism.tabMekanism); + setCreativeTab(Mekanism.tabMekanismAddition); } @Nonnull diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index bf313b4c..c93e8400 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemBalloon extends ItemMekanism implements IMetaItem { +public class ItemBalloon extends ItemMekanismAddition implements IMetaItem { public ItemBalloon() { super(); diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 7e18e1c3..98afbd17 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -103,6 +103,45 @@ public int getMetadata(int i) { return i; } + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + BasicBlockType type = BasicBlockType.get(itemstack); + if (type == BasicBlockType.BIN) { + BinTier tier= BinTier.values()[getBaseTier(itemstack).ordinal()]; + if (tier == BinTier.BASIC){ + return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == BinTier.ADVANCED){ + return EnumColor.RED + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == BinTier.ELITE){ + return EnumColor.AQUA + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == BinTier.ULTIMATE){ + return EnumColor.PURPLE + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else return EnumColor.ORANGE + LangUtils.localize("tile.BasicBlock.Bin" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (type == BasicBlockType.INDUCTION_CELL){ + InductionCellTier tier = InductionCellTier.values()[getBaseTier(itemstack).ordinal()]; + if (tier == InductionCellTier.BASIC){ + return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.BasicBlock2.InductionCell"+ getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == InductionCellTier.ADVANCED){ + return EnumColor.RED + LangUtils.localize("tile.BasicBlock2.InductionCell"+ getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == InductionCellTier.ELITE){ + return EnumColor.AQUA + LangUtils.localize("tile.BasicBlock2.InductionCell"+ getBaseTier(itemstack).getSimpleName() + ".name"); + }else return EnumColor.PURPLE + LangUtils.localize("tile.BasicBlock2.InductionCell"+ getBaseTier(itemstack).getSimpleName() + ".name"); + + + }else if (type == BasicBlockType.INDUCTION_PROVIDER){ + InductionProviderTier tier = InductionProviderTier.values()[getBaseTier(itemstack).ordinal()]; + if (tier == InductionProviderTier.BASIC){ + return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.BasicBlock2.InductionProvider"+ getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == InductionProviderTier.ADVANCED){ + return EnumColor.RED + LangUtils.localize("tile.BasicBlock2.InductionProvider"+ getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == InductionProviderTier.ELITE){ + return EnumColor.AQUA + LangUtils.localize("tile.BasicBlock2.InductionProvider"+ getBaseTier(itemstack).getSimpleName() + ".name"); + }return EnumColor.PURPLE + LangUtils.localize("tile.BasicBlock2.InductionProvider"+ getBaseTier(itemstack).getSimpleName() + ".name"); + } + return super.getItemStackDisplayName(itemstack); + } + @Override @SideOnly(Side.CLIENT) public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 3d252a05..45298c25 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -103,7 +103,16 @@ public ItemStack getUnchargedItem(EnergyCubeTier tier) { @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { - return LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name"); + EnergyCubeTier tier = EnergyCubeTier.values()[getBaseTier(itemstack).ordinal()]; + if (tier == EnergyCubeTier.BASIC) { + return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == EnergyCubeTier.ADVANCED){ + return EnumColor.RED + LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == EnergyCubeTier.ELITE){ + return EnumColor.AQUA + LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == EnergyCubeTier.ULTIMATE){ + return EnumColor.PURPLE +LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else return EnumColor.ORANGE + LangUtils.localize("tile.EnergyCube" + getBaseTier(itemstack).getSimpleName() + ".name"); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index c5915f2d..6b6b14dd 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -72,7 +72,17 @@ public int getMetadata(int i) { @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { - return LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + GasTankTier tier = GasTankTier.values()[getBaseTier(itemstack).ordinal()]; + if (tier == GasTankTier.BASIC){ + return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == GasTankTier.ADVANCED){ + return EnumColor.RED + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == GasTankTier.ELITE){ + return EnumColor.AQUA + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == GasTankTier.ULTIMATE){ + return EnumColor.PURPLE + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else return EnumColor.ORANGE + LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 14ff932f..6982083b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -169,7 +169,7 @@ public String getTranslationKey(ItemStack itemstack) { @Override public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { MachineType type = MachineType.get(itemstack); - if (type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY|| type == MachineType.ULTIMATE_FACTORY|| type == MachineType.CREATIVE_FACTORY) { + if (type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY || type == MachineType.ULTIMATE_FACTORY || type == MachineType.CREATIVE_FACTORY) { BaseTier tier = type.factoryTier.getBaseTier(); RecipeType recipeType = getRecipeTypeOrNull(itemstack); if (recipeType != null) { @@ -177,10 +177,28 @@ public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { if (LangUtils.canLocalize(langKey)) { return LangUtils.localize(langKey); } - return tier.getLocalizedName() + recipeType.getLocalizedName() + super.getItemStackDisplayName(itemstack); + if (type == MachineType.BASIC_FACTORY){ + return EnumColor.BRIGHT_GREEN + tier.getLocalizedName() + recipeType.getLocalizedName() + super.getItemStackDisplayName(itemstack); + }else if (type == MachineType.ADVANCED_FACTORY){ + return EnumColor.RED +tier.getLocalizedName() + recipeType.getLocalizedName() + super.getItemStackDisplayName(itemstack); + }else if (type == MachineType.ELITE_FACTORY){ + return EnumColor.AQUA +tier.getLocalizedName() + recipeType.getLocalizedName() + super.getItemStackDisplayName(itemstack); + }else if (type == MachineType.ULTIMATE_FACTORY){ + return EnumColor.PURPLE +tier.getLocalizedName() + recipeType.getLocalizedName() + super.getItemStackDisplayName(itemstack); + } else return EnumColor.ORANGE +tier.getLocalizedName() + recipeType.getLocalizedName() + super.getItemStackDisplayName(itemstack); + } } else if (type == MachineType.FLUID_TANK) { - return LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + FluidTankTier tier = FluidTankTier.values()[getBaseTier(itemstack).ordinal()]; + if (tier == FluidTankTier.BASIC){ + return EnumColor.BRIGHT_GREEN +LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == FluidTankTier.ADVANCED){ + return EnumColor.RED + LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == FluidTankTier.ELITE){ + return EnumColor.AQUA + LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else if (tier == FluidTankTier.ULTIMATE){ + return EnumColor.PURPLE + LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getSimpleName() + ".name"); + }else return EnumColor.ORANGE + LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getSimpleName() + ".name"); } return super.getItemStackDisplayName(itemstack); } diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java index cf6209a9..379fe5a5 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -9,6 +9,7 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.base.ITierItem; +import mekanism.common.block.states.BlockStateTransmitter; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.multipart.MultipartMekanism; @@ -65,6 +66,25 @@ public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer play return place; } + + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + TransmitterType type = TransmitterType.get(itemstack.getItemDamage()); + BaseTier tier = getBaseTier(itemstack); + boolean not1 = type != TransmitterType.RESTRICTIVE_TRANSPORTER; + boolean not2 = type != TransmitterType.DIVERSION_TRANSPORTER; + if (tier == BaseTier.BASIC && (not1 && not2)){ + return EnumColor.BRIGHT_GREEN + LangUtils.localize("tile.Transmitter." + getBaseTier(itemstack).getSimpleName() + type.getTranslationKey() + ".name"); + }else if (tier == BaseTier.ADVANCED && (not1 && not2)){ + return EnumColor.RED + LangUtils.localize("tile.Transmitter." + getBaseTier(itemstack).getSimpleName() + type.getTranslationKey() + ".name"); + }else if (tier == BaseTier.ELITE && (not1 && not2)){ + return EnumColor.AQUA + LangUtils.localize("tile.Transmitter." + getBaseTier(itemstack).getSimpleName() + type.getTranslationKey() + ".name"); + }else if (tier == BaseTier.ULTIMATE && (not1 && not2)){ + return EnumColor.PURPLE + LangUtils.localize("tile.Transmitter." + getBaseTier(itemstack).getSimpleName() + type.getTranslationKey() + ".name"); + }else return LangUtils.localize("tile.Transmitter." + type.getTranslationKey() + ".name"); + } + @Override @SideOnly(Side.CLIENT) public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull List list, @Nonnull ITooltipFlag flag) { @@ -72,8 +92,7 @@ public void addInformation(@Nonnull ItemStack itemstack, World world, @Nonnull L TransmissionType transmission = TransmitterType.values()[itemstack.getItemDamage()].getTransmission(); BaseTier tier = getBaseTier(itemstack); if (transmission == TransmissionType.ENERGY) { - list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + - MekanismUtils.getEnergyDisplay(CableTier.get(tier).getCableCapacity()) + "/t"); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(CableTier.get(tier).getCableCapacity()) + "/t"); } else if (transmission == TransmissionType.FLUID) { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + PipeTier.get(tier).getPipeCapacity() + "mB/t"); list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.pumpRate") + ": " + EnumColor.GREY + PipeTier.get(tier).getPipePullAmount() + "mB/t"); diff --git a/src/main/java/mekanism/common/item/ItemCanteen.java b/src/main/java/mekanism/common/item/ItemCanteen.java index 17ce6ad4..4b8855cd 100644 --- a/src/main/java/mekanism/common/item/ItemCanteen.java +++ b/src/main/java/mekanism/common/item/ItemCanteen.java @@ -1,6 +1,7 @@ package mekanism.common.item; +import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; @@ -44,11 +45,12 @@ public void addInformation(ItemStack itemstack, World world, List list, GasStack gasStack = getGas(itemstack); if (gasStack == null) { list.add(LangUtils.localize("tooltip.noGas") + "."); + list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip.canteen1"),itemstack)); + list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip.canteen2"),itemstack)); } else { list.add(LangUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); } - list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip.canteen1"),itemstack)); - list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip.canteen2"),itemstack)); + } @Override @@ -116,22 +118,6 @@ public int getStored(ItemStack itemstack) { return getGas(itemstack) != null ? getGas(itemstack).amount : 0; } - public void toggleFlowing(ItemStack stack) { - setFlowing(stack, !getFlowing(stack)); - } - - public boolean getFlowing(ItemStack stack) { - return ItemDataUtils.getBoolean(stack, "flowing"); - } - - public String getFlowingStr(ItemStack stack) { - boolean flowing = getFlowing(stack); - return LangUtils.localize("tooltip." + (flowing ? "yes" : "no")); - } - - public void setFlowing(ItemStack stack, boolean flowing) { - ItemDataUtils.setBoolean(stack, "flowing", flowing); - } @Override public boolean canReceiveGas(ItemStack itemstack, Gas type) { @@ -159,11 +145,6 @@ public void setGas(ItemStack itemstack, GasStack stack) { } } - public ItemStack getEmptyItem() { - ItemStack empty = new ItemStack(this); - setGas(empty, null); - return empty; - } @Override public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list) { diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index f642ed5b..b5a5658d 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -1,12 +1,17 @@ package mekanism.common.item; import javax.annotation.Nonnull; + +import mekanism.api.EnumColor; import mekanism.common.base.IMetaItem; import mekanism.common.tier.BaseTier; +import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import java.util.Locale; + public class ItemControlCircuit extends ItemMekanism implements IMetaItem { public ItemControlCircuit() { @@ -38,4 +43,20 @@ public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list, ITooltipFlag flag) { diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index b5d7f173..bced79cf 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -1,8 +1,10 @@ package mekanism.common.item; +import mekanism.api.EnumColor; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; +import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -17,6 +19,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class ItemGasMask extends ItemArmor { public ItemGasMask() { @@ -60,4 +64,10 @@ public void onEntityAttacked(LivingAttackEvent event) { } } } + + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + return EnumColor.AQUA + LangUtils.localize("item.GasMask.name"); + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 610248cc..c1c5ebeb 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -2,6 +2,8 @@ import java.util.List; import javax.annotation.Nonnull; + +import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; @@ -35,7 +37,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem { public ItemGaugeDropper() { super(); setMaxStackSize(1); - setCreativeTab(Mekanism.tabMekanism); } public ItemStack getEmptyItem() { @@ -51,6 +52,13 @@ public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList list, ITooltipFlag flag) { diff --git a/src/main/java/mekanism/common/item/ItemMekTool.java b/src/main/java/mekanism/common/item/ItemMekTool.java index c0b076c7..54a72f7d 100644 --- a/src/main/java/mekanism/common/item/ItemMekTool.java +++ b/src/main/java/mekanism/common/item/ItemMekTool.java @@ -50,6 +50,12 @@ public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack) { return state.getBlock() != Blocks.BEDROCK; } + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + return EnumColor.PURPLE + LangUtils.localize("item.MekTool.name"); + } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { @@ -60,7 +66,7 @@ public void addInformation(ItemStack itemstack, World world, List list, list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip.MekTool1"),itemstack)); list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip.MekTool2"),itemstack)); list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip.MekTool3"),itemstack)); - list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip.MekTool4"),itemstack)); + list.addAll(MekanismUtils.splitTooltip(EnumColor.RED + LangUtils.localize("tooltip.MekTool4"),itemstack)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemMekanism.java b/src/main/java/mekanism/common/item/ItemMekanism.java index 1c4bf2f6..f981c069 100644 --- a/src/main/java/mekanism/common/item/ItemMekanism.java +++ b/src/main/java/mekanism/common/item/ItemMekanism.java @@ -1,7 +1,13 @@ package mekanism.common.item; +import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; +import mekanism.common.util.LangUtils; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; public class ItemMekanism extends Item { @@ -9,4 +15,60 @@ public ItemMekanism() { super(); setCreativeTab(Mekanism.tabMekanism); } + + @Nonnull + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + if (this == MekanismItems.ElectrolyticCore){ + return EnumColor.YELLOW + LangUtils.localize("item.ElectrolyticCore.name"); + }else if (this == MekanismItems.TeleportationCore){ + return EnumColor.AQUA + LangUtils.localize("item.TeleportationCore.name"); + }else if (this == MekanismItems.AntimatterPellet){ + return EnumColor.PURPLE + LangUtils.localize("item.AntimatterPellet.name"); + }else if (this == MekanismItems.PlutoniumPellet){ + return EnumColor.GREY + LangUtils.localize("item.PlutoniumPellet.name"); + }else if (this == MekanismItems.ReprocessedFissileFragment){ + return EnumColor.AQUA + LangUtils.localize("item.ReprocessedFissileFragment.name"); + }else if (this == MekanismItems.PoloniumPellet){ + return EnumColor.INDIGO +LangUtils.localize("item.PoloniumPellet.name"); + }else if (this == MekanismItems.YellowCakeUranium){ + return EnumColor.YELLOW + LangUtils.localize("item.YellowCakeUranium.name"); + }else if (this == MekanismItems.EnrichedAlloy){ + return EnumColor.RED + LangUtils.localize("item.EnrichedAlloy.name"); + }else if (this == MekanismItems.ReinforcedAlloy){ + return EnumColor.AQUA + LangUtils.localize("item.ReinforcedAlloy.name"); + }else if (this == MekanismItems.AtomicAlloy){ + return EnumColor.PURPLE + LangUtils.localize("item.AtomicAlloy.name"); + }else if (this == MekanismItems.CosmicAlloy){ + return EnumColor.ORANGE + LangUtils.localize("item.CosmicAlloy.name"); + }else if (this == MekanismItems.AtomicDisassembler){ + return EnumColor.AQUA + LangUtils.localize("item.AtomicDisassembler.name"); + }else if (this == MekanismItems.Canteen){ + return EnumColor.YELLOW + LangUtils.localize("item.Canteen.name"); + }else if (this == MekanismItems.ConfigurationCard){ + return EnumColor.YELLOW + LangUtils.localize("item.ConfigurationCard.name"); + }else if (this == MekanismItems.Configurator){ + return EnumColor.AQUA + LangUtils.localize("item.Configurator.name"); + }else if (this == MekanismItems.Dictionary){ + return EnumColor.YELLOW + LangUtils.localize("item.Dictionary.name"); + }else if (this == MekanismItems.ElectricBow){ + return EnumColor.AQUA + LangUtils.localize("item.ElectricBow.name"); + }else if (this == MekanismItems.EnergyTablet){ + return EnumColor.YELLOW + LangUtils.localize("item.EnergyTablet.name"); + }else if (this == MekanismItems.Flamethrower){ + return EnumColor.AQUA + LangUtils.localize("item.Flamethrower.name"); + }else if (this == MekanismItems.SpeedUpgrade){ + return EnumColor.YELLOW + LangUtils.localize("item.SpeedUpgrade.name"); + }else if (this == MekanismItems.EnergyUpgrade){ + return EnumColor.YELLOW + LangUtils.localize("item.EnergyUpgrade.name"); + }else if (this == MekanismItems.FilterUpgrade){ + return EnumColor.YELLOW + LangUtils.localize("item.FilterUpgrade.name"); + }else if (this == MekanismItems.GasUpgrade){ + return EnumColor.YELLOW + LangUtils.localize("item.GasUpgrade.name"); + }else if (this == MekanismItems.MufflingUpgrade){ + return EnumColor.YELLOW + LangUtils.localize("item.MufflingUpgrade.name"); + }else if (this == MekanismItems.AnchorUpgrade){ + return EnumColor.YELLOW + LangUtils.localize("item.AnchorUpgrade.name"); + }else + return super.getItemStackDisplayName(itemstack); + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/item/ItemMekanismAddition.java b/src/main/java/mekanism/common/item/ItemMekanismAddition.java new file mode 100644 index 00000000..14328672 --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemMekanismAddition.java @@ -0,0 +1,12 @@ +package mekanism.common.item; + +import mekanism.common.Mekanism; +import net.minecraft.item.Item; + +public class ItemMekanismAddition extends Item { + + public ItemMekanismAddition() { + super(); + setCreativeTab(Mekanism.tabMekanismAddition); + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 210b4803..09e20641 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -13,6 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.capabilities.Capabilities; import mekanism.common.util.CapabilityUtils; +import mekanism.common.util.LangUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -113,4 +114,11 @@ public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPo public boolean canSend(ItemStack itemstack) { return false; } + + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + return EnumColor.YELLOW + LangUtils.localize("item.NetworkReader.name"); + } + } \ No newline at end of file diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java index 44540d86..73887924 100644 --- a/src/main/java/mekanism/common/item/ItemOtherDust.java +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -9,7 +9,7 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem { - public static String[] subtypes = {"Diamond", "Steel", "null", "Sulfur", "Lithium", "RefinedObsidian", "Obsidian", "Fluorite", "FluoriteDust", "CharCoalDust", "PlutoniumPellet", "AntimatterPellet", "ReprocessedFissileFragment","YellowCakeUranium","PoloniumPellet"}; + public static String[] subtypes = {"Diamond", "Steel", "null", "Sulfur", "Lithium", "RefinedObsidian", "Obsidian", "Fluorite", "FluoriteDust", "CharCoalDust"}; public ItemOtherDust() { super(); diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index ab395f2a..fbea2da9 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -121,4 +121,10 @@ public void setFrequency(ItemStack stack, Frequency frequency) { } ItemDataUtils.setCompound(stack, "frequency", frequency.getIdentity().serialize()); } + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + return EnumColor.AQUA + LangUtils.localize("item.PortableTeleporter.name"); + } + } \ No newline at end of file diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index a69e5b99..6806c02f 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -28,6 +28,12 @@ public ItemRobit() { super(100000); } + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + return EnumColor.AQUA + LangUtils.localize("item.Robit.name"); + } + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 04273f3d..8b1dffb5 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -40,6 +40,12 @@ public ItemScubaTank() { setCreativeTab(Mekanism.tabMekanism); } + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + return EnumColor.AQUA + LangUtils.localize("item.ScubaTank.name"); + } + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index 5153b6c3..b8a121c3 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -32,6 +32,12 @@ public boolean canSend(ItemStack itemStack) { return false; } + @Nonnull + @Override + public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { + return EnumColor.YELLOW + LangUtils.localize("item.SeismicReader.name"); + } + @Override public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { if (!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { diff --git a/src/main/java/mekanism/common/item/ItemTierInstaller.java b/src/main/java/mekanism/common/item/ItemTierInstaller.java index 192911c3..8e5c5d25 100644 --- a/src/main/java/mekanism/common/item/ItemTierInstaller.java +++ b/src/main/java/mekanism/common/item/ItemTierInstaller.java @@ -2,10 +2,13 @@ import java.util.Locale; import javax.annotation.Nonnull; + +import mekanism.api.EnumColor; import mekanism.common.base.IMetaItem; import mekanism.common.base.ITierUpgradeable; import mekanism.common.tier.BaseTier; import mekanism.common.tile.prefab.TileEntityBasicBlock; +import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -73,4 +76,19 @@ public void getSubItems(@Nonnull CreativeTabs tabs, @Nonnull NonNullList turbineManager = new MultiblockManager<>("industrialTurbine"); + public static CreativeTabMekanismGenerators tabMekanismGenerators = new CreativeTabMekanismGenerators(); + @SubscribeEvent public static void registerBlocks(RegistryEvent.Register event) { // Register blocks and tile entities diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 9adbcf1a..6f58d271 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -77,7 +77,7 @@ public BlockGenerator() { super(Material.IRON); setHardness(3.5F); setResistance(8F); - setCreativeTab(Mekanism.tabMekanism); + setCreativeTab(MekanismGenerators.tabMekanismGenerators); } public static BlockGenerator getGeneratorBlock(GeneratorBlock block) { diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 79207937..932d61d9 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -44,7 +44,7 @@ public BlockReactor() { super(Material.IRON); setHardness(3.5F); setResistance(8F); - setCreativeTab(Mekanism.tabMekanism); + setCreativeTab(MekanismGenerators.tabMekanismGenerators); } public static BlockReactor getReactorBlock(ReactorBlock block) { diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index a3cc6d54..3681b0f1 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -7,9 +7,9 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.MekanismFluids; -import mekanism.common.item.ItemMekanism; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; +import mekanism.generators.common.tile.ItemMekanismGenerators; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -20,7 +20,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemHohlraum extends ItemMekanism implements IGasItem { +public class ItemHohlraum extends ItemMekanismGenerators implements IGasItem { public static final int MAX_GAS = 100; public static final int TRANSFER_RATE = 1; diff --git a/src/main/java/mekanism/generators/common/tile/ItemMekanismGenerators.java b/src/main/java/mekanism/generators/common/tile/ItemMekanismGenerators.java new file mode 100644 index 00000000..4707d878 --- /dev/null +++ b/src/main/java/mekanism/generators/common/tile/ItemMekanismGenerators.java @@ -0,0 +1,11 @@ +package mekanism.generators.common.tile; + +import mekanism.generators.common.MekanismGenerators; +import net.minecraft.item.Item; + +public class ItemMekanismGenerators extends Item { + public ItemMekanismGenerators(){ + super(); + setCreativeTab(MekanismGenerators.tabMekanismGenerators); + } +} diff --git a/src/main/java/mekanism/tools/common/CreativeTabMekanismTools.java b/src/main/java/mekanism/tools/common/CreativeTabMekanismTools.java new file mode 100644 index 00000000..cbbb2f3a --- /dev/null +++ b/src/main/java/mekanism/tools/common/CreativeTabMekanismTools.java @@ -0,0 +1,22 @@ +package mekanism.tools.common; + +import mekanism.common.Mekanism; +import mekanism.tools.item.ItemMekanismPaxel; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; + + +public class CreativeTabMekanismTools extends CreativeTabs { + + public CreativeTabMekanismTools() { + super("tabMekanismTools"); + } + @Nonnull + @Override + public ItemStack createIcon() { + return new ItemStack(ToolsItem.STEEL_PAXEL.getItem()); + } +} diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 1312472b..37abbae9 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -48,6 +48,8 @@ public class MekanismTools implements IModule { */ public static Version versionNumber = new Version(999, 999, 999); + public static CreativeTabMekanismTools tabMekanismTools = new CreativeTabMekanismTools(); + @SubscribeEvent public static void registerItems(RegistryEvent.Register event) { ToolsItem.registerItems(event.getRegistry()); diff --git a/src/main/java/mekanism/tools/common/ToolsItem.java b/src/main/java/mekanism/tools/common/ToolsItem.java index af3beda1..6a4bf223 100644 --- a/src/main/java/mekanism/tools/common/ToolsItem.java +++ b/src/main/java/mekanism/tools/common/ToolsItem.java @@ -114,7 +114,7 @@ ToolsItem(@Nonnull String name, @Nonnull IT //TODO: Make name be part of item instead of added on this extra layer. // Also make them have underscores rather than "fake" capitalization that is just to make it easier to read in the enum // This note is for 1.14 when we are going to be mass changing ids anyways to flatten things - this.item = item.setTranslationKey(name).setRegistryName(new ResourceLocation(MekanismTools.MODID, name)).setCreativeTab(Mekanism.tabMekanism); + this.item = item.setTranslationKey(name).setRegistryName(new ResourceLocation(MekanismTools.MODID, name)).setCreativeTab(MekanismTools.tabMekanismTools); } @Nonnull diff --git a/src/main/resources/assets/mekanism/gui/nei/guichemicaldissolutionchamber.png b/src/main/resources/assets/mekanism/gui/nei/guichemicaldissolutionchamber.png index 23b6f64e..a4fc430b 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/guichemicaldissolutionchamber.png and b/src/main/resources/assets/mekanism/gui/nei/guichemicaldissolutionchamber.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/guichemicalinfuser.png b/src/main/resources/assets/mekanism/gui/nei/guichemicalinfuser.png index 90f88ab6..46badaa5 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/guichemicalinfuser.png and b/src/main/resources/assets/mekanism/gui/nei/guichemicalinfuser.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/guichemicalwasher.png b/src/main/resources/assets/mekanism/gui/nei/guichemicalwasher.png index 6339fee6..f06a3af5 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/guichemicalwasher.png and b/src/main/resources/assets/mekanism/gui/nei/guichemicalwasher.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/guiisotopiccentrifuge.png b/src/main/resources/assets/mekanism/gui/nei/guiisotopiccentrifuge.png index e8ed9a94..2514d32c 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/guiisotopiccentrifuge.png and b/src/main/resources/assets/mekanism/gui/nei/guiisotopiccentrifuge.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/guirotarycondensentrator.png b/src/main/resources/assets/mekanism/gui/nei/guirotarycondensentrator.png index 5ab57815..4e886f32 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/guirotarycondensentrator.png and b/src/main/resources/assets/mekanism/gui/nei/guirotarycondensentrator.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/guisolarneutronactivator.png b/src/main/resources/assets/mekanism/gui/nei/guisolarneutronactivator.png index a594dc95..a5b8e204 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/guisolarneutronactivator.png and b/src/main/resources/assets/mekanism/gui/nei/guisolarneutronactivator.png differ diff --git a/src/main/resources/assets/mekanism/lang/en_us.lang b/src/main/resources/assets/mekanism/lang/en_us.lang index de3e309c..32132610 100644 --- a/src/main/resources/assets/mekanism/lang/en_us.lang +++ b/src/main/resources/assets/mekanism/lang/en_us.lang @@ -272,11 +272,11 @@ item.uraniumDust.name=Uranium Dust item.fluoriteDust.name=Fluorite item.fluoritedustDust.name=Fluorite Dust item.charcoaldustDust.name=Charcoal Dust -item.plutoniumpelletDust.name=Plutonium Pellet -item.antimatterpelletDust.name=Antimatter Pellet -item.reprocessedfissilefragmentDust.name=Reprocessed Fissile Fragment -item.yellowcakeuraniumDust.name=Yellow Cake Uranium -item.poloniumpelletDust.name=Polonium Pellet +item.PlutoniumPellet.name=Plutonium Pellet +item.AntimatterPellet.name=Antimatter Pellet +item.ReprocessedFissileFragment.name=Reprocessed Fissile Fragment +item.YellowCakeUranium.name=Yellow Cake Uranium +item.PoloniumPellet.name=Polonium Pellet # Clumps item.ironClump.name=Iron Clump @@ -1084,7 +1084,9 @@ reactor.depleted.desc=The reactor has insufficient fuel to sustain a reaction # Creative tab itemGroup.tabMekanism=Mekanism - +itemGroup.tabMekanismTools=Mekanism Tools +itemGroup.tabMekanismGenerators=Mekanism Generators +itemGroup.tabMekanismAddition=Mekanism Addition ############ # GENERATORS ############ diff --git a/src/main/resources/assets/mekanism/lang/zh_cn.lang b/src/main/resources/assets/mekanism/lang/zh_cn.lang index ff6fdef2..634d4ef5 100644 --- a/src/main/resources/assets/mekanism/lang/zh_cn.lang +++ b/src/main/resources/assets/mekanism/lang/zh_cn.lang @@ -25,12 +25,12 @@ item.CompressedDiamond.name=富集钻石 item.CompressedObsidian.name=富集黑曜石 item.PortableTeleporter.name=便携传送器 item.TeleportationCore.name=传送核心 -item.Configurator.name=调整器 +item.Configurator.name=配置器 item.NetworkReader.name=网络读取器 item.WalkieTalkie.name=步话机 -item.Jetpack.name=喷射背包 +item.Jetpack.name=喷气背包 item.ScubaTank.name=潜水罐 -item.GasMask.name=燃气面具 +item.GasMask.name=潜水面罩 item.Dictionary.name=辞典 item.ElectrolyticCore.name=电解核心 item.Sawdust.name=锯屑 @@ -52,7 +52,7 @@ item.GaugeDropper.name=滴量器 item.BioFuel.name=生物燃料 item.CraftingFormula.name=合成配方 item.Canteen.name=水壶 -item.MekTool.name=§4☢☣✪拓荒者工具✪☣☢§f【WIP】 +item.MekTool.name=☢☣✪拓荒者工具✪☣☢ # Control Circuits item.BasicControlCircuit.name=基础控制电路 item.AdvancedControlCircuit.name=高级控制电路 @@ -270,11 +270,11 @@ item.uraniumDust.name=铀粉 item.fluoriteDust.name=氟石 item.fluoritedustDust.name=氟石粉 item.charcoaldustDust.name=木炭粉 -item.plutoniumpelletDust.name=钚球 -item.antimatterpelletDust.name=反物质球 -item.reprocessedfissilefragmentDust.name=再处理裂变碎片 -item.yellowcakeuraniumDust.name=铀黄饼 -item.poloniumpelletDust.name=钋球 +item.PlutoniumPellet.name=钚球 +item.AntimatterPellet.name=反物质球 +item.ReprocessedFissileFragment.name=再处理裂变碎片 +item.YellowCakeUranium.name=铀黄饼 +item.PoloniumPellet.name=钋球 # Clumps item.ironClump.name=铁碎块 @@ -973,7 +973,7 @@ tooltip.AmbientAccumulator=一个能收集当前维度包含的气体[警告！ tooltip.MekTool1=十分强大的挖掘机器 tooltip.MekTool2=当冲满25%以上时，伤害会超级加倍 tooltip.MekTool3=当冲满90%以上时，可能会带有秒杀效果？ -tooltip.MekTool4=§4☢☣✪危险工具，警告！✪☣☢ +tooltip.MekTool4=☢☣✪危险工具，警告！✪☣☢ tooltip.HeatGenerator=一台使用岩浆热量或者其它可燃资源产生能量的发电机。 tooltip.SolarGenerator=一台使用太阳能量发电的发电机。 @@ -1082,6 +1082,9 @@ reactor.depleted.desc=反应没有足够的燃料维持 # Creative tab itemGroup.tabMekanism=通用机械 +itemGroup.tabMekanismTools=通用机械工具 +itemGroup.tabMekanismGenerators=通用机械发电机 +itemGroup.tabMekanismAddition=通用机械附加 ############# # GENERATORS diff --git a/src/main/resources/assets/mekanism/models/item/antimatterpelletdust.json b/src/main/resources/assets/mekanism/models/item/antimatterpellet.json similarity index 100% rename from src/main/resources/assets/mekanism/models/item/antimatterpelletdust.json rename to src/main/resources/assets/mekanism/models/item/antimatterpellet.json diff --git a/src/main/resources/assets/mekanism/models/item/plutoniumpelletdust.json b/src/main/resources/assets/mekanism/models/item/plutoniumpellet.json similarity index 100% rename from src/main/resources/assets/mekanism/models/item/plutoniumpelletdust.json rename to src/main/resources/assets/mekanism/models/item/plutoniumpellet.json diff --git a/src/main/resources/assets/mekanism/models/item/poloniumpelletdust.json b/src/main/resources/assets/mekanism/models/item/poloniumpellet.json similarity index 100% rename from src/main/resources/assets/mekanism/models/item/poloniumpelletdust.json rename to src/main/resources/assets/mekanism/models/item/poloniumpellet.json diff --git a/src/main/resources/assets/mekanism/models/item/reprocessedfissilefragmentdust.json b/src/main/resources/assets/mekanism/models/item/reprocessedfissilefragment.json similarity index 100% rename from src/main/resources/assets/mekanism/models/item/reprocessedfissilefragmentdust.json rename to src/main/resources/assets/mekanism/models/item/reprocessedfissilefragment.json diff --git a/src/main/resources/assets/mekanism/models/item/yellowcakeuraniumdust.json b/src/main/resources/assets/mekanism/models/item/yellowcakeuranium.json similarity index 100% rename from src/main/resources/assets/mekanism/models/item/yellowcakeuraniumdust.json rename to src/main/resources/assets/mekanism/models/item/yellowcakeuranium.json