Merge pull request #132 from FTBTeam/dev

Dev

.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:

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

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

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);

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;
     }

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()) {

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,

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": [

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,

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,

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