aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java15
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java9
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Utils.java21
-rw-r--r--src/main/resources/fabric.mod.json6
-rw-r--r--src/main/resources/skyblocker.accesswidener1
12 files changed, 51 insertions, 37 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java
index 978835d2..04761329 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java
@@ -6,24 +6,25 @@ import org.spongepowered.asm.mixin.injection.At;
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
import com.llamalad7.mixinextras.sugar.Local;
import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.minecraft.MinecraftProfileTextures;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import de.hysky.skyblocker.utils.Utils;
-import net.minecraft.client.texture.PlayerSkinProvider.Textures;
@Mixin(targets = "net.minecraft.client.texture.PlayerSkinProvider$1")
public class PlayerSkinProviderMixin {
- @ModifyReturnValue(method = "method_52867", at = @At("RETURN"))
- private static Textures skyblocker$fixTexturesThatHadAnInvalidSignature(Textures texture, @Local MinecraftSessionService sessionService, @Local GameProfile profile) {
- if (Utils.isOnHypixel() && texture == Textures.MISSING) {
+ //TODO This may not be needed anymore, will need to check
+ /*@ModifyReturnValue(method = "method_52867", at = @At("RETURN"))
+ private static MinecraftProfileTextures skyblocker$fixTexturesThatHadAnInvalidSignature(MinecraftProfileTextures texture, @Local MinecraftSessionService sessionService, @Local GameProfile profile) {
+ if (Utils.isOnHypixel() && texture == MinecraftProfileTextures.EMPTY) {
try {
- return Textures.fromMap(sessionService.getTextures(profile, false), false);
+ return MinecraftProfileTextures.fromMap(sessionService.getTextures(profile, false), false);
} catch (Throwable t) {
- return Textures.MISSING;
+ return MinecraftProfileTextures.EMPTY;
}
}
return texture;
- }
+ }*/
}
diff --git a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java
index 8da87be0..7d07f959 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java
@@ -13,8 +13,9 @@ import de.hysky.skyblocker.utils.Utils;
@Mixin(value = YggdrasilMinecraftSessionService.class, remap = false)
public class YggdrasilMinecraftSessionServiceMixin {
- @WrapOperation(method = "getSecurePropertyValue", remap = false, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
+ //TODO see if a new version of this is needed or not
+ /*@WrapOperation(method = "getSecurePropertyValue", remap = false, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
private void skyblocker$dontLogMissingSignaturesOrTamperedProperties(Logger logger, String message, Object property, Operation<Void> operation) {
if (!Utils.isOnHypixel()) operation.call(logger, message, property);
- }
+ }*/
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
index 43f624f6..75a0c20f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
@@ -14,9 +14,9 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.command.argument.EnumArgumentType;
import net.minecraft.entity.Entity;
import net.minecraft.text.Text;
+import net.minecraft.text.TextCodecs;
import net.minecraft.util.Formatting;
import net.minecraft.util.StringIdentifiable;
-import net.minecraft.util.dynamic.Codecs;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import org.jetbrains.annotations.NotNull;
@@ -33,7 +33,7 @@ public class SecretWaypoint extends Waypoint {
public static final Codec<SecretWaypoint> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.INT.fieldOf("secretIndex").forGetter(secretWaypoint -> secretWaypoint.secretIndex),
Category.CODEC.fieldOf("category").forGetter(secretWaypoint -> secretWaypoint.category),
- Codecs.TEXT.fieldOf("name").forGetter(secretWaypoint -> secretWaypoint.name),
+ TextCodecs.CODEC.fieldOf("name").forGetter(secretWaypoint -> secretWaypoint.name),
BlockPos.CODEC.fieldOf("pos").forGetter(secretWaypoint -> secretWaypoint.pos)
).apply(instance, SecretWaypoint::new));
public static final Codec<List<SecretWaypoint>> LIST_CODEC = CODEC.listOf();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java b/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
index 823c4c99..773f1808 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java
@@ -33,6 +33,7 @@ import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.nbt.NbtIo;
import net.minecraft.nbt.NbtList;
+import net.minecraft.nbt.NbtTagSizeTracker;
import net.minecraft.util.Util;
public class MuseumItemCache {
@@ -92,7 +93,7 @@ public class MuseumItemCache {
for (Map.Entry<String, JsonElement> donatedSet : donatedSets.entrySet()) {
//Item is plural here because the nbt is a list
String itemsData = donatedSet.getValue().getAsJsonObject().get("items").getAsJsonObject().get("data").getAsString();
- NbtList items = NbtIo.readCompressed(new ByteArrayInputStream(Base64.getDecoder().decode(itemsData))).getList("i", NbtElement.COMPOUND_TYPE);
+ NbtList items = NbtIo.readCompressed(new ByteArrayInputStream(Base64.getDecoder().decode(itemsData)), NbtTagSizeTracker.ofUnlimitedBytes()).getList("i", NbtElement.COMPOUND_TYPE);
for (int i = 0; i < items.size(); i++) {
NbtCompound tag = items.getCompound(i).getCompound("tag");
@@ -164,4 +165,4 @@ public class MuseumItemCache {
return System.currentTimeMillis() > lastUpdated + MAX_AGE;
}
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
index 5627b56d..af2a062b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
@@ -25,6 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Objects;
import java.util.regex.Matcher;
@@ -74,12 +75,12 @@ public class BackpackPreview {
private static void loadStorages() {
for (int index = 0; index < STORAGE_SIZE; ++index) {
storages[index] = null;
- File storageFile = saveDir.resolve(index + ".nbt").toFile();
- if (storageFile.isFile()) {
+ Path storageFile = saveDir.resolve(index + ".nbt");
+ if (Files.isRegularFile(storageFile)) {
try {
storages[index] = Storage.fromNbt(Objects.requireNonNull(NbtIo.read(storageFile)));
} catch (Exception e) {
- LOGGER.error("Failed to load backpack preview file: " + storageFile.getName(), e);
+ LOGGER.error("Failed to load backpack preview file: " + storageFile.getFileName().toString(), e);
}
}
}
@@ -95,7 +96,7 @@ public class BackpackPreview {
private static void saveStorage(int index) {
try {
- NbtIo.write(storages[index].toNbt(), saveDir.resolve(index + ".nbt").toFile());
+ NbtIo.write(storages[index].toNbt(), saveDir.resolve(index + ".nbt"));
storages[index].markClean();
} catch (Exception e) {
LOGGER.error("Failed to save backpack preview file: " + index + ".nbt", e);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java
index cc7c0bc1..c1eea23a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java
@@ -49,11 +49,11 @@ public class ItemStackBuilder {
tag.put("display", display);
String name = injectData(item.getDisplayName(), injectors);
- display.put("Name", NbtString.of(Text.Serializer.toJson(Text.of(name))));
+ display.put("Name", NbtString.of(Text.Serialization.toJsonString(Text.of(name))));
NbtList lore = new NbtList();
display.put("Lore", lore);
- item.getLore().forEach(el -> lore.add(NbtString.of(Text.Serializer.toJson(Text.of(injectData(el, injectors))))));
+ item.getLore().forEach(el -> lore.add(NbtString.of(Text.Serialization.toJsonString(Text.of(injectData(el, injectors))))));
String nbttag = item.getNbttag();
// add skull texture
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java
index 95e08c80..f2831b0d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java
@@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
import net.minecraft.text.Text;
import net.minecraft.text.TextColor;
import net.minecraft.util.DyeColor;
+import net.minecraft.util.Formatting;
import net.minecraft.util.math.BlockPos;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +45,7 @@ public class EffigyWaypoints {
effigiesText.addAll(prefixAndSuffix.get(1).getSiblings());
for (int i2 = 1; i2 < effigiesText.size(); i2++) {
- if (effigiesText.get(i2).getStyle().getColor() == TextColor.parse("gray")) UNBROKEN_EFFIGIES.add(EFFIGIES.get(i2 - 1));
+ if (effigiesText.get(i2).getStyle().getColor().equals(TextColor.fromFormatting(Formatting.GRAY))) UNBROKEN_EFFIGIES.add(EFFIGIES.get(i2 - 1));
}
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
index 5ebe4c1a..43647ec6 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigListWidget.java
@@ -18,8 +18,14 @@ public class ShortcutsConfigListWidget extends ElementListWidget<ShortcutsConfig
private final ShortcutsConfigScreen screen;
private final List<Map<String, String>> shortcutMaps = new ArrayList<>();
- public ShortcutsConfigListWidget(MinecraftClient minecraftClient, ShortcutsConfigScreen screen, int width, int height, int top, int bottom, int itemHeight) {
- super(minecraftClient, width, height, top, bottom, itemHeight);
+ /**
+ * @param width the width of the widget
+ * @param height the height of the widget
+ * @param y the y coordinate to start rendering/placing the widget from
+ * @param itemHeight the height of each item
+ */
+ public ShortcutsConfigListWidget(MinecraftClient minecraftClient, ShortcutsConfigScreen screen, int width, int height, int y, int itemHeight) {
+ super(minecraftClient, width, height, y, itemHeight);
this.screen = screen;
ShortcutCategoryEntry commandCategory = new ShortcutCategoryEntry(Shortcuts.commands, "skyblocker.shortcuts.command.target", "skyblocker.shortcuts.command.replacement");
if (Shortcuts.isShortcutsLoaded()) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
index a5f8ae2d..7c07b098 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java
@@ -38,9 +38,10 @@ public class ShortcutsConfigScreen extends Screen {
protected void init() {
super.init();
if (initialized) {
- shortcutsConfigListWidget.updateSize(width, height, 32, height - 64);
+ shortcutsConfigListWidget.setDimensions(width, height - 88);
+ shortcutsConfigListWidget.setY(32);
} else {
- shortcutsConfigListWidget = new ShortcutsConfigListWidget(client, this, width, height, 32, height - 64, 25);
+ shortcutsConfigListWidget = new ShortcutsConfigListWidget(client, this, width, height - 88, 32, 25);
initialized = true;
}
addDrawableChild(shortcutsConfigListWidget);
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index 02b1637b..22601c98 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -266,18 +266,21 @@ public class Utils {
ObjectArrayList<Text> textLines = new ObjectArrayList<>();
ObjectArrayList<String> stringLines = new ObjectArrayList<>();
- for (ScoreboardPlayerScore score : scoreboard.getAllPlayerScores(objective)) {
- Team team = scoreboard.getPlayerTeam(score.getPlayerName());
+ for (ScoreHolder scoreHolder : scoreboard.getKnownScoreHolders()) {
+ //Limit to just objectives displayed in the scoreboard (specifically sidebar objective)
+ if (scoreboard.getScoreHolderObjectives(scoreHolder).containsKey(objective)) {
+ Team team = scoreboard.getScoreHolderTeam(scoreHolder.getNameForScoreboard());
- if (team != null) {
- Text textLine = Text.empty().append(team.getPrefix().copy()).append(team.getSuffix().copy());
- String strLine = team.getPrefix().getString() + team.getSuffix().getString();
+ if (team != null) {
+ Text textLine = Text.empty().append(team.getPrefix().copy()).append(team.getSuffix().copy());
+ String strLine = team.getPrefix().getString() + team.getSuffix().getString();
- if (!strLine.trim().isEmpty()) {
- String formatted = Formatting.strip(strLine);
+ if (!strLine.trim().isEmpty()) {
+ String formatted = Formatting.strip(strLine);
- textLines.add(textLine);
- stringLines.add(formatted);
+ textLines.add(textLine);
+ stringLines.add(formatted);
+ }
}
}
}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index b55214d5..19b66fc2 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -36,10 +36,10 @@
],
"accesswidener": "skyblocker.accesswidener",
"depends": {
- "fabricloader": ">=0.14.22",
- "fabric-api": ">=0.89.1+1.20.2",
+ "fabricloader": ">=0.14.24",
+ "fabric-api": ">=0.90.12+1.20.3",
"yet_another_config_lib_v3": ">=3.2.1+1.20.2",
- "minecraft": "~1.20.2"
+ "minecraft": "~1.20.3-beta.2"
},
"conflicts": {
"immediatelyfast": "<=1.1.26+1.20.1"
diff --git a/src/main/resources/skyblocker.accesswidener b/src/main/resources/skyblocker.accesswidener
index 7cf4250e..16130ceb 100644
--- a/src/main/resources/skyblocker.accesswidener
+++ b/src/main/resources/skyblocker.accesswidener
@@ -1,3 +1,2 @@
accessWidener v2 named
-accessible class net/minecraft/client/texture/PlayerSkinProvider$Textures \ No newline at end of file
generated by cgit (git 2.46.0) at 2025-02-06 16:52:41 +0000