dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change side button text style, remove solderer tooltip, remove unneeded capitalization for side button text

Browse Source
This commit is contained in:
Raoul Van den Berge
2017-07-03 23:07:04 +02:00
parent 00139e8715
commit cdd339192b
21 changed files with 29 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java
View File

@@ -3,22 +3,16 @@ package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.tile.TileSolderer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Random;
public class BlockSolderer extends BlockNode {
@@ -31,23 +25,6 @@ public class BlockSolderer extends BlockNode {
return new TileSolderer();
}
@Override
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
super.addInformation(stack, world, tooltip, flag);
tooltip.add(I18n.format(
"block.refinedstorage:solderer.tooltip.0",
TextFormatting.WHITE + I18n.format("block.refinedstorage:controller.0.name") + TextFormatting.GRAY
));
tooltip.add(I18n.format("block.refinedstorage:solderer.tooltip.1"));
tooltip.add(I18n.format(
"block.refinedstorage:solderer.tooltip.2",
TextFormatting.WHITE + I18n.format("block.refinedstorage:cable.name") + TextFormatting.GRAY
));
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
if (!world.isRemote) {

2
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java
View File

@@ -37,7 +37,7 @@ public class GuiDiskManipulator extends GuiBase {
public void drawForeground(int mouseX, int mouseY) {
drawString(7, 7, t("block.refinedstorage:disk_manipulator.name"));
drawString(7, 117, t("container.inventory"));
drawString(44, 45, t("gui.refinedstorage:fluid_interface.in"));
drawString(43, 45, t("gui.refinedstorage:fluid_interface.in"));
drawString(115, 45, t("gui.refinedstorage:fluid_interface.out"));
}
}

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java
View File

@@ -23,7 +23,7 @@ public class SideButtonAccessType extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.RED + GuiBase.t("sidebutton.refinedstorage:access_type") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:access_type." + parameter.getValue().getId());
return GuiBase.t("sidebutton.refinedstorage:access_type") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:access_type." + parameter.getValue().getId());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java
View File

@@ -19,7 +19,7 @@ public class SideButtonCompare extends SideButton {
@Override
public String getTooltip() {
String tooltip = TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:compare." + mask) + TextFormatting.RESET + "\n";
String tooltip = GuiBase.t("sidebutton.refinedstorage:compare." + mask) + "\n" + TextFormatting.GRAY;
if ((parameter.getValue() & mask) == mask) {
tooltip += GuiBase.t("gui.yes");

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java
View File

@@ -17,7 +17,7 @@ public class SideButtonConstuctorDrop extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:constructor.drop") + TextFormatting.RESET + "\n" + GuiBase.t(TileConstructor.DROP.getValue() ? "gui.yes" : "gui.no");
return GuiBase.t("sidebutton.refinedstorage:constructor.drop") + "\n" + TextFormatting.GRAY + GuiBase.t(TileConstructor.DROP.getValue() ? "gui.yes" : "gui.no");
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCraftingMonitorViewAutomated.java
View File

@@ -15,7 +15,7 @@ public class SideButtonCraftingMonitorViewAutomated extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:crafting_monitor.view_automated") + TextFormatting.RESET + "\n" + GuiBase.t("gui." + (craftingMonitor.canViewAutomated() ? "yes" : "no"));
return GuiBase.t("sidebutton.refinedstorage:crafting_monitor.view_automated") + "\n" + TextFormatting.GRAY + GuiBase.t("gui." + (craftingMonitor.canViewAutomated() ? "yes" : "no"));
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDestructorPickup.java
View File

@@ -17,7 +17,7 @@ public class SideButtonDestructorPickup extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:destructor.pickup") + TextFormatting.RESET + "\n" + GuiBase.t(TileDestructor.PICKUP.getValue() ? "gui.yes" : "gui.no");
return GuiBase.t("sidebutton.refinedstorage:destructor.pickup") + "\n" + TextFormatting.GRAY + GuiBase.t(TileDestructor.PICKUP.getValue() ? "gui.yes" : "gui.no");
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
View File

@@ -13,7 +13,7 @@ public class SideButtonDetectorMode extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:detector.mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:detector.mode." + TileDetector.MODE.getValue());
return GuiBase.t("sidebutton.refinedstorage:detector.mode") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:detector.mode." + TileDetector.MODE.getValue());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonExporterCraftOnly.java
View File

@@ -17,7 +17,7 @@ public class SideButtonExporterCraftOnly extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:exporter.craft_only") + TextFormatting.RESET + "\n" + GuiBase.t(TileExporter.CRAFT_ONLY.getValue() ? "gui.yes" : "gui.no");
return GuiBase.t("sidebutton.refinedstorage:exporter.craft_only") + "\n" + TextFormatting.GRAY + GuiBase.t(TileExporter.CRAFT_ONLY.getValue() ? "gui.yes" : "gui.no");
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonExporterRegulator.java
View File

@@ -17,7 +17,7 @@ public class SideButtonExporterRegulator extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:exporter.regulator") + TextFormatting.RESET + "\n" + GuiBase.t(TileExporter.REGULATOR.getValue() ? "gui.yes" : "gui.no");
return GuiBase.t("sidebutton.refinedstorage:exporter.regulator") + "\n" + TextFormatting.GRAY + GuiBase.t(TileExporter.REGULATOR.getValue() ? "gui.yes" : "gui.no");
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
View File

@@ -13,7 +13,7 @@ public class SideButtonGridSearchBoxMode extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.search_box_mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.search_box_mode." + ((GuiGrid) gui).getGrid().getSearchBoxMode());
return GuiBase.t("sidebutton.refinedstorage:grid.search_box_mode") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:grid.search_box_mode." + ((GuiGrid) gui).getGrid().getSearchBoxMode());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSize.java
View File

@@ -16,7 +16,7 @@ public class SideButtonGridSize extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.size") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.size." + grid.getSize());
return GuiBase.t("sidebutton.refinedstorage:grid.size") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:grid.size." + grid.getSize());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java
View File

@@ -16,7 +16,7 @@ public class SideButtonGridSortingDirection extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.sorting.direction") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection());
return GuiBase.t("sidebutton.refinedstorage:grid.sorting.direction") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java
View File

@@ -17,7 +17,7 @@ public class SideButtonGridSortingType extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.sorting.type") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType());
return GuiBase.t("sidebutton.refinedstorage:grid.sorting.type") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java
View File

@@ -16,7 +16,7 @@ public class SideButtonGridViewType extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.YELLOW + GuiBase.t("sidebutton.refinedstorage:grid.view_type") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:grid.view_type." + grid.getViewType());
return GuiBase.t("sidebutton.refinedstorage:grid.view_type") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:grid.view_type." + grid.getViewType());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonIOMode.java
View File

@@ -13,7 +13,7 @@ public class SideButtonIOMode extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:iomode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:iomode." + (TileDiskManipulator.IO_MODE.getValue() == NetworkNodeDiskManipulator.IO_MODE_INSERT ? "insert" : "extract"));
return GuiBase.t("sidebutton.refinedstorage:iomode") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:iomode." + (TileDiskManipulator.IO_MODE.getValue() == NetworkNodeDiskManipulator.IO_MODE_INSERT ? "insert" : "extract"));
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonMode.java
View File

@@ -17,7 +17,7 @@ public class SideButtonMode extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:mode." + (parameter.getValue() == IFilterable.WHITELIST ? "whitelist" : "blacklist"));
return GuiBase.t("sidebutton.refinedstorage:mode") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:mode." + (parameter.getValue() == IFilterable.WHITELIST ? "whitelist" : "blacklist"));
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java
View File

@@ -16,7 +16,7 @@ public class SideButtonRedstoneMode extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.RED + GuiBase.t("sidebutton.refinedstorage:redstone_mode") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:redstone_mode." + parameter.getValue());
return GuiBase.t("sidebutton.refinedstorage:redstone_mode") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:redstone_mode." + parameter.getValue());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonType.java
View File

@@ -17,7 +17,7 @@ public class SideButtonType extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.GREEN + GuiBase.t("sidebutton.refinedstorage:type") + TextFormatting.RESET + "\n" + GuiBase.t("sidebutton.refinedstorage:type." + type.getValue());
return GuiBase.t("sidebutton.refinedstorage:type") + "\n" + TextFormatting.GRAY + GuiBase.t("sidebutton.refinedstorage:type." + type.getValue());
}
@Override

2
src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java
View File

@@ -18,7 +18,7 @@ public class SideButtonVoidExcess extends SideButton {
@Override
public String getTooltip() {
return TextFormatting.LIGHT_PURPLE + GuiBase.t("sidebutton.refinedstorage:void_excess." + type) + TextFormatting.RESET + "\n" + GuiBase.t(parameter.getValue() ? "gui.yes" : "gui.no");
return GuiBase.t("sidebutton.refinedstorage:void_excess." + type) + "\n" + TextFormatting.GRAY + GuiBase.t(parameter.getValue() ? "gui.yes" : "gui.no");
}
@Override