From 7b8941c31ea5ab874cd14d594bf0705d708b01d8 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 4 Nov 2019 14:43:57 +0100 Subject: [PATCH] Make styles static --- .../refinedstorage/item/EnergyItem.java | 5 ++-- .../refinedstorage/item/FilterItem.java | 7 +++--- .../item/FluidStorageDiskItem.java | 11 +++++---- .../refinedstorage/item/NetworkCardItem.java | 5 ++-- .../refinedstorage/item/NetworkItem.java | 5 ++-- .../refinedstorage/item/PatternItem.java | 24 +++++++------------ .../refinedstorage/item/SecurityCardItem.java | 9 ++++--- .../refinedstorage/item/StorageDiskItem.java | 11 +++++---- .../refinedstorage/item/UpgradeItem.java | 5 ++-- .../item/blockitem/EnergyBlockItem.java | 5 ++-- .../item/blockitem/FluidStorageBlockItem.java | 11 +++++---- .../item/blockitem/PortableGridBlockItem.java | 5 ++-- .../item/blockitem/StorageBlockItem.java | 11 +++++---- .../WirelessTransmitterBlockItem.java | 5 ++-- .../refinedstorage/render/Styles.java | 12 ++++++++++ .../refinedstorage/util/RenderUtils.java | 6 ++--- .../refinedstorage/util/WorldUtils.java | 5 ++-- 17 files changed, 77 insertions(+), 65 deletions(-) create mode 100644 src/main/java/com/raoulvdberge/refinedstorage/render/Styles.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/EnergyItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/EnergyItem.java index 8c0f6bc96..e40341b8d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/EnergyItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/EnergyItem.java @@ -1,14 +1,13 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.item.capabilityprovider.EnergyCapabilityProvider; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -65,7 +64,7 @@ public abstract class EnergyItem extends Item { super.addInformation(stack, world, tooltip, flag); if (!creative) { - stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(new Style().setColor(TextFormatting.GRAY)))); + stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY))); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java index a73526461..ef9f45575 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java @@ -7,6 +7,7 @@ import com.raoulvdberge.refinedstorage.api.util.IFilter; import com.raoulvdberge.refinedstorage.container.FilterContainer; import com.raoulvdberge.refinedstorage.inventory.fluid.FilterFluidInventory; import com.raoulvdberge.refinedstorage.inventory.item.FilterItemsItemHandler; +import com.raoulvdberge.refinedstorage.render.Styles; import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.util.ITooltipFlag; @@ -21,8 +22,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; @@ -79,10 +78,10 @@ public class FilterItem extends Item { public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { super.addInformation(stack, world, tooltip, flag); - tooltip.add(new TranslationTextComponent("sidebutton.refinedstorage.mode." + (getMode(stack) == IFilter.MODE_WHITELIST ? "whitelist" : "blacklist")).setStyle(new Style().setColor(TextFormatting.YELLOW))); + tooltip.add(new TranslationTextComponent("sidebutton.refinedstorage.mode." + (getMode(stack) == IFilter.MODE_WHITELIST ? "whitelist" : "blacklist")).setStyle(Styles.YELLOW)); if (isModFilter(stack)) { - tooltip.add(new TranslationTextComponent("gui.refinedstorage.filter.mod_filter").setStyle(new Style().setColor(TextFormatting.BLUE))); + tooltip.add(new TranslationTextComponent("gui.refinedstorage.filter.mod_filter").setStyle(Styles.BLUE)); } FilterItemsItemHandler items = new FilterItemsItemHandler(stack); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java index 5414e2e54..87bc7045b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/FluidStorageDiskItem.java @@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; @@ -18,7 +19,9 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; -import net.minecraft.util.text.*; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; @@ -65,14 +68,14 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); if (data != null) { if (data.getCapacity() == -1) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(Styles.GRAY)); } else { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(Styles.GRAY)); } } if (flag.isAdvanced()) { - tooltip.add(new StringTextComponent(id.toString()).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new StringTextComponent(id.toString()).setStyle(Styles.GRAY)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkCardItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkCardItem.java index cc84f6071..e7d52c174 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkCardItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkCardItem.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; @@ -12,8 +13,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; @@ -67,7 +66,7 @@ public class NetworkCardItem extends Item { pos.getY(), pos.getZ(), type.getRegistryName().toString() - ).setStyle(new Style().setColor(TextFormatting.GRAY))); + ).setStyle(Styles.GRAY)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java index 9bf8f09d8..68d833257 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java @@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemProvider; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; import com.raoulvdberge.refinedstorage.capability.NetworkNodeProxyCapability; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -18,8 +19,6 @@ import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; @@ -99,7 +98,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv super.addInformation(stack, world, tooltip, flag); if (isValid(stack)) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.network_item.tooltip", getX(stack), getY(stack), getZ(stack)).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.network_item.tooltip", getX(stack), getY(stack), getZ(stack)).setStyle(Styles.GRAY)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java index 0801a1fd9..9f9ba9f18 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/PatternItem.java @@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.AllowedTagList; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPatternFactory; +import com.raoulvdberge.refinedstorage.render.Styles; import com.raoulvdberge.refinedstorage.render.tesr.PatternItemStackTileRenderer; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.screen.inventory.ContainerScreen; @@ -21,8 +22,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; @@ -73,19 +72,14 @@ public class PatternItem extends Item implements ICraftingPatternProvider { CraftingPattern pattern = fromCache(world, stack); - Style yellow = new Style().setColor(TextFormatting.YELLOW); - Style blue = new Style().setColor(TextFormatting.BLUE); - Style aqua = new Style().setColor(TextFormatting.AQUA); - Style red = new Style().setColor(TextFormatting.RED); - if (pattern.isValid()) { if (ContainerScreen.hasShiftDown() || isProcessing(stack)) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.inputs").setStyle(yellow)); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.inputs").setStyle(Styles.YELLOW)); RenderUtils.addCombinedItemsToTooltip(tooltip, true, pattern.getInputs().stream().map(i -> i.size() > 0 ? i.get(0) : ItemStack.EMPTY).collect(Collectors.toList())); RenderUtils.addCombinedFluidsToTooltip(tooltip, true, pattern.getFluidInputs().stream().map(i -> i.size() > 0 ? i.get(0) : FluidStack.EMPTY).collect(Collectors.toList())); - tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.outputs").setStyle(yellow)); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.outputs").setStyle(Styles.YELLOW)); } RenderUtils.addCombinedItemsToTooltip(tooltip, true, pattern.getOutputs()); @@ -100,7 +94,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { "misc.refinedstorage.pattern.allowed_item_tag", tag.toString(), pattern.getInputs().get(i).get(0).getDisplayName() - ).setStyle(aqua)); + ).setStyle(Styles.AQUA)); } } @@ -112,21 +106,21 @@ public class PatternItem extends Item implements ICraftingPatternProvider { "misc.refinedstorage.pattern.allowed_fluid_tag", tag.toString(), pattern.getFluidInputs().get(i).get(0).getDisplayName() - ).setStyle(aqua)); + ).setStyle(Styles.AQUA)); } } } if (isExact(stack)) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.exact").setStyle(blue)); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.exact").setStyle(Styles.BLUE)); } if (isProcessing(stack)) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.processing").setStyle(blue)); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.processing").setStyle(Styles.BLUE)); } } else { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.invalid").setStyle(red)); - tooltip.add(pattern.getErrorMessage().setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.invalid").setStyle(Styles.RED)); + tooltip.add(pattern.getErrorMessage().setStyle(Styles.GRAY)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java index 9c818e096..0a3d27e67 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/SecurityCardItem.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.security.Permission; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -11,7 +12,9 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.*; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import javax.annotation.Nullable; @@ -81,12 +84,12 @@ public class SecurityCardItem extends Item { super.addInformation(stack, world, tooltip, flag); if (stack.hasTag() && stack.getTag().contains(NBT_OWNER_NAME)) { - tooltip.add(new TranslationTextComponent("item.refinedstorage.security_card.owner", stack.getTag().getString(NBT_OWNER_NAME)).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("item.refinedstorage.security_card.owner", stack.getTag().getString(NBT_OWNER_NAME)).setStyle(Styles.GRAY)); } for (Permission permission : Permission.values()) { if (hasPermission(stack, permission)) { - tooltip.add(new StringTextComponent("- ").appendSibling(new TranslationTextComponent("gui.refinedstorage.security_manager.permission." + permission.getId())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new StringTextComponent("- ").appendSibling(new TranslationTextComponent("gui.refinedstorage.security_manager.permission." + permission.getId())).setStyle(Styles.GRAY)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java index e062e8abf..9ff6e7c43 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/StorageDiskItem.java @@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; import com.raoulvdberge.refinedstorage.api.storage.disk.StorageDiskSyncData; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; @@ -18,7 +19,9 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; -import net.minecraft.util.text.*; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; @@ -65,14 +68,14 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); if (data != null) { if (data.getCapacity() == -1) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(Styles.GRAY)); } else { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(Styles.GRAY)); } } if (flag.isAdvanced()) { - tooltip.add(new StringTextComponent(id.toString()).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new StringTextComponent(id.toString()).setStyle(Styles.GRAY)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/UpgradeItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/UpgradeItem.java index db464f659..b577b3908 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/UpgradeItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/UpgradeItem.java @@ -1,12 +1,11 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -93,7 +92,7 @@ public class UpgradeItem extends Item { new TranslationTextComponent("enchantment.minecraft.fortune") .appendText(" ") .appendSibling(new TranslationTextComponent("enchantment.level." + type.getFortuneLevel())) - .setStyle(new Style().setColor(TextFormatting.GRAY)) + .setStyle(Styles.GRAY) ); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/EnergyBlockItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/EnergyBlockItem.java index 78aab3eed..b5539d27a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/EnergyBlockItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/EnergyBlockItem.java @@ -2,14 +2,13 @@ package com.raoulvdberge.refinedstorage.item.blockitem; import com.raoulvdberge.refinedstorage.block.BaseBlock; import com.raoulvdberge.refinedstorage.item.capabilityprovider.EnergyCapabilityProvider; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -66,7 +65,7 @@ public abstract class EnergyBlockItem extends BaseBlockItem { super.addInformation(stack, world, tooltip, flag); if (!creative) { - stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(new Style().setColor(TextFormatting.GRAY)))); + stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY))); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/FluidStorageBlockItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/FluidStorageBlockItem.java index 744b28f42..007fd52aa 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/FluidStorageBlockItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/FluidStorageBlockItem.java @@ -10,6 +10,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.FluidStorage import com.raoulvdberge.refinedstorage.apiimpl.storage.FluidStorageType; import com.raoulvdberge.refinedstorage.block.FluidStorageBlock; import com.raoulvdberge.refinedstorage.item.FluidStoragePartItem; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; @@ -19,7 +20,9 @@ import net.minecraft.item.Items; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; -import net.minecraft.util.text.*; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; @@ -50,14 +53,14 @@ public class FluidStorageBlockItem extends BaseBlockItem { StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); if (data != null) { if (data.getCapacity() == -1) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(Styles.GRAY)); } else { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(Styles.GRAY)); } } if (flag.isAdvanced()) { - tooltip.add(new StringTextComponent(id.toString()).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new StringTextComponent(id.toString()).setStyle(Styles.GRAY)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/PortableGridBlockItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/PortableGridBlockItem.java index 24ab4043e..35ddebb6c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/PortableGridBlockItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/PortableGridBlockItem.java @@ -5,6 +5,7 @@ import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.grid.factory.PortableGridGridFactory; import com.raoulvdberge.refinedstorage.item.WirelessGridItem; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -15,8 +16,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -62,7 +61,7 @@ public class PortableGridBlockItem extends EnergyBlockItem { public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { super.addInformation(stack, world, tooltip, flag); - tooltip.add(new TranslationTextComponent("block.refinedstorage.portable_grid.tooltip").setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("block.refinedstorage.portable_grid.tooltip").setStyle(Styles.GRAY)); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java index 7587fdcd1..10f06e5b3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/StorageBlockItem.java @@ -10,6 +10,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.StorageNetwo import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType; import com.raoulvdberge.refinedstorage.block.StorageBlock; import com.raoulvdberge.refinedstorage.item.StoragePartItem; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.InventoryHelper; @@ -18,7 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; -import net.minecraft.util.text.*; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; @@ -49,14 +52,14 @@ public class StorageBlockItem extends BaseBlockItem { StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id); if (data != null) { if (data.getCapacity() == -1) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(Styles.GRAY)); } else { - tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(Styles.GRAY)); } } if (flag.isAdvanced()) { - tooltip.add(new StringTextComponent(id.toString()).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new StringTextComponent(id.toString()).setStyle(Styles.GRAY)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java index 1161dc763..47bb3a92b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java @@ -2,12 +2,11 @@ package com.raoulvdberge.refinedstorage.item.blockitem; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -25,6 +24,6 @@ public class WirelessTransmitterBlockItem extends BaseBlockItem { public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { super.addInformation(stack, world, tooltip, flag); - tooltip.add(new TranslationTextComponent("block.refinedstorage.wireless_transmitter.tooltip", new TranslationTextComponent("block.refinedstorage.cable")).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("block.refinedstorage.wireless_transmitter.tooltip", new TranslationTextComponent("block.refinedstorage.cable")).setStyle(Styles.GRAY)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/Styles.java b/src/main/java/com/raoulvdberge/refinedstorage/render/Styles.java new file mode 100644 index 000000000..44f422265 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/Styles.java @@ -0,0 +1,12 @@ +package com.raoulvdberge.refinedstorage.render; + +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextFormatting; + +public class Styles { + public static final Style GRAY = new Style().setColor(TextFormatting.GRAY); + public static final Style YELLOW = new Style().setColor(TextFormatting.YELLOW); + public static final Style RED = new Style().setColor(TextFormatting.RED); + public static final Style BLUE = new Style().setColor(TextFormatting.BLUE); + public static final Style AQUA = new Style().setColor(TextFormatting.AQUA); +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java index 599fc8828..6e51b48aa 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderHelper; @@ -13,7 +14,6 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.RenderTooltipEvent; import net.minecraftforge.common.ForgeMod; @@ -65,7 +65,7 @@ public final class RenderUtils { data = new StringTextComponent(amount + "x ").appendSibling(data); } - tooltip.add(data.setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(data.setStyle(Styles.GRAY)); } } } @@ -93,7 +93,7 @@ public final class RenderUtils { data = new StringTextComponent(API.instance().getQuantityFormatter().formatInBucketForm(amount) + " ").appendSibling(data); } - tooltip.add(data.setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(data.setStyle(Styles.GRAY)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java index 85a05a96a..644df8df0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.util; import com.mojang.authlib.GameProfile; +import com.raoulvdberge.refinedstorage.render.Styles; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; @@ -12,8 +13,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; @@ -78,7 +77,7 @@ public final class WorldUtils { } public static void sendNoPermissionMessage(PlayerEntity player) { - player.sendMessage(new TranslationTextComponent("misc.refinedstorage.security.no_permission").setStyle(new Style().setColor(TextFormatting.RED))); + player.sendMessage(new TranslationTextComponent("misc.refinedstorage.security.no_permission").setStyle(Styles.RED)); } public static RayTraceResult rayTracePlayer(World world, PlayerEntity player) {