diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e5d2d5b..8ffc7bab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,11 @@ name: Java CI - Build Release on: - release: - types: [ published ] + push: + tags: + - 'v[0-9]+\.[0-9]+\.[0-9]+' + - 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+' + - 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+\.[0-9]+' jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 38845e35..cd043a2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2101.1.5] + +### Changed +* Overhauled and cleaned up many icon textures + ## [2101.1.4] ### Added diff --git a/build.gradle b/build.gradle index 8ca68d77..d2130292 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,8 @@ plugins { id "me.modmuss50.mod-publish-plugin" version "0.5.1" } +apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle' + architectury { minecraft = rootProject.minecraft_version } @@ -113,7 +115,7 @@ allprojects { publishMods { dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null - changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided") + changelog = createChangelog(project) version = mod_version // TODO: Migrate to something else diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/Icons.java b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/Icons.java index 0da88dbc..1a78289f 100644 --- a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/Icons.java +++ b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/Icons.java @@ -4,7 +4,7 @@ @SuppressWarnings("unused") public interface Icons { - Icon BLUE_BUTTON = get("blue_button"); + Icon BLUE_BUTTON = get("blank_blue"); Icon UP = get("up"); Icon DOWN = get("down"); Icon LEFT = get("left"); @@ -21,7 +21,12 @@ public interface Icons { Icon SETTINGS_RED = get("settings_red"); Icon CANCEL = get("cancel"); Icon BACK = get("back"); - Icon CLOSE = get("close"); + + /** + * @deprecated Use {@link #CANCEL} instead + */ + @Deprecated(forRemoval = true) + Icon CLOSE = CANCEL; Icon REFRESH = get("refresh"); Icon PLAYER = get("player"); Icon PLAYER_GRAY = get("player_gray"); @@ -30,15 +35,20 @@ public interface Icons { Icon FRIENDS = get("friends"); Icon BUG = get("bug"); Icon JACKET = get("jacket"); - Icon BED = get("bed"); - Icon BELL = get("bell"); - Icon COMPASS = get("compass"); + Icon BED = Icon.getIcon("minecraft:item/bed"); + Icon FRIENDS_GROUP = get("friends_group"); + /** + * @deprecated Use {@link #FRIENDS_GROUP} instead + */ + @Deprecated(forRemoval = true) + Icon BELL = FRIENDS_GROUP; + Icon COMPASS = Icon.getIcon("minecraft:item/compass_19"); Icon MAP = get("map"); - Icon SHIELD = get("shield"); + Icon SHIELD = Icon.getIcon("minecraft:item/diamond_sword"); Icon ART = get("art"); Icon MONEY_BAG = get("money_bag"); Icon CONTROLLER = get("controller"); - Icon FEATHER = get("feather"); + Icon FEATHER = Icon.getIcon("minecraft:item/feather"); Icon CAMERA = get("camera"); Icon INV_IO = get("inv_io"); Icon INV_IN = get("inv_in"); @@ -61,7 +71,7 @@ public interface Icons { Icon MARKER = get("marker"); Icon BEACON = get("beacon"); Icon DICE = get("dice"); - Icon DIAMOND = get("diamond"); + Icon DIAMOND = Icon.getIcon("minecraft:item/diamond"); Icon TIME = get("time"); Icon GLOBE = get("globe"); Icon MONEY = get("money"); @@ -80,6 +90,8 @@ public interface Icons { Icon SUPPORT = getImage("support"); Icon DROPDOWN_OUT = get("dropdown_out"); Icon DROPDOWN_IN = get("dropdown_in"); + Icon VISIBILITY_SHOW = get("visibility_show"); + Icon VISIBILITY_HIDE = get("visibility_hide"); static Icon get(String id) { return Icon.getIcon(FTBLibrary.MOD_ID + ":icons/" + id); diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/ui/ToggleableButton.java b/common/src/main/java/dev/ftb/mods/ftblibrary/ui/ToggleableButton.java index e318f14a..8ec30d5e 100644 --- a/common/src/main/java/dev/ftb/mods/ftblibrary/ui/ToggleableButton.java +++ b/common/src/main/java/dev/ftb/mods/ftblibrary/ui/ToggleableButton.java @@ -1,6 +1,7 @@ package dev.ftb.mods.ftblibrary.ui; import dev.ftb.mods.ftblibrary.icon.Icon; +import dev.ftb.mods.ftblibrary.icon.Icons; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; @@ -25,6 +26,10 @@ public ToggleableButton(Panel panel, boolean defaultState, Icon enabled, Icon di updateTitle(); } + public ToggleableButton(Panel panel, boolean defaultState, ToggleableCallback toggleableCallback) { + this(panel, defaultState, Icons.VISIBILITY_SHOW, Icons.VISIBILITY_HIDE, toggleableCallback); + } + public Component getEnabledText() { return enabledText; } diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/ui/misc/UITesting.java b/common/src/main/java/dev/ftb/mods/ftblibrary/ui/misc/UITesting.java index 8ae90c4b..e01de7c8 100644 --- a/common/src/main/java/dev/ftb/mods/ftblibrary/ui/misc/UITesting.java +++ b/common/src/main/java/dev/ftb/mods/ftblibrary/ui/misc/UITesting.java @@ -92,7 +92,7 @@ private void openTestContextMenu(Panel parent) { ContextMenuItem.subMenu(Component.literal("line 2 >"), Icons.REMOVE, List.of( ContextMenuItem.title(Component.literal("Submenu")), ContextMenuItem.SEPARATOR, - new ContextMenuItem(Component.literal("line 2a"), Icons.BELL, button1 -> { + new ContextMenuItem(Component.literal("line 2a"), Icons.FRIENDS_GROUP, button1 -> { } ))), new ContextMenuItem(Component.literal("Test Search"), Icon.empty(), button -> openTestButtonList()) { diff --git a/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/day.json b/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/day.json index 1bde2c90..673e4ff2 100644 --- a/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/day.json +++ b/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/day.json @@ -1,6 +1,5 @@ { "icon": [ - "ftblibrary:icons/blue_button", "ftblibrary:textures/icons/toggle_day.png" ], "sort_index": 200, diff --git a/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/gamemode.json b/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/gamemode.json index 60a8269f..b6c0bb29 100644 --- a/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/gamemode.json +++ b/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/gamemode.json @@ -1,7 +1,6 @@ { "icon": [ - "ftblibrary:icons/blue_button", - "ftblibrary:textures/icons/toggle_gamemode.png" + "minecraft:item/diamond_sword" ], "sort_index": 100, "click": [ diff --git a/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/night.json b/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/night.json index 60603cf6..69c29914 100644 --- a/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/night.json +++ b/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/night.json @@ -1,6 +1,5 @@ { "icon": [ - "ftblibrary:icons/blue_button", "ftblibrary:textures/icons/toggle_night.png" ], "sort_index": 300, diff --git a/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/rain.json b/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/rain.json index f8793aae..8fbc9bfe 100644 --- a/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/rain.json +++ b/common/src/main/resources/assets/ftblibrary/sidebar_buttons/toggle/rain.json @@ -1,6 +1,5 @@ { "icon": [ - "ftblibrary:icons/blue_button", "ftblibrary:textures/icons/toggle_rain.png" ], "sort_index": 400, diff --git a/common/src/main/resources/assets/ftblibrary/textures/gui/missing_image.png b/common/src/main/resources/assets/ftblibrary/textures/gui/missing_image.png index 0756a262..15e9f45f 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/gui/missing_image.png and b/common/src/main/resources/assets/ftblibrary/textures/gui/missing_image.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/accept.png b/common/src/main/resources/assets/ftblibrary/textures/icons/accept.png index be4e9bc9..b52d1b6e 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/accept.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/accept.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/accept_gray.png b/common/src/main/resources/assets/ftblibrary/textures/icons/accept_gray.png index 2c22b5fa..2f39c96e 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/accept_gray.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/accept_gray.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/add.png b/common/src/main/resources/assets/ftblibrary/textures/icons/add.png index 08809b8f..c07b47f1 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/add.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/add.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/add_gray.png b/common/src/main/resources/assets/ftblibrary/textures/icons/add_gray.png index c3e8fe60..82a386d6 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/add_gray.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/add_gray.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/art.png b/common/src/main/resources/assets/ftblibrary/textures/icons/art.png index ebc13e6b..e30bc0ea 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/art.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/art.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/back.png b/common/src/main/resources/assets/ftblibrary/textures/icons/back.png index 09da5164..cbc3cf62 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/back.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/back.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/beacon.png b/common/src/main/resources/assets/ftblibrary/textures/icons/beacon.png index b988c156..1a400db3 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/beacon.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/beacon.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/bed.png b/common/src/main/resources/assets/ftblibrary/textures/icons/bed.png deleted file mode 100644 index 57906914..00000000 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/bed.png and /dev/null differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/bell.png b/common/src/main/resources/assets/ftblibrary/textures/icons/bell.png deleted file mode 100644 index 7f451e32..00000000 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/bell.png and /dev/null differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/bin.png b/common/src/main/resources/assets/ftblibrary/textures/icons/bin.png index 37140485..1cca4bad 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/bin.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/bin.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/blank_blue.png b/common/src/main/resources/assets/ftblibrary/textures/icons/blank_blue.png index 931a6979..320d34bd 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/blank_blue.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/blank_blue.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/blue_button.png b/common/src/main/resources/assets/ftblibrary/textures/icons/blue_button.png deleted file mode 100644 index 5016785a..00000000 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/blue_button.png and /dev/null differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/blue_grid.png b/common/src/main/resources/assets/ftblibrary/textures/icons/blue_grid.png index 65a2f18f..4941afc0 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/blue_grid.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/blue_grid.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/bug.png b/common/src/main/resources/assets/ftblibrary/textures/icons/bug.png index 213ffb50..3bbdd0e5 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/bug.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/bug.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/camera.png b/common/src/main/resources/assets/ftblibrary/textures/icons/camera.png index 400a28aa..be0b12e0 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/camera.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/camera.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/cancel.png b/common/src/main/resources/assets/ftblibrary/textures/icons/cancel.png index 21dccf64..b0704a1e 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/cancel.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/cancel.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/close.png b/common/src/main/resources/assets/ftblibrary/textures/icons/close.png deleted file mode 100644 index f766815a..00000000 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/close.png and /dev/null differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/color_rgb.png b/common/src/main/resources/assets/ftblibrary/textures/icons/color_rgb.png index 99e44351..5409d4ba 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/color_rgb.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/color_rgb.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/compass.png b/common/src/main/resources/assets/ftblibrary/textures/icons/compass.png deleted file mode 100644 index 61f6aaf5..00000000 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/compass.png and /dev/null differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/controller.png b/common/src/main/resources/assets/ftblibrary/textures/icons/controller.png index c96cfec0..9109c891 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/controller.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/controller.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/diamond.png b/common/src/main/resources/assets/ftblibrary/textures/icons/diamond.png deleted file mode 100644 index 42bc19a0..00000000 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/diamond.png and /dev/null differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/dice.png b/common/src/main/resources/assets/ftblibrary/textures/icons/dice.png index 563758c2..70d45605 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/dice.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/dice.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/down.png b/common/src/main/resources/assets/ftblibrary/textures/icons/down.png index a10abac1..4ef5aa4b 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/down.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/down.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/feather.png b/common/src/main/resources/assets/ftblibrary/textures/icons/feather.png deleted file mode 100644 index 98e113d6..00000000 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/feather.png and /dev/null differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/friends.png b/common/src/main/resources/assets/ftblibrary/textures/icons/friends.png index d9692def..c1f9c84c 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/friends.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/friends.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/friends_group.png b/common/src/main/resources/assets/ftblibrary/textures/icons/friends_group.png new file mode 100644 index 00000000..cf673d2d Binary files /dev/null and b/common/src/main/resources/assets/ftblibrary/textures/icons/friends_group.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/globe.png b/common/src/main/resources/assets/ftblibrary/textures/icons/globe.png index 4fbc18d4..7d98f1c0 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/globe.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/globe.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/heart.png b/common/src/main/resources/assets/ftblibrary/textures/icons/heart.png index fa1a8685..1cf38a5f 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/heart.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/heart.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/info.png b/common/src/main/resources/assets/ftblibrary/textures/icons/info.png index 8f7bb6b6..a57f7f81 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/info.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/info.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/info_gray.png b/common/src/main/resources/assets/ftblibrary/textures/icons/info_gray.png index 9bbbdbbe..2d96da2c 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/info_gray.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/info_gray.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/jacket.png b/common/src/main/resources/assets/ftblibrary/textures/icons/jacket.png index 60f195d3..eb3cc2bc 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/jacket.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/jacket.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/left.png b/common/src/main/resources/assets/ftblibrary/textures/icons/left.png index 23feddc1..c10879a5 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/left.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/left.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/lock.png b/common/src/main/resources/assets/ftblibrary/textures/icons/lock.png index ddf83d95..e16822b8 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/lock.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/lock.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/lock_open.png b/common/src/main/resources/assets/ftblibrary/textures/icons/lock_open.png index b09e4187..4e450f07 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/lock_open.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/lock_open.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/map.png b/common/src/main/resources/assets/ftblibrary/textures/icons/map.png index 811b99fa..71cdfcb8 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/map.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/map.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/map2.png b/common/src/main/resources/assets/ftblibrary/textures/icons/map2.png new file mode 100644 index 00000000..fcad7c8e Binary files /dev/null and b/common/src/main/resources/assets/ftblibrary/textures/icons/map2.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/marker.png b/common/src/main/resources/assets/ftblibrary/textures/icons/marker.png index a950775e..ed80f6ff 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/marker.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/marker.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/money.png b/common/src/main/resources/assets/ftblibrary/textures/icons/money.png index 97206e26..eef0371a 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/money.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/money.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/money_bag.png b/common/src/main/resources/assets/ftblibrary/textures/icons/money_bag.png index fdaed47b..3122261b 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/money_bag.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/money_bag.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/notes.png b/common/src/main/resources/assets/ftblibrary/textures/icons/notes.png index e92d5ba4..085ffc2d 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/notes.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/notes.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/offline.png b/common/src/main/resources/assets/ftblibrary/textures/icons/offline.png index 13399d1b..b4419c8e 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/offline.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/offline.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/online.png b/common/src/main/resources/assets/ftblibrary/textures/icons/online.png index 4691d04f..7b2238ad 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/online.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/online.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/online_red.png b/common/src/main/resources/assets/ftblibrary/textures/icons/online_red.png index 52182cc8..42501681 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/online_red.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/online_red.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/player.png b/common/src/main/resources/assets/ftblibrary/textures/icons/player.png index 876163ab..90f7292a 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/player.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/player.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/player_gray.png b/common/src/main/resources/assets/ftblibrary/textures/icons/player_gray.png index 5f01c022..4d33acc2 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/player_gray.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/player_gray.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/refresh.png b/common/src/main/resources/assets/ftblibrary/textures/icons/refresh.png index 810ef9c0..c0b4f127 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/refresh.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/refresh.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/remove.png b/common/src/main/resources/assets/ftblibrary/textures/icons/remove.png index a876700a..b517b76e 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/remove.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/remove.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/remove_gray.png b/common/src/main/resources/assets/ftblibrary/textures/icons/remove_gray.png index 6c0e319d..43a6f04c 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/remove_gray.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/remove_gray.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/right.png b/common/src/main/resources/assets/ftblibrary/textures/icons/right.png index 28d93aae..2d15f394 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/right.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/right.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/security_friends.png b/common/src/main/resources/assets/ftblibrary/textures/icons/security_friends.png index 28d1c0d0..9eacdbab 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/security_friends.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/security_friends.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/security_private.png b/common/src/main/resources/assets/ftblibrary/textures/icons/security_private.png index 0b0f152e..464b669c 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/security_private.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/security_private.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/security_public.png b/common/src/main/resources/assets/ftblibrary/textures/icons/security_public.png index 966d9a12..632b6745 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/security_public.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/security_public.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/security_team.png b/common/src/main/resources/assets/ftblibrary/textures/icons/security_team.png index d19258cf..d5a02c28 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/security_team.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/security_team.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/settings.png b/common/src/main/resources/assets/ftblibrary/textures/icons/settings.png index d303b27e..0675ccec 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/settings.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/settings.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/settings_red.png b/common/src/main/resources/assets/ftblibrary/textures/icons/settings_red.png index 72b69a8a..95474dd4 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/settings_red.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/settings_red.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/shield.png b/common/src/main/resources/assets/ftblibrary/textures/icons/shield.png deleted file mode 100644 index 2f226916..00000000 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/shield.png and /dev/null differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/sort_az.png b/common/src/main/resources/assets/ftblibrary/textures/icons/sort_az.png index 33f5463c..51bc3998 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/sort_az.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/sort_az.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/star.png b/common/src/main/resources/assets/ftblibrary/textures/icons/star.png index 2bc92be1..751c9a52 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/star.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/star.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/time.png b/common/src/main/resources/assets/ftblibrary/textures/icons/time.png index cb41bb54..317f92f6 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/time.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/time.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_day.png b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_day.png index 230b0d47..faf84b0e 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_day.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_day.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_day.png.mcmeta b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_day.png.mcmeta deleted file mode 100644 index a39ce83c..00000000 --- a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_day.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "texture": { - "blur": true - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_gamemode.png b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_gamemode.png index a1ae5319..9a6fe91d 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_gamemode.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_gamemode.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_gamemode.png.mcmeta b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_gamemode.png.mcmeta deleted file mode 100644 index a39ce83c..00000000 --- a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_gamemode.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "texture": { - "blur": true - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_night.png b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_night.png index 8a52fefa..e6fdfab9 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_night.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_night.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_night.png.mcmeta b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_night.png.mcmeta deleted file mode 100644 index a39ce83c..00000000 --- a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_night.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "texture": { - "blur": true - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_rain.png b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_rain.png index 513a1b50..c5de7b11 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_rain.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_rain.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_rain.png.mcmeta b/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_rain.png.mcmeta deleted file mode 100644 index a39ce83c..00000000 --- a/common/src/main/resources/assets/ftblibrary/textures/icons/toggle_rain.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "texture": { - "blur": true - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/up.png b/common/src/main/resources/assets/ftblibrary/textures/icons/up.png index 4e859195..d3420413 100644 Binary files a/common/src/main/resources/assets/ftblibrary/textures/icons/up.png and b/common/src/main/resources/assets/ftblibrary/textures/icons/up.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/visibility_hide.png b/common/src/main/resources/assets/ftblibrary/textures/icons/visibility_hide.png new file mode 100644 index 00000000..ecad3121 Binary files /dev/null and b/common/src/main/resources/assets/ftblibrary/textures/icons/visibility_hide.png differ diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/visibility_show.png b/common/src/main/resources/assets/ftblibrary/textures/icons/visibility_show.png new file mode 100644 index 00000000..7e81fb3e Binary files /dev/null and b/common/src/main/resources/assets/ftblibrary/textures/icons/visibility_show.png differ diff --git a/gradle.properties b/gradle.properties index 5ab35e37..133fb1b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.daemon=false # Mod mod_id=ftblibrary readable_name=FTB Library -mod_version=2101.1.4 +mod_version=2101.1.5 mod_author=FTB Team # Maven archives_base_name=ftb-library