aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorKevin <92656833+kevinthegreat1@users.noreply.github.com>2023-09-10 15:52:53 -0400
committerGitHub <noreply@github.com>2023-09-10 15:52:53 -0400
commit0bcd6f3554c1ba93ed235c36a118d6ea00c0601a (patch)
tree94028c5790e813cc7266f7271bfc236fedf6fe36 /src/main/java
parent0875a0d140bb19ccd7b12ce74dedb7bcaf2c6953 (diff)
parentfd8770f38da9cafbdacaa17d1b9f7a071a2b3c4e (diff)
downloadSkyblocker-0bcd6f3554c1ba93ed235c36a118d6ea00c0601a.tar.gz
Skyblocker-0bcd6f3554c1ba93ed235c36a118d6ea00c0601a.tar.bz2
Skyblocker-0bcd6f3554c1ba93ed235c36a118d6ea00c0601a.zip
Merge pull request #289 from AzureAaron/special-effects
Rare Drop Special Effects!
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java9
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/special/SpecialEffects.java96
3 files changed, 107 insertions, 0 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index 5c7f2a99..cdf78d73 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -15,6 +15,7 @@ import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry;
import me.xmrvizzy.skyblocker.skyblock.quicknav.QuickNav;
import me.xmrvizzy.skyblocker.skyblock.rift.TheRift;
import me.xmrvizzy.skyblocker.skyblock.shortcut.Shortcuts;
+import me.xmrvizzy.skyblocker.skyblock.special.SpecialEffects;
import me.xmrvizzy.skyblocker.skyblock.tabhud.TabHud;
import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.ScreenMaster;
import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr;
@@ -101,6 +102,7 @@ public class SkyblockerMod implements ClientModInitializer {
CustomArmorTrims.init();
TicTacToe.init();
QuiverWarning.init();
+ SpecialEffects.init();
containerSolverManager.init();
statusBarTracker.init();
scheduler.scheduleCyclic(Utils::update, 20);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 127bc601..7a50c821 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -189,6 +189,10 @@ public class SkyblockerConfig implements ConfigData {
@ConfigEntry.Category("itemInfoDisplay")
@ConfigEntry.Gui.CollapsibleObject
public ItemInfoDisplay itemInfoDisplay = new ItemInfoDisplay();
+
+ @ConfigEntry.Category("specialEffects")
+ @ConfigEntry.Gui.CollapsibleObject
+ public SpecialEffects specialEffects = new SpecialEffects();
@ConfigEntry.Category("hitbox")
@ConfigEntry.Gui.CollapsibleObject()
@@ -406,6 +410,11 @@ public class SkyblockerConfig implements ConfigData {
@ConfigEntry.Gui.Tooltip
public boolean attributeShardInfo = true;
}
+
+ public static class SpecialEffects {
+ @ConfigEntry.Gui.Tooltip
+ public boolean rareDungeonDropEffects = true;
+ }
public static class Locations {
@ConfigEntry.Category("barn")
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/special/SpecialEffects.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/special/SpecialEffects.java
new file mode 100644
index 00000000..a3d7e5c5
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/special/SpecialEffects.java
@@ -0,0 +1,96 @@
+package me.xmrvizzy.skyblocker.skyblock.special;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.enchantment.Enchantments;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.nbt.StringNbtReader;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.text.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SpecialEffects {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpecialEffects.class);
+ private static final Pattern DROP_PATTERN = Pattern.compile("(?:\\[[A-Z+]+] )?(?<player>[A-Za-z0-9_]+) unlocked (?<item>.+)!");
+ private static final ItemStack NECRON_HANDLE = new ItemStack(Items.STICK);
+ private static final ItemStack SCROLL = new ItemStack(Items.WRITABLE_BOOK);
+ private static ItemStack TIER_5_SKULL;
+ private static ItemStack FIFTH_STAR;
+
+ static {
+ NECRON_HANDLE.addEnchantment(Enchantments.PROTECTION, 1);
+ SCROLL.addEnchantment(Enchantments.PROTECTION, 1);
+ try {
+ TIER_5_SKULL = ItemStack.fromNbt(StringNbtReader.parse("{id:\"minecraft:player_head\",Count:1,tag:{SkullOwner:{Id:[I;-1613868903,-527154034,-1445577520,748807544],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTEwZjlmMTA4NWQ0MDcxNDFlYjc3NjE3YTRhYmRhYWEwOGQ4YWYzM2I5NjAyMDBmZThjMTI2YzFkMTQ0NTY4MiJ9fX0=\"}]}}}}"));
+ FIFTH_STAR = ItemStack.fromNbt(StringNbtReader.parse("{id:\"minecraft:player_head\",Count:1,tag:{SkullOwner:{Id:[I;1904417095,756174249,-1302927470,1407004198],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzFjODA0MjUyN2Y4MWM4ZTI5M2UyODEwMTEzNDg5ZjQzOTRjYzZlZmUxNWQxYWZhYzQzMTU3MWM3M2I2MmRjNCJ9fX0=\"}]}}}}"));
+ } catch (Exception e) {
+ TIER_5_SKULL = ItemStack.EMPTY;
+ FIFTH_STAR = ItemStack.EMPTY;
+ LOGGER.error("[Skyblocker Special Effects] Failed to parse NBT for a player head!", e);
+ }
+ }
+
+ public static void init() {
+ ClientReceiveMessageEvents.GAME.register(SpecialEffects::displayRareDropEffect);
+ }
+
+ private static void displayRareDropEffect(Text message, boolean overlay) {
+ //We don't check if we're in dungeons because that check doesn't work in m7 which defeats the point of this
+ //It might also allow it to work with Croesus
+ if (Utils.isOnSkyblock() && SkyblockerConfig.get().general.specialEffects.rareDungeonDropEffects) {
+ try {
+ String stringForm = message.getString();
+ Matcher matcher = DROP_PATTERN.matcher(stringForm);
+
+ if (matcher.matches()) {
+ MinecraftClient client = MinecraftClient.getInstance();
+ String player = matcher.group("player");
+
+ if (player.equals(client.getSession().getUsername())) {
+ ItemStack stack = getStackFromName(matcher.group("item"));
+
+ if (!stack.isEmpty()) {
+ if (RenderSystem.isOnRenderThread()) {
+ client.particleManager.addEmitter(client.player, ParticleTypes.PORTAL, 30);
+ client.gameRenderer.showFloatingItem(stack);
+ } else {
+ RenderSystem.recordRenderCall(() -> {
+ client.particleManager.addEmitter(client.player, ParticleTypes.PORTAL, 30);
+ client.gameRenderer.showFloatingItem(stack);
+ });
+ }
+ }
+ }
+ }
+ } catch (Exception e) { //In case there's a regex failure or something else bad happens
+ LOGGER.error("[Skyblocker Special Effects] An unexpected exception was encountered: ", e);
+ }
+ }
+ }
+
+ private static ItemStack getStackFromName(String itemName) {
+ return switch (itemName) {
+ //M7
+ case "Necron Dye" -> new ItemStack(Items.ORANGE_DYE);
+ case "Dark Claymore" -> new ItemStack(Items.STONE_SWORD);
+ case "Necron's Handle", "Shiny Necron's Handle" -> NECRON_HANDLE;
+ case "Enchanted Book (Thunderlord VII)" -> new ItemStack(Items.ENCHANTED_BOOK);
+ case "Master Skull - Tier 5" -> TIER_5_SKULL;
+ case "Shadow Warp", "Wither Shield", "Implosion" -> SCROLL;
+ case "Fifth Master Star" -> FIFTH_STAR;
+
+ //M6
+ case "Giant's Sword" -> new ItemStack(Items.IRON_SWORD);
+
+ default -> ItemStack.EMPTY;
+ };
+ }
+}