diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java index 4d302ac5b6..4af38b9aae 100644 --- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java +++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java @@ -2,7 +2,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import de.hysky.skyblocker.config.ConfigNullFieldsFix; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.config.datafixer.ConfigDataFixer; @@ -57,10 +56,10 @@ import de.hysky.skyblocker.skyblock.waypoint.*; import de.hysky.skyblocker.utils.*; import de.hysky.skyblocker.utils.chat.ChatMessageListener; +import de.hysky.skyblocker.utils.container.ContainerSolverManager; import de.hysky.skyblocker.utils.discord.DiscordRPCManager; import de.hysky.skyblocker.utils.render.RenderHelper; import de.hysky.skyblocker.utils.render.culling.OcclusionCulling; -import de.hysky.skyblocker.utils.container.ContainerSolverManager; import de.hysky.skyblocker.utils.render.title.TitleContainer; import de.hysky.skyblocker.utils.scheduler.MessageScheduler; import de.hysky.skyblocker.utils.scheduler.Scheduler; @@ -213,6 +212,7 @@ public void onInitializeClient() { TooltipManager.init(); SlotTextManager.init(); BazaarHelper.init(); + StyledTitleScreen.init(); MobGlow.init(); SlayerEntitiesGlow.init(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/StyledTitleScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/StyledTitleScreen.java new file mode 100644 index 0000000000..8364ade26f --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/skyblock/StyledTitleScreen.java @@ -0,0 +1,16 @@ +package de.hysky.skyblocker.skyblock; + +import de.hysky.skyblocker.SkyblockerMod; +import net.fabricmc.fabric.api.resource.ResourceManagerHelper; +import net.fabricmc.fabric.api.resource.ResourcePackActivationType; +import net.minecraft.util.Identifier; + +public class StyledTitleScreen { + public static void init() { + ResourceManagerHelper.registerBuiltinResourcePack( + Identifier.of(SkyblockerMod.NAMESPACE, "styled_title_screen"), + SkyblockerMod.SKYBLOCKER_MOD, + ResourcePackActivationType.DEFAULT_ENABLED + ); + } +} diff --git a/src/main/resources/resourcepacks/recolored_dungeon_items/pack.mcmeta b/src/main/resources/resourcepacks/recolored_dungeon_items/pack.mcmeta index 9533c3d9a3..8ced2d2143 100644 --- a/src/main/resources/resourcepacks/recolored_dungeon_items/pack.mcmeta +++ b/src/main/resources/resourcepacks/recolored_dungeon_items/pack.mcmeta @@ -1,6 +1,10 @@ { "pack": { "pack_format": 22, + "supported_formats": { + "min_inclusive": 15, + "max_inclusive": 2147483647 + }, "description": "Recolored textures found in dungeons" } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/styled_title_screen/Pack.png b/src/main/resources/resourcepacks/styled_title_screen/Pack.png new file mode 100644 index 0000000000..36d1fbe54d Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/Pack.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/texts/splashes.txt b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/texts/splashes.txt new file mode 100644 index 0000000000..c6291cbf6b --- /dev/null +++ b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/texts/splashes.txt @@ -0,0 +1,15 @@ +github.com/SkyblockerMod/Skyblocker! +Beta versions are on GitHub Actions! +Get an items wiki by pressing F4! +github.com/SkyblockerMod/Skyblocker/wiki/contribute! +View players' profiles with /pv! +Click on a chat tip to know more! +/skyblocker waypoints is compatible with Skytils! +Prevent drops with /skyblocker protectItem! +Skyblocker discord is discord.gg/aNNJHQykck! +Feature Requests are welcome on GitHub! +Bug Reports are welcome on GitHub! +QuickNav can be customized in the config! +Use Discord Rich Presence to show off! +Customize settings in the config! +Need help? Use /skyblocker! \ No newline at end of file diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/texts/splashes_please_shorten.txt b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/texts/splashes_please_shorten.txt new file mode 100644 index 0000000000..59693eaa1c --- /dev/null +++ b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/texts/splashes_please_shorten.txt @@ -0,0 +1,27 @@ +TODO: Please shorten these lines and move to splashes.txt. + +Apply a custom dye color to your leather armor with /skyblocker custom dyeColor +You can set custom armor trims on your armor using /skyblocker custom armorTrim. +You can apply a custom animated dye to your leather armor with /skyblocker custom animatedDye! +Did you know you can see extra info on our fancy tab menu when holding N or M? +Use command /skyblocker help and you might find some more nifty features! +You can add custom secret waypoints to any dungeon room with /skyblocker dungeons secrets addWaypoint. +Use /skyblocker shortcuts to create and edit command and message shortcuts. +Check out https://hysky.de/skyblocker/gallery for pictures of the mod's features in action! +See an item's rarity easily with Item Rarity Backgrounds in the config's Item Info Display section. +ModMenu will let you know if there's an update available for Skyblocker for your game version. +Find that the flame overlay takes up too much screen space? Check out the config to make it smaller +Don't know where to find Fairy Souls, Enigma Souls, or Relics? Enable the helpers to aid your exploration; they'll remember which souls you've already found. +You can customize the QuickNav buttons in the config. +Click on the item name in the visitor helper to buy from the bazaar or click on [Copy Amount] to copy the amount to your clipboard. +Slot text shows you the attribute shard info, catacombs level, collection level, enchantment book level, minion level, pet level, potion level, prehistoric egg blocks walked, rancher's boots speed cap, skill level, skyblock level in the slot. +You can search the entire config using the search bar on the bottom right of the config screen. +Check out the customizable event notifications in the config. +Type an math expression in a sign to have the mod calculate it for you. +Enter an expression after /skyblocker calculate to have the mod calculate it for you. +Customize the look of your health, mana, defense, and experience bars with /skyblocker bars. You can snap and resize bars too! +Share Crystal Hollows Waypoints with /skyblocker crystalWaypoints share. +Lock your mouse while farming in the Skyblocker Garden config. +Open your New Year Cake Bag and Skyblocker will remember them and highlight duplicate cakes red and missing cakes green. +Open your accessory bag and Skyblocker will remember them. The accessory helper will tell you what accessories you have and what accessories are missing. +Cheap BINs are highlighted in green in the Fancy Auction House. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_0.png b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_0.png new file mode 100644 index 0000000000..6deefb309e Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_0.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_1.png b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_1.png new file mode 100644 index 0000000000..96c1aab62b Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_1.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_2.png b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_2.png new file mode 100644 index 0000000000..289ef25288 Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_2.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_3.png b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_3.png new file mode 100644 index 0000000000..7ca6db4fb6 Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_3.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_4.png b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_4.png new file mode 100644 index 0000000000..b9b844bb72 Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_4.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_5.png b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_5.png new file mode 100644 index 0000000000..9243f152a7 Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/background/panorama_5.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/edition.png b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/edition.png new file mode 100644 index 0000000000..9ee92cf30e Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/edition.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/minecraft.png b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/minecraft.png new file mode 100644 index 0000000000..016ead0003 Binary files /dev/null and b/src/main/resources/resourcepacks/styled_title_screen/assets/minecraft/textures/gui/title/minecraft.png differ diff --git a/src/main/resources/resourcepacks/styled_title_screen/pack.mcmeta b/src/main/resources/resourcepacks/styled_title_screen/pack.mcmeta new file mode 100644 index 0000000000..543dd4b126 --- /dev/null +++ b/src/main/resources/resourcepacks/styled_title_screen/pack.mcmeta @@ -0,0 +1,10 @@ +{ + "pack": { + "pack_format": 15, + "supported_formats": { + "min_inclusive": 15, + "max_inclusive": 2147483647 + }, + "description": "Skyblocker Title Screen" + } +} \ No newline at end of file