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

23
src/main/resources/assets/refinedstorage/lang/en_us.lang
View File

@@ -112,7 +112,7 @@ sidebutton.refinedstorage:compare.1=Compare damage
sidebutton.refinedstorage:compare.2=Compare NBT
sidebutton.refinedstorage:compare.8=Compare ore dictionary
sidebutton.refinedstorage:redstone_mode=Redstone Mode
sidebutton.refinedstorage:redstone_mode=Redstone mode
sidebutton.refinedstorage:redstone_mode.0=Ignore redstone signal
sidebutton.refinedstorage:redstone_mode.1=Only work with redstone signal
sidebutton.refinedstorage:redstone_mode.2=Only work without redstone signal
@@ -121,14 +121,14 @@ sidebutton.refinedstorage:grid.view_type=Display
sidebutton.refinedstorage:grid.view_type.0=Normal
sidebutton.refinedstorage:grid.view_type.1=No craftables
sidebutton.refinedstorage:grid.view_type.2=Only craftables
sidebutton.refinedstorage:grid.sorting.direction=Sorting Direction
sidebutton.refinedstorage:grid.sorting.direction=Sorting direction
sidebutton.refinedstorage:grid.sorting.direction.0=Ascending
sidebutton.refinedstorage:grid.sorting.direction.1=Descending
sidebutton.refinedstorage:grid.sorting.type=Sorting Type
sidebutton.refinedstorage:grid.sorting.type=Sorting type
sidebutton.refinedstorage:grid.sorting.type.0=Quantity
sidebutton.refinedstorage:grid.sorting.type.1=Name
sidebutton.refinedstorage:grid.sorting.type.2=ID
sidebutton.refinedstorage:grid.search_box_mode=Search Box Mode
sidebutton.refinedstorage:grid.search_box_mode=Search box mode
sidebutton.refinedstorage:grid.search_box_mode.0=Normal
sidebutton.refinedstorage:grid.search_box_mode.1=Normal (autoselected)
sidebutton.refinedstorage:grid.search_box_mode.2=JEI synchronized
@@ -139,13 +139,13 @@ sidebutton.refinedstorage:grid.size.1=Small
sidebutton.refinedstorage:grid.size.2=Medium
sidebutton.refinedstorage:grid.size.3=Large
sidebutton.refinedstorage:crafting_monitor.view_automated=View tasks started in an automated way
sidebutton.refinedstorage:crafting_monitor.view_automated=View automated tasks
sidebutton.refinedstorage:mode=Mode
sidebutton.refinedstorage:mode.whitelist=Whitelist
sidebutton.refinedstorage:mode.blacklist=Blacklist
sidebutton.refinedstorage:iomode=IO Mode
sidebutton.refinedstorage:iomode=IO mode
sidebutton.refinedstorage:iomode.insert=Insert into network
sidebutton.refinedstorage:iomode.extract=Extract from network
@@ -167,13 +167,13 @@ sidebutton.refinedstorage:constructor.drop=Drop blocks instead of placing
sidebutton.refinedstorage:destructor.pickup=Pickup items instead of breaking
sidebutton.refinedstorage:access_type=Access Type
sidebutton.refinedstorage:access_type=Access type
sidebutton.refinedstorage:access_type.0=Insert and extract
sidebutton.refinedstorage:access_type.1=Insert only
sidebutton.refinedstorage:access_type.2=Extract only
sidebutton.refinedstorage:exporter.regulator=Regulator Mode
sidebutton.refinedstorage:exporter.craft_only=Craft-only Mode
sidebutton.refinedstorage:exporter.regulator=Regulator mode
sidebutton.refinedstorage:exporter.craft_only=Craft-only mode
block.refinedstorage:controller.0.name=Controller
block.refinedstorage:controller.1.name=Creative Controller
@@ -190,9 +190,6 @@ block.refinedstorage:exporter.name=Exporter
block.refinedstorage:detector.name=Detector
block.refinedstorage:machine_casing.name=Machine Casing
block.refinedstorage:solderer.name=Solderer
block.refinedstorage:solderer.tooltip.0=Needs to be connected with a %s
block.refinedstorage:solderer.tooltip.1=by placing it adjacent to it or
block.refinedstorage:solderer.tooltip.2=by connecting it with %s.
block.refinedstorage:destructor.name=Destructor
block.refinedstorage:constructor.name=Constructor
block.refinedstorage:storage.0.name=1k Storage Block
@@ -288,7 +285,7 @@ advancements.refinedstorage:connecting.description=You can place all the devices
advancements.refinedstorage:conditional_connecting=Conditional connecting
advancements.refinedstorage:conditional_connecting.description=Craft a Relay to control if a network signal can pass with redstone
advancements.refinedstorage:soldering=Soldering
advancements.refinedstorage:soldering.description=Craft a Solderer to make the various Refined Storage components
advancements.refinedstorage:soldering.description=Craft a Solderer and connect it to a Controller to make the various Refined Storage components
advancements.refinedstorage:drives=Drives
advancements.refinedstorage:drives.description=Craft a Disk Drive to be able to store your disks
advancements.refinedstorage:manipulating_disks=Manipulating disks