diff --git a/src/main/java/com/github/clevernucleus/playerex/PlayerEx.java b/src/main/java/com/github/clevernucleus/playerex/PlayerEx.java index 0d97a9dd..f6804f9a 100644 --- a/src/main/java/com/github/clevernucleus/playerex/PlayerEx.java +++ b/src/main/java/com/github/clevernucleus/playerex/PlayerEx.java @@ -13,11 +13,11 @@ import com.github.clevernucleus.playerex.factory.RefundFactory; import com.github.clevernucleus.playerex.impl.CommandsImpl; -import eu.pb4.placeholders.PlaceholderAPI; +import eu.pb4.placeholders.api.Placeholders; import me.shedaniel.autoconfig.AutoConfig; import me.shedaniel.autoconfig.serializer.GsonConfigSerializer; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents; @@ -55,7 +55,7 @@ public void onInitialize() { DamageFactory.STORE.forEach(ExAPI::registerDamageModification); RefundFactory.STORE.forEach(ExAPI::registerRefundCondition); - PlaceholderFactory.STORE.forEach(PlaceholderAPI::register); + PlaceholderFactory.STORE.forEach(Placeholders::register); Registry.register(Registry.SOUND_EVENT, LEVEL_UP_SOUND.getId(), LEVEL_UP_SOUND); Registry.register(Registry.SOUND_EVENT, SP_SPEND_SOUND.getId(), SP_SPEND_SOUND); diff --git a/src/main/java/com/github/clevernucleus/playerex/api/client/ClientUtil.java b/src/main/java/com/github/clevernucleus/playerex/api/client/ClientUtil.java index fa1d4b41..0e333298 100644 --- a/src/main/java/com/github/clevernucleus/playerex/api/client/ClientUtil.java +++ b/src/main/java/com/github/clevernucleus/playerex/api/client/ClientUtil.java @@ -15,10 +15,8 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.entity.attribute.EntityAttribute; -import net.minecraft.text.LiteralText; import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; @Environment(EnvType.CLIENT) @@ -84,8 +82,8 @@ public static void appendChildrenToTooltip(List tooltip, final Supplier (EntityAttribute)attribute2, value); String formt = formatValue(() -> (EntityAttribute)attribute2, displ); - MutableText mutableText = new LiteralText(formt + " "); - mutableText.append(new TranslatableText(((EntityAttribute)attribute2).getTranslationKey())); + MutableText mutableText = Text.literal(formt + " "); + mutableText.append(Text.translatable(((EntityAttribute)attribute2).getTranslationKey())); tooltip.add(mutableText.formatted(Formatting.GRAY)); } } diff --git a/src/main/java/com/github/clevernucleus/playerex/api/client/RenderComponent.java b/src/main/java/com/github/clevernucleus/playerex/api/client/RenderComponent.java index 46983dfd..b74ccc55 100644 --- a/src/main/java/com/github/clevernucleus/playerex/api/client/RenderComponent.java +++ b/src/main/java/com/github/clevernucleus/playerex/api/client/RenderComponent.java @@ -13,7 +13,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.attribute.EntityAttribute; -import net.minecraft.text.LiteralText; import net.minecraft.text.Text; /** @@ -57,7 +56,7 @@ public static RenderComponent of(final Function functionIn, * @return */ public static RenderComponent of(final Supplier attributeIn, final Function functionIn, final Function> tooltipIn, final int dx, final int dy) { - return new RenderComponent(livingEntity -> DataAttributesAPI.ifPresent(livingEntity, attributeIn, LiteralText.EMPTY, functionIn), livingEntity -> DataAttributesAPI.ifPresent(livingEntity, attributeIn, new ArrayList(), tooltipIn), dx, dy); + return new RenderComponent(livingEntity -> DataAttributesAPI.ifPresent(livingEntity, attributeIn, Text.empty(), functionIn), livingEntity -> DataAttributesAPI.ifPresent(livingEntity, attributeIn, new ArrayList(), tooltipIn), dx, dy); } private boolean isMouseOver(float xIn, float yIn, float widthIn, float heightIn, int mouseX, int mouseY) { diff --git a/src/main/java/com/github/clevernucleus/playerex/client/PageRegistryImpl.java b/src/main/java/com/github/clevernucleus/playerex/client/PageRegistryImpl.java index e6d2891f..236a9e5e 100644 --- a/src/main/java/com/github/clevernucleus/playerex/client/PageRegistryImpl.java +++ b/src/main/java/com/github/clevernucleus/playerex/client/PageRegistryImpl.java @@ -13,7 +13,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -40,7 +39,7 @@ public static Map> pages() { } public static Page findPage(final Identifier pageId) { - return PAGES.getOrDefault(pageId, () -> new Page(pageId, BLANK, LiteralText.EMPTY)).get(); + return PAGES.getOrDefault(pageId, () -> new Page(pageId, BLANK, Text.empty())).get(); } public static Collection findPageLayers(final Identifier pageId) { diff --git a/src/main/java/com/github/clevernucleus/playerex/client/PlayerExClient.java b/src/main/java/com/github/clevernucleus/playerex/client/PlayerExClient.java index ae4f4ef6..1c89ab08 100644 --- a/src/main/java/com/github/clevernucleus/playerex/client/PlayerExClient.java +++ b/src/main/java/com/github/clevernucleus/playerex/client/PlayerExClient.java @@ -22,14 +22,14 @@ import net.minecraft.client.gui.screen.ingame.HandledScreens; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; public class PlayerExClient implements ClientModInitializer { public static final Identifier GUI = new Identifier(ExAPI.MODID, "textures/gui/gui.png"); public static final Identifier ATTRIBUTES_PAGE = new Identifier(ExAPI.MODID, "attributes"); public static final Identifier COMBAT_PAGE = new Identifier(ExAPI.MODID, "combat"); - public static final Page INVENTORY = new Page(new Identifier(ExAPI.MODID, "inventory"), new Identifier(ExAPI.MODID, "textures/gui/inventory.png"), new TranslatableText("playerex.gui.page.inventory.title")); + public static final Page INVENTORY = new Page(new Identifier(ExAPI.MODID, "inventory"), new Identifier(ExAPI.MODID, "textures/gui/inventory.png"), Text.translatable("playerex.gui.page.inventory.title")); public static KeyBinding keyBinding; @Override @@ -39,8 +39,8 @@ public void onInitializeClient() { keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("playerex.key.screen", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_R, "key.categories.inventory")); HandledScreens.register(PlayerEx.EX_SCREEN, ExScreen::new); - PageRegistry.registerPage(ATTRIBUTES_PAGE, new Identifier(ExAPI.MODID, "textures/gui/attributes.png"), new TranslatableText("playerex.gui.page.attributes.title")); - PageRegistry.registerPage(COMBAT_PAGE, new Identifier(ExAPI.MODID, "textures/gui/combat.png"), new TranslatableText("playerex.gui.page.combat.title")); + PageRegistry.registerPage(ATTRIBUTES_PAGE, new Identifier(ExAPI.MODID, "textures/gui/attributes.png"), Text.translatable("playerex.gui.page.attributes.title")); + PageRegistry.registerPage(COMBAT_PAGE, new Identifier(ExAPI.MODID, "textures/gui/combat.png"), Text.translatable("playerex.gui.page.combat.title")); PageRegistry.registerLayer(ATTRIBUTES_PAGE, AttributesPageLayer::new); PageRegistry.registerLayer(COMBAT_PAGE, CombatPageLayer::new); diff --git a/src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java b/src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java index 201cceb7..b471837c 100644 --- a/src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java +++ b/src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java @@ -30,9 +30,7 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; import net.minecraft.sound.SoundCategory; -import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; @@ -79,15 +77,15 @@ private void buttonTooltip(ButtonWidget buttonIn, MatrixStack matrices, int mous int requiredXp = ExAPI.getConfig().requiredXp(this.client.player); int currentXp = this.client.player.experienceLevel; String progress = "(" + currentXp + "/" + requiredXp + ")"; - Text tooltip = (new TranslatableText("playerex.gui.page.attributes.tooltip.button.level", progress)).formatted(Formatting.GRAY); + Text tooltip = (Text.translatable("playerex.gui.page.attributes.tooltip.button.level", progress)).formatted(Formatting.GRAY); this.renderTooltip(matrices, tooltip, mouseX, mouseY); } else { Supplier attribute = DataAttributesAPI.getAttribute(key); DataAttributesAPI.ifPresent(this.client.player, attribute, (Object)null, value -> { - Text text = new TranslatableText(attribute.get().getTranslationKey()); + Text text = Text.translatable(attribute.get().getTranslationKey()); String type = "playerex.gui.page.attributes.tooltip.button." + (this.canRefund() ? "refund" : "skill"); - Text tooltip = (new TranslatableText(type)).append(text).formatted(Formatting.GRAY); + Text tooltip = (Text.translatable(type)).append(text).formatted(Formatting.GRAY); this.renderTooltip(matrices, tooltip, mouseX, mouseY); return (Object)null; @@ -102,8 +100,8 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { COMPONENTS.forEach(component -> component.renderText(this.client.player, matrices, this.textRenderer, this.x, this.y, scaleX.get(), scaleY.get())); - this.textRenderer.draw(matrices, (new TranslatableText("playerex.gui.page.attributes.text.vitality")), (this.x + 105) / scaleX.get(), (this.y + 26) / scaleY.get(), 4210752); - this.textRenderer.draw(matrices, (new TranslatableText("playerex.gui.page.attributes.text.resistances")), (this.x + 105) / scaleX.get(), (this.y + 81) / scaleY.get(), 4210752); + this.textRenderer.draw(matrices, (Text.translatable("playerex.gui.page.attributes.text.vitality")), (this.x + 105) / scaleX.get(), (this.y + 26) / scaleY.get(), 4210752); + this.textRenderer.draw(matrices, (Text.translatable("playerex.gui.page.attributes.text.resistances")), (this.x + 105) / scaleX.get(), (this.y + 81) / scaleY.get(), 4210752); matrices.pop(); @@ -172,97 +170,97 @@ protected void init() { static { COMPONENTS.add(RenderComponent.of(ExAPI.LEVEL, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.level", Math.round(value)); + return Text.translatable("playerex.gui.page.attributes.text.level", Math.round(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.level[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.level[1]")).formatted(Formatting.GRAY)); - tooltip.add(LiteralText.EMPTY); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.level[2]", ExAPI.getConfig().skillPointsPerLevelUp())).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.level[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.level[1]")).formatted(Formatting.GRAY)); + tooltip.add(Text.empty()); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.level[2]", ExAPI.getConfig().skillPointsPerLevelUp())).formatted(Formatting.GRAY)); return tooltip; }, 21, 26)); COMPONENTS.add(RenderComponent.of(entity -> { - return new TranslatableText("playerex.gui.page.attributes.text.skill_points", ExAPI.PLAYER_DATA.get(entity).skillPoints()); + return Text.translatable("playerex.gui.page.attributes.text.skill_points", ExAPI.PLAYER_DATA.get(entity).skillPoints()); }, entity -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.skill_points[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.skill_points[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.skill_points[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.skill_points[1]")).formatted(Formatting.GRAY)); return tooltip; }, 21, 37)); COMPONENTS.add(RenderComponent.of(ExAPI.CONSTITUTION, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.constitution", Math.round(value)); + return Text.translatable("playerex.gui.page.attributes.text.constitution", Math.round(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText(ExAPI.CONSTITUTION.get().getTranslationKey())).formatted(Formatting.GRAY)); - tooltip.add(LiteralText.EMPTY); + tooltip.add((Text.translatable(ExAPI.CONSTITUTION.get().getTranslationKey())).formatted(Formatting.GRAY)); + tooltip.add(Text.empty()); ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.CONSTITUTION); return tooltip; }, 21, 59)); COMPONENTS.add(RenderComponent.of(ExAPI.STRENGTH, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.strength", Math.round(value)); + return Text.translatable("playerex.gui.page.attributes.text.strength", Math.round(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText(ExAPI.STRENGTH.get().getTranslationKey())).formatted(Formatting.GRAY)); - tooltip.add(LiteralText.EMPTY); + tooltip.add((Text.translatable(ExAPI.STRENGTH.get().getTranslationKey())).formatted(Formatting.GRAY)); + tooltip.add(Text.empty()); ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.STRENGTH); return tooltip; }, 21, 70)); COMPONENTS.add(RenderComponent.of(ExAPI.DEXTERITY, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.dexterity", Math.round(value)); + return Text.translatable("playerex.gui.page.attributes.text.dexterity", Math.round(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText(ExAPI.DEXTERITY.get().getTranslationKey())).formatted(Formatting.GRAY)); - tooltip.add(LiteralText.EMPTY); + tooltip.add((Text.translatable(ExAPI.DEXTERITY.get().getTranslationKey())).formatted(Formatting.GRAY)); + tooltip.add(Text.empty()); ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.DEXTERITY); return tooltip; }, 21, 81)); COMPONENTS.add(RenderComponent.of(ExAPI.INTELLIGENCE, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.intelligence", Math.round(value)); + return Text.translatable("playerex.gui.page.attributes.text.intelligence", Math.round(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText(ExAPI.INTELLIGENCE.get().getTranslationKey())).formatted(Formatting.GRAY)); - tooltip.add(LiteralText.EMPTY); + tooltip.add((Text.translatable(ExAPI.INTELLIGENCE.get().getTranslationKey())).formatted(Formatting.GRAY)); + tooltip.add(Text.empty()); ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.INTELLIGENCE); return tooltip; }, 21, 92)); COMPONENTS.add(RenderComponent.of(ExAPI.LUCKINESS, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.luckiness", Math.round(value)); + return Text.translatable("playerex.gui.page.attributes.text.luckiness", Math.round(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText(ExAPI.LUCKINESS.get().getTranslationKey())).formatted(Formatting.GRAY)); - tooltip.add(LiteralText.EMPTY); + tooltip.add((Text.translatable(ExAPI.LUCKINESS.get().getTranslationKey())).formatted(Formatting.GRAY)); + tooltip.add(Text.empty()); ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.LUCKINESS); return tooltip; }, 21, 103)); COMPONENTS.add(RenderComponent.of(entity -> { - return new TranslatableText("playerex.gui.page.attributes.text.movement_speed", ClientUtil.FORMATTING_3.format(entity.getMovementSpeed())); + return Text.translatable("playerex.gui.page.attributes.text.movement_speed", ClientUtil.FORMATTING_3.format(entity.getMovementSpeed())); }, entity -> { List tooltip = new ArrayList(); String formatted = ClientUtil.FORMATTING_3.format(20.0D * entity.getMovementSpeed()); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.movement_speed", formatted)).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.movement_speed", formatted)).formatted(Formatting.GRAY)); return tooltip; }, 21, 125)); COMPONENTS.add(RenderComponent.of(ExAPI.BREAKING_SPEED, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.breaking_speed", ClientUtil.FORMATTING_3.format(value)); + return Text.translatable("playerex.gui.page.attributes.text.breaking_speed", ClientUtil.FORMATTING_3.format(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.breaking_speed")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.breaking_speed")).formatted(Formatting.GRAY)); return tooltip; }, 21, 136)); COMPONENTS.add(RenderComponent.of(ExAPI.REACH_DISTANCE, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.reach_distance", ClientUtil.FORMATTING_2.format(4.5F + value)); + return Text.translatable("playerex.gui.page.attributes.text.reach_distance", ClientUtil.FORMATTING_2.format(4.5F + value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.reach_distance", ClientUtil.FORMATTING_2.format(4.5F + value))).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.reach_distance", ClientUtil.FORMATTING_2.format(4.5F + value))).formatted(Formatting.GRAY)); return tooltip; }, 21, 147)); @@ -270,79 +268,79 @@ protected void init() { String current = ClientUtil.FORMATTING_2.format(entity.getHealth()); String maximum = ClientUtil.FORMATTING_2.format(entity.getMaxHealth()); - return new TranslatableText("playerex.gui.page.attributes.text.health", current, maximum); + return Text.translatable("playerex.gui.page.attributes.text.health", current, maximum); }, entity -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.health")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.health")).formatted(Formatting.GRAY)); return tooltip; }, 93, 37)); COMPONENTS.add(RenderComponent.of(ExAPI.HEALTH_REGENERATION, value -> { - return new TranslatableText("playerex.gui.page.attributes.text.health_regeneration", value); + return Text.translatable("playerex.gui.page.attributes.text.health_regeneration", value); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.health_regeneration[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.health_regeneration[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.health_regeneration[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.health_regeneration[1]")).formatted(Formatting.GRAY)); return tooltip; }, 93, 48)); COMPONENTS.add(RenderComponent.of(ExAPI.HEAL_AMPLIFICATION, value -> { String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.HEAL_AMPLIFICATION, value)); - return new TranslatableText("playerex.gui.page.attributes.text.heal_amplification", displ); + return Text.translatable("playerex.gui.page.attributes.text.heal_amplification", displ); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.heal_amplification[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.heal_amplification[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.heal_amplification[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.heal_amplification[1]")).formatted(Formatting.GRAY)); return tooltip; }, 93, 59)); COMPONENTS.add(RenderComponent.of(ExAPI.FIRE_RESISTANCE, value -> { String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.FIRE_RESISTANCE, value)); - return new TranslatableText("playerex.gui.page.attributes.text.fire_resistance", displ); + return Text.translatable("playerex.gui.page.attributes.text.fire_resistance", displ); }, value -> { List tooltip = new ArrayList(); String displ = ClientUtil.FORMATTING_2.format(100.0F * value); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.fire_resistance", displ)).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.fire_resistance", displ)).formatted(Formatting.GRAY)); return tooltip; }, 93, 92)); COMPONENTS.add(RenderComponent.of(ExAPI.FREEZE_RESISTANCE, value -> { String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.FREEZE_RESISTANCE, value)); - return new TranslatableText("playerex.gui.page.attributes.text.freeze_resistance", displ); + return Text.translatable("playerex.gui.page.attributes.text.freeze_resistance", displ); }, value -> { List tooltip = new ArrayList(); String displ = ClientUtil.FORMATTING_2.format(100.0F * value); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.freeze_resistance", displ)).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.freeze_resistance", displ)).formatted(Formatting.GRAY)); return tooltip; }, 93, 103)); COMPONENTS.add(RenderComponent.of(ExAPI.LIGHTNING_RESISTANCE, value -> { String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.LIGHTNING_RESISTANCE, value)); - return new TranslatableText("playerex.gui.page.attributes.text.lightning_resistance", displ); + return Text.translatable("playerex.gui.page.attributes.text.lightning_resistance", displ); }, value -> { List tooltip = new ArrayList(); String displ = ClientUtil.FORMATTING_2.format(100.0F * value); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.lightning_resistance", displ)).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.lightning_resistance", displ)).formatted(Formatting.GRAY)); return tooltip; }, 93, 114)); COMPONENTS.add(RenderComponent.of(ExAPI.POISON_RESISTANCE, value -> { String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.POISON_RESISTANCE, value)); - return new TranslatableText("playerex.gui.page.attributes.text.poison_resistance", displ); + return Text.translatable("playerex.gui.page.attributes.text.poison_resistance", displ); }, value -> { List tooltip = new ArrayList(); String displ = ClientUtil.FORMATTING_2.format(100.0F * value); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.poison_resistance", displ)).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.poison_resistance", displ)).formatted(Formatting.GRAY)); return tooltip; }, 93, 125)); COMPONENTS.add(RenderComponent.of(ExAPI.WITHER_RESISTANCE, value -> { String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.WITHER_RESISTANCE, value)); - return new TranslatableText("playerex.gui.page.attributes.text.wither_resistance", displ); + return Text.translatable("playerex.gui.page.attributes.text.wither_resistance", displ); }, value -> { List tooltip = new ArrayList(); String displ = ClientUtil.FORMATTING_2.format(100.0F * value); - tooltip.add((new TranslatableText("playerex.gui.page.attributes.tooltip.wither_resistance", displ)).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.wither_resistance", displ)).formatted(Formatting.GRAY)); return tooltip; }, 93, 136)); diff --git a/src/main/java/com/github/clevernucleus/playerex/client/gui/CombatPageLayer.java b/src/main/java/com/github/clevernucleus/playerex/client/gui/CombatPageLayer.java index 46c74e9a..6fe35c4f 100644 --- a/src/main/java/com/github/clevernucleus/playerex/client/gui/CombatPageLayer.java +++ b/src/main/java/com/github/clevernucleus/playerex/client/gui/CombatPageLayer.java @@ -20,7 +20,6 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; @Environment(EnvType.CLIENT) @@ -42,9 +41,9 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { COMPONENTS.forEach(component -> component.renderText(this.client.player, matrices, this.textRenderer, this.x, this.y, scaleX.get(), scaleY.get())); - this.textRenderer.draw(matrices, (new TranslatableText("playerex.gui.page.combat.text.melee")), (this.x + 21) / scaleX.get(), (this.y + 26) / scaleY.get(), 4210752); - this.textRenderer.draw(matrices, (new TranslatableText("playerex.gui.page.combat.text.defense")), (this.x + 21) / scaleX.get(), (this.y + 92) / scaleY.get(), 4210752); - this.textRenderer.draw(matrices, (new TranslatableText("playerex.gui.page.combat.text.ranged")), (this.x + 105) / scaleX.get(), (this.y + 26) / scaleY.get(), 4210752); + this.textRenderer.draw(matrices, (Text.translatable("playerex.gui.page.combat.text.melee")), (this.x + 21) / scaleX.get(), (this.y + 26) / scaleY.get(), 4210752); + this.textRenderer.draw(matrices, (Text.translatable("playerex.gui.page.combat.text.defense")), (this.x + 21) / scaleX.get(), (this.y + 92) / scaleY.get(), 4210752); + this.textRenderer.draw(matrices, (Text.translatable("playerex.gui.page.combat.text.ranged")), (this.x + 105) / scaleX.get(), (this.y + 26) / scaleY.get(), 4210752); matrices.pop(); @@ -71,115 +70,115 @@ public void drawBackground(MatrixStack matrices, float delta, int mouseX, int mo static { COMPONENTS.add(RenderComponent.of(() -> EntityAttributes.GENERIC_ATTACK_SPEED, value -> { - return new TranslatableText("playerex.gui.page.combat.text.attack_speed", ClientUtil.FORMATTING_2.format(value)); + return Text.translatable("playerex.gui.page.combat.text.attack_speed", ClientUtil.FORMATTING_2.format(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.attack_speed[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.attack_speed[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.attack_speed[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.attack_speed[1]")).formatted(Formatting.GRAY)); return tooltip; }, 9, 37)); COMPONENTS.add(RenderComponent.of(() -> EntityAttributes.GENERIC_ATTACK_DAMAGE, value -> { - return new TranslatableText("playerex.gui.page.combat.text.attack_damage", ClientUtil.FORMATTING_2.format(value)); + return Text.translatable("playerex.gui.page.combat.text.attack_damage", ClientUtil.FORMATTING_2.format(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.attack_damage[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.attack_damage[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.attack_damage[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.attack_damage[1]")).formatted(Formatting.GRAY)); return tooltip; }, 9, 48)); COMPONENTS.add(RenderComponent.of(ExAPI.MELEE_CRIT_DAMAGE, value -> { double disp = 100.0D + ClientUtil.displayValue(ExAPI.MELEE_CRIT_DAMAGE, value); - return new TranslatableText("playerex.gui.page.combat.text.melee_crit_damage", ClientUtil.FORMATTING_2.format(disp)); + return Text.translatable("playerex.gui.page.combat.text.melee_crit_damage", ClientUtil.FORMATTING_2.format(disp)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.melee_crit_damage[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.melee_crit_damage[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.melee_crit_damage[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.melee_crit_damage[1]")).formatted(Formatting.GRAY)); return tooltip; }, 9, 59)); COMPONENTS.add(RenderComponent.of(ExAPI.MELEE_CRIT_CHANCE, value -> { double disp = ClientUtil.displayValue(ExAPI.MELEE_CRIT_CHANCE, value); - return new TranslatableText("playerex.gui.page.combat.text.melee_crit_chance", ClientUtil.FORMATTING_2.format(disp)); + return Text.translatable("playerex.gui.page.combat.text.melee_crit_chance", ClientUtil.FORMATTING_2.format(disp)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.melee_crit_chance[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.melee_crit_chance[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.melee_crit_chance[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.melee_crit_chance[1]")).formatted(Formatting.GRAY)); return tooltip; }, 9, 71)); COMPONENTS.add(RenderComponent.of(() -> EntityAttributes.GENERIC_ARMOR, value -> { - return new TranslatableText("playerex.gui.page.combat.text.armor", ClientUtil.FORMATTING_2.format(value)); + return Text.translatable("playerex.gui.page.combat.text.armor", ClientUtil.FORMATTING_2.format(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.armor[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.armor[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.armor[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.armor[1]")).formatted(Formatting.GRAY)); return tooltip; }, 9, 103)); COMPONENTS.add(RenderComponent.of(() -> EntityAttributes.GENERIC_ARMOR_TOUGHNESS, value -> { - return new TranslatableText("playerex.gui.page.combat.text.armor_toughness", ClientUtil.FORMATTING_2.format(value)); + return Text.translatable("playerex.gui.page.combat.text.armor_toughness", ClientUtil.FORMATTING_2.format(value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.armor_toughness[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.armor_toughness[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.armor_toughness[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.armor_toughness[1]")).formatted(Formatting.GRAY)); return tooltip; }, 9, 114)); COMPONENTS.add(RenderComponent.of(() -> EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, value -> { double disp = ClientUtil.displayValue(() -> EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, value); - return new TranslatableText("playerex.gui.page.combat.text.knockback_resistance", ClientUtil.FORMATTING_2.format(disp)); + return Text.translatable("playerex.gui.page.combat.text.knockback_resistance", ClientUtil.FORMATTING_2.format(disp)); }, value -> { List tooltip = new ArrayList(); double disp = 100.0D * value; - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.knockback_resistance", ClientUtil.FORMATTING_2.format(disp))).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.knockback_resistance", ClientUtil.FORMATTING_2.format(disp))).formatted(Formatting.GRAY)); return tooltip; }, 9, 125)); COMPONENTS.add(RenderComponent.of(ExAPI.EVASION, value -> { double disp = ClientUtil.displayValue(ExAPI.EVASION, value); - return new TranslatableText("playerex.gui.page.combat.text.evasion", ClientUtil.FORMATTING_2.format(disp)); + return Text.translatable("playerex.gui.page.combat.text.evasion", ClientUtil.FORMATTING_2.format(disp)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.evasion[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.evasion[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.evasion[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.evasion[1]")).formatted(Formatting.GRAY)); return tooltip; }, 9, 136)); COMPONENTS.add(RenderComponent.of(ExAPI.RANGED_DAMAGE, value -> { double disp = ClientUtil.displayValue(ExAPI.RANGED_DAMAGE, value); - return new TranslatableText("playerex.gui.page.combat.text.ranged_damage", ClientUtil.FORMATTING_2.format(disp)); + return Text.translatable("playerex.gui.page.combat.text.ranged_damage", ClientUtil.FORMATTING_2.format(disp)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.ranged_damage[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.ranged_damage[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.ranged_damage[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.ranged_damage[1]")).formatted(Formatting.GRAY)); return tooltip; }, 93, 37)); COMPONENTS.add(RenderComponent.of(ExAPI.RANGED_CRIT_DAMAGE, value -> { double disp = 100.0D + ClientUtil.displayValue(ExAPI.RANGED_CRIT_DAMAGE, value); - return new TranslatableText("playerex.gui.page.combat.text.ranged_crit_damage", ClientUtil.FORMATTING_2.format(disp)); + return Text.translatable("playerex.gui.page.combat.text.ranged_crit_damage", ClientUtil.FORMATTING_2.format(disp)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.ranged_crit_damage[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.ranged_crit_damage[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.ranged_crit_damage[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.ranged_crit_damage[1]")).formatted(Formatting.GRAY)); return tooltip; }, 93, 48)); COMPONENTS.add(RenderComponent.of(ExAPI.RANGED_CRIT_CHANCE, value -> { double disp = ClientUtil.displayValue(ExAPI.RANGED_CRIT_CHANCE, value); - return new TranslatableText("playerex.gui.page.combat.text.ranged_crit_chance", ClientUtil.FORMATTING_2.format(disp)); + return Text.translatable("playerex.gui.page.combat.text.ranged_crit_chance", ClientUtil.FORMATTING_2.format(disp)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.ranged_crit_chance[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.ranged_crit_chance[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.ranged_crit_chance[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.ranged_crit_chance[1]")).formatted(Formatting.GRAY)); return tooltip; }, 93, 59)); COMPONENTS.add(RenderComponent.of(ExAPI.ATTACK_RANGE, value -> { - return new TranslatableText("playerex.gui.page.combat.text.attack_range", ClientUtil.FORMATTING_2.format(3.0F + value)); + return Text.translatable("playerex.gui.page.combat.text.attack_range", ClientUtil.FORMATTING_2.format(3.0F + value)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.attack_range", ClientUtil.FORMATTING_2.format(3.0F + value))).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.attack_range", ClientUtil.FORMATTING_2.format(3.0F + value))).formatted(Formatting.GRAY)); return tooltip; }, 105, 81)); COMPONENTS.add(RenderComponent.of(ExAPI.LIFESTEAL, value -> { double disp = ClientUtil.displayValue(ExAPI.LIFESTEAL, value); - return new TranslatableText("playerex.gui.page.combat.text.lifesteal", ClientUtil.FORMATTING_2.format(disp)); + return Text.translatable("playerex.gui.page.combat.text.lifesteal", ClientUtil.FORMATTING_2.format(disp)); }, value -> { List tooltip = new ArrayList(); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.lifesteal[0]")).formatted(Formatting.GRAY)); - tooltip.add((new TranslatableText("playerex.gui.page.combat.tooltip.lifesteal[1]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.lifesteal[0]")).formatted(Formatting.GRAY)); + tooltip.add((Text.translatable("playerex.gui.page.combat.tooltip.lifesteal[1]")).formatted(Formatting.GRAY)); return tooltip; }, 105, 92)); } diff --git a/src/main/java/com/github/clevernucleus/playerex/client/gui/widget/ScreenButtonWidget.java b/src/main/java/com/github/clevernucleus/playerex/client/gui/widget/ScreenButtonWidget.java index b271789c..ada8f16c 100644 --- a/src/main/java/com/github/clevernucleus/playerex/client/gui/widget/ScreenButtonWidget.java +++ b/src/main/java/com/github/clevernucleus/playerex/client/gui/widget/ScreenButtonWidget.java @@ -9,7 +9,7 @@ import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) @@ -21,7 +21,7 @@ public class ScreenButtonWidget extends ButtonWidget { public boolean alt; public ScreenButtonWidget(HandledScreen parent, int x, int y, int u, int v, int width, int height, Identifier key, PressAction pressAction, TooltipSupplier tooltipSupplier) { - super(x, y, width, height, LiteralText.EMPTY, pressAction, tooltipSupplier); + super(x, y, width, height, Text.empty(), pressAction, tooltipSupplier); this.parent = parent; this.key = key; diff --git a/src/main/java/com/github/clevernucleus/playerex/client/gui/widget/TabButtonWidget.java b/src/main/java/com/github/clevernucleus/playerex/client/gui/widget/TabButtonWidget.java index 47a4b79f..bb1ef169 100644 --- a/src/main/java/com/github/clevernucleus/playerex/client/gui/widget/TabButtonWidget.java +++ b/src/main/java/com/github/clevernucleus/playerex/client/gui/widget/TabButtonWidget.java @@ -10,7 +10,7 @@ import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) @@ -22,7 +22,7 @@ public class TabButtonWidget extends ButtonWidget { private final float scale = 1.0F / 16.0F; public TabButtonWidget(HandledScreen parent, Page page, int index, int x, int y, boolean startingState, PressAction onPress) { - super(x, y, 28, 32, LiteralText.EMPTY, onPress); + super(x, y, 28, 32, Text.empty(), onPress); this.parent = parent; this.page = page; diff --git a/src/main/java/com/github/clevernucleus/playerex/factory/ExScreenFactory.java b/src/main/java/com/github/clevernucleus/playerex/factory/ExScreenFactory.java index ebec0ee7..86502f3b 100644 --- a/src/main/java/com/github/clevernucleus/playerex/factory/ExScreenFactory.java +++ b/src/main/java/com/github/clevernucleus/playerex/factory/ExScreenFactory.java @@ -6,11 +6,11 @@ import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandler; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; public class ExScreenFactory implements ExtendedScreenHandlerFactory { private final int pageId; @@ -35,7 +35,7 @@ public void writeScreenOpeningData(ServerPlayerEntity player, PacketByteBuf buf) @Override public Text getDisplayName() { - return new TranslatableText("playerex.gui.page.attributes.title"); + return Text.translatable("playerex.gui.page.attributes.title"); } public static class Handler extends ScreenHandler { @@ -50,5 +50,10 @@ public Handler(int syncId, PlayerInventory inventory, int pageId) { public boolean canUse(PlayerEntity player) { return true; } + + @Override + public ItemStack transferSlot(PlayerEntity player, int index) { + return this.slots.get(index).getStack(); + } } } diff --git a/src/main/java/com/github/clevernucleus/playerex/factory/NetworkFactory.java b/src/main/java/com/github/clevernucleus/playerex/factory/NetworkFactory.java index 7d8e3d59..d6982ca5 100644 --- a/src/main/java/com/github/clevernucleus/playerex/factory/NetworkFactory.java +++ b/src/main/java/com/github/clevernucleus/playerex/factory/NetworkFactory.java @@ -20,7 +20,7 @@ import net.minecraft.server.network.ServerLoginNetworkHandler; import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; public final class NetworkFactory { @@ -41,7 +41,7 @@ public static void loginQueryStart(ServerLoginNetworkHandler handler, MinecraftS public static void loginQueryResponse(MinecraftServer server, ServerLoginNetworkHandler handler, boolean understood, PacketByteBuf buf, LoginSynchronizer synchronizer, PacketSender responseSender) { if(!understood) { - handler.disconnect(new LiteralText("Disconnected: network communication issue.")); + handler.disconnect(Text.literal("Disconnected: network communication issue.")); } } diff --git a/src/main/java/com/github/clevernucleus/playerex/factory/PlaceholderFactory.java b/src/main/java/com/github/clevernucleus/playerex/factory/PlaceholderFactory.java index 3c384cb9..2edce74f 100644 --- a/src/main/java/com/github/clevernucleus/playerex/factory/PlaceholderFactory.java +++ b/src/main/java/com/github/clevernucleus/playerex/factory/PlaceholderFactory.java @@ -12,8 +12,8 @@ import com.github.clevernucleus.opc.api.OfflinePlayerCache; import com.github.clevernucleus.playerex.api.ExAPI; -import eu.pb4.placeholders.PlaceholderHandler; -import eu.pb4.placeholders.PlaceholderResult; +import eu.pb4.placeholders.api.PlaceholderHandler; +import eu.pb4.placeholders.api.PlaceholderResult; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; @@ -38,14 +38,14 @@ private static NameLevelPair nameLevelPair(final MinecraftServer server, final C } private static PlaceholderHandler top(Function function) { - return ctx -> { - MinecraftServer server = ctx.getServer(); + return (ctx, arg) -> { + MinecraftServer server = ctx.server(); Collection names = OfflinePlayerCache.getOfflinePlayerCache(server, Collections.emptySet(), opc -> opc.playerNames()); int index = 1; - if(ctx.hasArgument()) { + if(arg != null) { try { - int i = Integer.parseInt(ctx.getArgument()); + int i = Integer.parseInt(arg); index = Math.max(1, i); } catch(NumberFormatException e) { return PlaceholderResult.invalid("Invalid argument!"); @@ -59,8 +59,8 @@ private static PlaceholderHandler top(Function function) } static { - STORE.put(new Identifier(ExAPI.MODID, "level"), ctx -> { - ServerPlayerEntity player = ctx.getPlayer(); + STORE.put(new Identifier(ExAPI.MODID, "level"), (ctx, arg) -> { + ServerPlayerEntity player = ctx.player(); if(player == null) return PlaceholderResult.invalid("No player!"); int level = DataAttributesAPI.ifPresent(player, ExAPI.LEVEL, 0, value -> (int)Math.round(value)); diff --git a/src/main/java/com/github/clevernucleus/playerex/impl/CommandsImpl.java b/src/main/java/com/github/clevernucleus/playerex/impl/CommandsImpl.java index 9d11764a..564257f3 100644 --- a/src/main/java/com/github/clevernucleus/playerex/impl/CommandsImpl.java +++ b/src/main/java/com/github/clevernucleus/playerex/impl/CommandsImpl.java @@ -17,6 +17,7 @@ import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; +import net.minecraft.command.CommandRegistryAccess; import net.minecraft.command.CommandSource; import net.minecraft.command.EntitySelector; import net.minecraft.command.argument.EntityArgumentType; @@ -25,7 +26,7 @@ import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; @@ -42,7 +43,7 @@ private static void registerReset(CommandNode root) { ServerPlayerEntity serverPlayerEntity = EntityArgumentType.getPlayer(ctx, "player"); PlayerData playerData = ExAPI.PLAYER_DATA.get(serverPlayerEntity); playerData.reset(); - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.reset", serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.reset", serverPlayerEntity.getName()), false); return 1; }).build(); @@ -59,9 +60,9 @@ private static void registerRefund(CommandNode root) { int refunded = playerData.addRefundPoints(1); if(refunded == 1) { - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.refund_alt", serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.refund_alt", serverPlayerEntity.getName()), false); } else { - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.refund", refunded, serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.refund", refunded, serverPlayerEntity.getName()), false); } return refunded % 16; @@ -75,9 +76,9 @@ private static void registerRefund(CommandNode root) { int refunded = playerData.addRefundPoints(value); if(refunded == 1) { - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.refund_alt", serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.refund_alt", serverPlayerEntity.getName()), false); } else { - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.refund", refunded, serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.refund", refunded, serverPlayerEntity.getName()), false); } return refunded % 16; @@ -96,13 +97,13 @@ private static void registerLevelUp(CommandNode root) { EntityAttribute attribute = ExAPI.LEVEL.get(); if(((IEntityAttribute)attribute).maxValue() - value < 1) { - ctx.getSource().sendFeedback((new TranslatableText("playerex.command.attribute_max_error", new TranslatableText(attribute.getTranslationKey()), serverPlayerEntity.getName())).formatted(Formatting.RED), false); + ctx.getSource().sendFeedback((Text.translatable("playerex.command.attribute_max_error", Text.translatable(attribute.getTranslationKey()), serverPlayerEntity.getName())).formatted(Formatting.RED), false); return -1; } playerData.add(ExAPI.LEVEL, 1); playerData.addSkillPoints(ExAPI.getConfig().skillPointsPerLevelUp()); - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.levelup_alt", serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.levelup_alt", serverPlayerEntity.getName()), false); return 1; }); }).build(); @@ -117,7 +118,7 @@ private static void registerLevelUp(CommandNode root) { int max = Math.round((float)(((IEntityAttribute)attribute).maxValue() - value)); if(max < 1) { - ctx.getSource().sendFeedback((new TranslatableText("playerex.command.attribute_max_error", new TranslatableText(attribute.getTranslationKey()), serverPlayerEntity.getName())).formatted(Formatting.RED), false); + ctx.getSource().sendFeedback((Text.translatable("playerex.command.attribute_max_error", Text.translatable(attribute.getTranslationKey()), serverPlayerEntity.getName())).formatted(Formatting.RED), false); return -1; } @@ -126,9 +127,9 @@ private static void registerLevelUp(CommandNode root) { playerData.addSkillPoints(adding * ExAPI.getConfig().skillPointsPerLevelUp()); if(adding == 1) { - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.levelup_alt", serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.levelup_alt", serverPlayerEntity.getName()), false); } else { - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.levelup", adding, serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.levelup", adding, serverPlayerEntity.getName()), false); } return adding % 16; @@ -155,14 +156,14 @@ private static void registerSkillAttribute(CommandNode root if(playerData.get(primary) < ((IEntityAttribute)attr).maxValue()) { if(PacketType.SKILL.test(ctx.getSource().getServer(), serverPlayerEntity, playerData)) { playerData.add(primary, 1); - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.skill_attribute", new TranslatableText(attr.getTranslationKey()), serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.skill_attribute", Text.translatable(attr.getTranslationKey()), serverPlayerEntity.getName()), false); return 1; } else { - ctx.getSource().sendFeedback((new TranslatableText("playerex.command.skill_attribute_error", serverPlayerEntity.getName())).formatted(Formatting.RED), false); + ctx.getSource().sendFeedback((Text.translatable("playerex.command.skill_attribute_error", serverPlayerEntity.getName())).formatted(Formatting.RED), false); return -1; } } else { - ctx.getSource().sendFeedback((new TranslatableText("playerex.command.attribute_max_error", new TranslatableText(attr.getTranslationKey()), serverPlayerEntity.getName())).formatted(Formatting.RED), false); + ctx.getSource().sendFeedback((Text.translatable("playerex.command.attribute_max_error", Text.translatable(attr.getTranslationKey()), serverPlayerEntity.getName())).formatted(Formatting.RED), false); return -1; } }); @@ -188,14 +189,14 @@ private static void registerRefundAttribute(CommandNode roo if(playerData.get(primary) > 0) { if(PacketType.REFUND.test(ctx.getSource().getServer(), serverPlayerEntity, playerData)) { playerData.add(primary, -1); - ctx.getSource().sendFeedback(new TranslatableText("playerex.command.refund_attribute", new TranslatableText(attr.getTranslationKey()), serverPlayerEntity.getName()), false); + ctx.getSource().sendFeedback(Text.translatable("playerex.command.refund_attribute", Text.translatable(attr.getTranslationKey()), serverPlayerEntity.getName()), false); return 1; } else { - ctx.getSource().sendFeedback((new TranslatableText("playerex.command.refund_attribute_error", serverPlayerEntity.getName())).formatted(Formatting.RED), false); + ctx.getSource().sendFeedback((Text.translatable("playerex.command.refund_attribute_error", serverPlayerEntity.getName())).formatted(Formatting.RED), false); return -1; } } else { - ctx.getSource().sendFeedback((new TranslatableText("playerex.command.refund_attribute_unskilled", new TranslatableText(attr.getTranslationKey()), serverPlayerEntity.getName())).formatted(Formatting.RED), false); + ctx.getSource().sendFeedback((Text.translatable("playerex.command.refund_attribute_unskilled", Text.translatable(attr.getTranslationKey()), serverPlayerEntity.getName())).formatted(Formatting.RED), false); return -1; } }); @@ -203,7 +204,7 @@ private static void registerRefundAttribute(CommandNode roo player.addChild(attribute); } - public static void register(CommandDispatcher dispatcher, boolean dedicated) { + public static void register(CommandDispatcher dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) { LiteralCommandNode root = CommandManager.literal("playerex").requires(source -> source.hasPermissionLevel(2)).build(); dispatcher.getRoot().addChild(root); diff --git a/src/main/java/com/github/clevernucleus/playerex/mixin/client/ItemStackMixin.java b/src/main/java/com/github/clevernucleus/playerex/mixin/client/ItemStackMixin.java index 8067f1c9..efd3c8d9 100644 --- a/src/main/java/com/github/clevernucleus/playerex/mixin/client/ItemStackMixin.java +++ b/src/main/java/com/github/clevernucleus/playerex/mixin/client/ItemStackMixin.java @@ -29,10 +29,8 @@ import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralText; import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; @Mixin(ItemStack.class) @@ -98,16 +96,16 @@ private double playerex_modifyAdditionAttributeKnockback(double e, PlayerEntity @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", ordinal = 7, shift = Shift.AFTER), locals = LocalCapture.CAPTURE_FAILHARD) private void playerex_insertModifierEqualsTooltip(PlayerEntity player, TooltipContext context, CallbackInfoReturnable> info, List list, MutableText arg3, int arg4, EquipmentSlot[] arg5, int arg6, int arg7, EquipmentSlot arg8, Multimap arg9, Iterator arg10, Map.Entry entry, EntityAttributeModifier entityAttributeModifier, double arg13, double e) { - list.set(list.size() - 1, new LiteralText(" ").append(new TranslatableText("attribute.modifier.equals." + entityAttributeModifier.getOperation().getId(), playerex_value(e, entry, entityAttributeModifier), new TranslatableText(entry.getKey().getTranslationKey()))).formatted(Formatting.DARK_GREEN)); + list.set(list.size() - 1, Text.literal(" ").append(Text.translatable("attribute.modifier.equals." + entityAttributeModifier.getOperation().getId(), playerex_value(e, entry, entityAttributeModifier), Text.translatable(entry.getKey().getTranslationKey()))).formatted(Formatting.DARK_GREEN)); } @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", ordinal = 8, shift = Shift.AFTER), locals = LocalCapture.CAPTURE_FAILHARD) private void playerex_insertModifierPlusTooltip(PlayerEntity player, TooltipContext context, CallbackInfoReturnable> info, List list, MutableText arg3, int arg4, EquipmentSlot[] arg5, int arg6, int arg7, EquipmentSlot arg8, Multimap arg9, Iterator arg10, Map.Entry entry, EntityAttributeModifier entityAttributeModifier, double arg13, double e) { - list.set(list.size() - 1, new TranslatableText("attribute.modifier.plus." + entityAttributeModifier.getOperation().getId(), playerex_value(e, entry, entityAttributeModifier), new TranslatableText(entry.getKey().getTranslationKey())).formatted(Formatting.BLUE)); + list.set(list.size() - 1, Text.translatable("attribute.modifier.plus." + entityAttributeModifier.getOperation().getId(), playerex_value(e, entry, entityAttributeModifier), Text.translatable(entry.getKey().getTranslationKey())).formatted(Formatting.BLUE)); } @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", ordinal = 9, shift = Shift.AFTER), locals = LocalCapture.CAPTURE_FAILHARD) private void playerex_insertModifierTakeTooltip(PlayerEntity player, TooltipContext context, CallbackInfoReturnable> info, List list, MutableText arg3, int arg4, EquipmentSlot[] arg5, int arg6, int arg7, EquipmentSlot arg8, Multimap arg9, Iterator arg10, Map.Entry entry, EntityAttributeModifier entityAttributeModifier, double arg13, double e) { - list.set(list.size() - 1, new TranslatableText("attribute.modifier.take." + entityAttributeModifier.getOperation().getId(), playerex_value(e, entry, entityAttributeModifier), new TranslatableText(entry.getKey().getTranslationKey())).formatted(Formatting.RED)); + list.set(list.size() - 1, Text.translatable("attribute.modifier.take." + entityAttributeModifier.getOperation().getId(), playerex_value(e, entry, entityAttributeModifier), Text.translatable(entry.getKey().getTranslationKey())).formatted(Formatting.RED)); } } diff --git a/src/main/java/com/github/clevernucleus/playerex/mixin/client/LivingEntityRendererMixin.java b/src/main/java/com/github/clevernucleus/playerex/mixin/client/LivingEntityRendererMixin.java index 7372dd02..cc91c0df 100644 --- a/src/main/java/com/github/clevernucleus/playerex/mixin/client/LivingEntityRendererMixin.java +++ b/src/main/java/com/github/clevernucleus/playerex/mixin/client/LivingEntityRendererMixin.java @@ -24,7 +24,6 @@ import net.minecraft.scoreboard.AbstractTeam; import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.math.Matrix4f; @@ -102,7 +101,7 @@ private void onRender(T livingEntity, float f, float g, MatrixStack matrixStack, if(this.playerex_shouldRenderLevel(livingEntity) && ((ConfigImpl)ExAPI.getConfig()).levelNameplate()) { DataAttributesAPI.ifPresent(livingEntity, ExAPI.LEVEL, (Object)null, value -> { boolean coder = (livingEntity instanceof PlayerEntity) && "CleverNucleus".equals(((PlayerEntity)livingEntity).getGameProfile().getName()); - Text tag = (new TranslatableText("playerex.gui.text.nameplate", String.valueOf(Math.round(value)))).formatted(coder ? Formatting.GOLD : Formatting.WHITE); + Text tag = (Text.translatable("playerex.gui.text.nameplate", String.valueOf(Math.round(value)))).formatted(coder ? Formatting.GOLD : Formatting.WHITE); this.playerex_renderLevel(livingEntity, tag, matrixStack, vertexConsumerProvider, i); return (Object)null; }); diff --git a/versions.json b/versions.json new file mode 100644 index 00000000..f3686006 --- /dev/null +++ b/versions.json @@ -0,0 +1 @@ +[{"versions":"1.17.1","releases":"3.0.7 | 3.0.6 | 3.0.5 | 3.0.4 | 3.0.3 | 3.0.2 | 3.0.1"},{"versions":"1.18.1","releases":"3.1.4 | 3.1.3 | 3.1.2 | 3.1.1 | 3.1.0"},{"versions":"1.19 | 1.18.2","releases":"3.3.0 | 3.2.1 | 3.2.0"}] \ No newline at end of file