diff --git a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java index 4dea3e7..5601622 100644 --- a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java +++ b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java @@ -1,10 +1,10 @@ package nl.requios.effortlessbuilding; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.Item; -import net.minecraft.network.chat.TextComponent; import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; @@ -103,7 +103,7 @@ public class EffortlessBuilding { } public static void log(Player player, String msg, boolean actionBar) { - player.displayClientMessage(new TextComponent(msg), actionBar); + player.displayClientMessage(Component.literal(msg), actionBar); } //Log with translation supported, call either on client or server (which then sends a message) diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java index 27c34a0..e9a348d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java @@ -12,7 +12,6 @@ import net.minecraft.client.gui.components.ObjectSelectionList; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.Mth; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -54,12 +53,12 @@ public class PlayerSettingsGui extends Screen { addRenderableOnly(shaderTypeButton); yy += 50; - Slider slider = new Slider(right - 200, yy, 200, 20, TextComponent.EMPTY, TextComponent.EMPTY, 0.5, 2.0, 1.0, true, true, (button) -> { + Slider slider = new Slider(right - 200, yy, 200, 20, Component.empty(), Component.empty(), 0.5, 2.0, 1.0, true, true, (button) -> { }); addRenderableOnly(slider); - closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, new TextComponent("Done"), (button) -> this.minecraft.player.closeContainer()); + closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, Component.literal("Done"), (button) -> this.minecraft.player.closeContainer()); addRenderableOnly(closeButton); } @@ -111,7 +110,7 @@ public class PlayerSettingsGui extends Screen { } ShaderType(String name) { - this.name = new TextComponent(name); + this.name = Component.literal(name); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java index d7cab6d..1bfade0 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java @@ -3,9 +3,8 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.Widget; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraft.ChatFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -50,23 +49,23 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry { y = top + 20; textArrayOffsetX = new GuiNumberField(font, renderables, left + 70, y, 50, 18); textArrayOffsetX.setNumber(0); - textArrayOffsetX.setTooltip(new TextComponent("How much each copy is shifted.")); + textArrayOffsetX.setTooltip(Component.literal("How much each copy is shifted.")); arrayNumberFieldList.add(textArrayOffsetX); textArrayOffsetY = new GuiNumberField(font, renderables, left + 140, y, 50, 18); textArrayOffsetY.setNumber(0); - textArrayOffsetY.setTooltip(new TextComponent("How much each copy is shifted.")); + textArrayOffsetY.setTooltip(Component.literal("How much each copy is shifted.")); arrayNumberFieldList.add(textArrayOffsetY); textArrayOffsetZ = new GuiNumberField(font, renderables, left + 210, y, 50, 18); textArrayOffsetZ.setNumber(0); - textArrayOffsetZ.setTooltip(new TextComponent("How much each copy is shifted.")); + textArrayOffsetZ.setTooltip(Component.literal("How much each copy is shifted.")); arrayNumberFieldList.add(textArrayOffsetZ); y = top + 50; textArrayCount = new GuiNumberField(font, renderables, left + 55, y, 50, 18); textArrayCount.setNumber(5); - textArrayCount.setTooltip(new TextComponent("How many copies should be made.")); + textArrayCount.setTooltip(Component.literal("How many copies should be made.")); arrayNumberFieldList.add(textArrayCount); ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player); diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java index 8d942b5..d73f9af 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java @@ -3,11 +3,10 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.components.Widget; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; -import net.minecraft.network.chat.TextComponent; import net.minecraft.ChatFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -58,17 +57,17 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { textMirrorPosX = new GuiNumberField(font, renderables, left + 58, y, 62, 18); textMirrorPosX.setNumber(0); textMirrorPosX.setTooltip( - Arrays.asList(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); + Arrays.asList(Component.literal("The position of the mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); mirrorNumberFieldList.add(textMirrorPosX); textMirrorPosY = new GuiNumberField(font, renderables, left + 138, y, 62, 18); textMirrorPosY.setNumber(64); - textMirrorPosY.setTooltip(Arrays.asList(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); + textMirrorPosY.setTooltip(Arrays.asList(Component.literal("The position of the mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); mirrorNumberFieldList.add(textMirrorPosY); textMirrorPosZ = new GuiNumberField(font, renderables, left + 218, y, 62, 18); textMirrorPosZ.setNumber(0); - textMirrorPosZ.setTooltip(Arrays.asList(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); + textMirrorPosZ.setTooltip(Arrays.asList(Component.literal("The position of the mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); mirrorNumberFieldList.add(textMirrorPosZ); y = top + 50; @@ -85,9 +84,9 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { textMirrorRadius = new GuiNumberField(font, renderables, left + 218, y, 62, 18); textMirrorRadius.setNumber(50); //TODO change to diameter (remove /2) - textMirrorRadius.setTooltip(Arrays.asList(new TextComponent("How far the mirror reaches in any direction."), - new TextComponent("Max: ").withStyle(ChatFormatting.GRAY).append(new TextComponent(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(ChatFormatting.GOLD)), - new TextComponent("Upgradeable in survival with reach upgrades.").withStyle(ChatFormatting.GRAY))); + textMirrorRadius.setTooltip(Arrays.asList(Component.literal("How far the mirror reaches in any direction."), + Component.literal("Max: ").withStyle(ChatFormatting.GRAY).append(Component.literal(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(ChatFormatting.GOLD)), + Component.literal("Upgradeable in survival with reach upgrades.").withStyle(ChatFormatting.GRAY))); mirrorNumberFieldList.add(textMirrorRadius); y = top + 72; @@ -97,41 +96,41 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { textMirrorPosY.setNumber(pos.y); textMirrorPosZ.setNumber(pos.z); }); - buttonCurrentPosition.setTooltip(new TextComponent("Set mirror position to current player position")); + buttonCurrentPosition.setTooltip(Component.literal("Set mirror position to current player position")); mirrorIconButtonList.add(buttonCurrentPosition); buttonToggleOdd = new GuiIconButton(left + 35, y, 0, 20, BUILDING_ICONS, button -> { toggleOdd = !toggleOdd; buttonToggleOdd.setUseAlternateIcon(toggleOdd); if (toggleOdd) { - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to corner of block"), new TextComponent("for even numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to corner of block"), Component.literal("for even numbered builds"))); textMirrorPosX.setNumber(textMirrorPosX.getNumber() + 0.5); textMirrorPosY.setNumber(textMirrorPosY.getNumber() + 0.5); textMirrorPosZ.setNumber(textMirrorPosZ.getNumber() + 0.5); } else { - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to middle of block"), Component.literal("for odd numbered builds"))); textMirrorPosX.setNumber(Math.floor(textMirrorPosX.getNumber())); textMirrorPosY.setNumber(Math.floor(textMirrorPosY.getNumber())); textMirrorPosZ.setNumber(Math.floor(textMirrorPosZ.getNumber())); } }); - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to middle of block"), Component.literal("for odd numbered builds"))); mirrorIconButtonList.add(buttonToggleOdd); buttonDrawLines = new GuiIconButton(left + 65, y, 0, 40, BUILDING_ICONS, button -> { drawLines = !drawLines; buttonDrawLines.setUseAlternateIcon(drawLines); - buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines")); + buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines")); }); - buttonDrawLines.setTooltip(new TextComponent("Show lines")); + buttonDrawLines.setTooltip(Component.literal("Show lines")); mirrorIconButtonList.add(buttonDrawLines); buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> { drawPlanes = !drawPlanes; buttonDrawPlanes.setUseAlternateIcon(drawPlanes); - buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area")); + buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area")); }); - buttonDrawPlanes.setTooltip(new TextComponent("Show area")); + buttonDrawPlanes.setTooltip(Component.literal("Show area")); mirrorIconButtonList.add(buttonDrawPlanes); ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player); @@ -149,14 +148,14 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { drawPlanes = m.drawPlanes; buttonDrawLines.setUseAlternateIcon(drawLines); buttonDrawPlanes.setUseAlternateIcon(drawPlanes); - buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines")); - buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area")); + buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines")); + buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area")); if (textMirrorPosX.getNumber() == Math.floor(textMirrorPosX.getNumber())) { toggleOdd = false; - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to middle of block"), Component.literal("for odd numbered builds"))); } else { toggleOdd = true; - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to corner of block"), new TextComponent("for even numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to corner of block"), Component.literal("for even numbered builds"))); } buttonToggleOdd.setUseAlternateIcon(toggleOdd); } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java index 8d69682..b090e8e 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java @@ -2,10 +2,9 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.components.Button; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -19,9 +18,6 @@ import nl.requios.effortlessbuilding.network.ModifierSettingsMessage; import nl.requios.effortlessbuilding.network.PacketHandler; import nl.requios.effortlessbuilding.proxy.ClientProxy; -import java.util.ArrayList; -import java.util.List; - @OnlyIn(Dist.CLIENT) public class ModifierSettingsGui extends Screen { @@ -55,7 +51,7 @@ public class ModifierSettingsGui extends Screen { //Close button int y = height - 26; - buttonClose = new Button(width / 2 - 100, y, 200, 20, new TextComponent("Close"), (button) -> { + buttonClose = new Button(width / 2 - 100, y, 200, 20, Component.literal("Close"), (button) -> { Minecraft.getInstance().player.closeContainer(); }); addRenderableOnly(buttonClose); diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java index e7ddee1..c1b2abf 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java @@ -5,6 +5,7 @@ import net.minecraft.client.gui.components.Widget; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; import net.minecraft.network.chat.TextComponent; @@ -58,31 +59,31 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { textRadialMirrorPosX = new GuiNumberField(font, renderables, left + 58, y, 62, 18); textRadialMirrorPosX.setNumber(0); textRadialMirrorPosX.setTooltip( - Arrays.asList(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); + Arrays.asList(Component.literal("The position of the radial mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorPosX); textRadialMirrorPosY = new GuiNumberField(font, renderables, left + 138, y, 62, 18); textRadialMirrorPosY.setNumber(64); - textRadialMirrorPosY.setTooltip(Arrays.asList(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); + textRadialMirrorPosY.setTooltip(Arrays.asList(Component.literal("The position of the radial mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorPosY); textRadialMirrorPosZ = new GuiNumberField(font, renderables, left + 218, y, 62, 18); textRadialMirrorPosZ.setNumber(0); - textRadialMirrorPosZ.setTooltip(Arrays.asList(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); + textRadialMirrorPosZ.setTooltip(Arrays.asList(Component.literal("The position of the radial mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorPosZ); y = top + 47; textRadialMirrorSlices = new GuiNumberField(font, renderables, left + 55, y, 50, 18); textRadialMirrorSlices.setNumber(4); - textRadialMirrorSlices.setTooltip(Arrays.asList(new TextComponent("The number of repeating slices."), new TextComponent("Minimally 2.").withStyle(ChatFormatting.GRAY))); + textRadialMirrorSlices.setTooltip(Arrays.asList(Component.literal("The number of repeating slices."), Component.literal("Minimally 2.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorSlices); textRadialMirrorRadius = new GuiNumberField(font, renderables, left + 218, y, 62, 18); textRadialMirrorRadius.setNumber(50); //TODO change to diameter (remove /2) - textRadialMirrorRadius.setTooltip(Arrays.asList(new TextComponent("How far the radial mirror reaches from its center position."), - new TextComponent("Max: ").withStyle(ChatFormatting.GRAY).append(new TextComponent(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(ChatFormatting.GOLD)), - new TextComponent("Upgradeable in survival with reach upgrades.").withStyle(ChatFormatting.GRAY))); + textRadialMirrorRadius.setTooltip(Arrays.asList(Component.literal("How far the radial mirror reaches from its center position."), + Component.literal("Max: ").withStyle(ChatFormatting.GRAY).append(Component.literal(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(ChatFormatting.GOLD)), + Component.literal("Upgradeable in survival with reach upgrades.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorRadius); y = top + 72; @@ -92,41 +93,41 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { textRadialMirrorPosY.setNumber(pos.y); textRadialMirrorPosZ.setNumber(pos.z); }); - buttonCurrentPosition.setTooltip(new TextComponent("Set radial mirror position to current player position")); + buttonCurrentPosition.setTooltip(Component.literal("Set radial mirror position to current player position")); radialMirrorIconButtonList.add(buttonCurrentPosition); buttonToggleOdd = new GuiIconButton(left + 35, y, 0, 20, BUILDING_ICONS, button -> { toggleOdd = !toggleOdd; buttonToggleOdd.setUseAlternateIcon(toggleOdd); if (toggleOdd) { - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to corner of block"), new TextComponent("for even numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to corner of block"), Component.literal("for even numbered builds"))); textRadialMirrorPosX.setNumber(textRadialMirrorPosX.getNumber() + 0.5); textRadialMirrorPosY.setNumber(textRadialMirrorPosY.getNumber() + 0.5); textRadialMirrorPosZ.setNumber(textRadialMirrorPosZ.getNumber() + 0.5); } else { - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to middle of block"), Component.literal("for odd numbered builds"))); textRadialMirrorPosX.setNumber(Math.floor(textRadialMirrorPosX.getNumber())); textRadialMirrorPosY.setNumber(Math.floor(textRadialMirrorPosY.getNumber())); textRadialMirrorPosZ.setNumber(Math.floor(textRadialMirrorPosZ.getNumber())); } }); - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set radial mirror position to middle of block"), new TextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set radial mirror position to middle of block"), Component.literal("for odd numbered builds"))); radialMirrorIconButtonList.add(buttonToggleOdd); buttonDrawLines = new GuiIconButton(left + 65, y, 0, 40, BUILDING_ICONS, button -> { drawLines = !drawLines; buttonDrawLines.setUseAlternateIcon(drawLines); - buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines")); + buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines")); }); - buttonDrawLines.setTooltip(new TextComponent("Show lines")); + buttonDrawLines.setTooltip(Component.literal("Show lines")); radialMirrorIconButtonList.add(buttonDrawLines); buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> { drawPlanes = !drawPlanes; buttonDrawPlanes.setUseAlternateIcon(drawPlanes); - buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area")); + buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area")); }); - buttonDrawPlanes.setTooltip(new TextComponent("Show area")); + buttonDrawPlanes.setTooltip(Component.literal("Show area")); radialMirrorIconButtonList.add(buttonDrawPlanes); y = top + 76; @@ -147,14 +148,14 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { drawPlanes = r.drawPlanes; buttonDrawLines.setUseAlternateIcon(drawLines); buttonDrawPlanes.setUseAlternateIcon(drawPlanes); - buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines")); - buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area")); + buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines")); + buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area")); if (textRadialMirrorPosX.getNumber() == Math.floor(textRadialMirrorPosX.getNumber())) { toggleOdd = false; - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set radial mirror position to middle of block"), new TextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set radial mirror position to middle of block"), Component.literal("for odd numbered builds"))); } else { toggleOdd = true; - buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set radial mirror position to corner of block"), new TextComponent("for even numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set radial mirror position to corner of block"), Component.literal("for even numbered builds"))); } buttonToggleOdd.setUseAlternateIcon(toggleOdd); } diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java index 0aa13ce..6f014bd 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java @@ -3,7 +3,7 @@ package nl.requios.effortlessbuilding.gui.elements; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraftforge.client.gui.GuiUtils; import javax.annotation.ParametersAreNonnullByDefault; @@ -17,7 +17,7 @@ public class GuiCheckBoxFixed extends Button { private boolean isChecked; public GuiCheckBoxFixed(int xPos, int yPos, String displayString, boolean isChecked) { - super(xPos, yPos, Minecraft.getInstance().font.width(displayString) + 2 + 11, 11, new TextComponent(displayString), b -> { + super(xPos, yPos, Minecraft.getInstance().font.width(displayString) + 2 + 11, 11, Component.literal(displayString), b -> { }); this.isChecked = isChecked; this.boxWidth = 11; diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java index 99986f5..1a47a6b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java @@ -2,12 +2,10 @@ package nl.requios.effortlessbuilding.gui.elements; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.components.Button; import net.minecraft.resources.ResourceLocation; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -30,7 +28,7 @@ public class GuiIconButton extends Button { } public GuiIconButton(int x, int y, int width, int height, int iconX, int iconY, int iconWidth, int iconHeight, int iconAltX, int iconAltY, ResourceLocation resourceLocation, Button.OnPress onPress) { - super(x, y, width, height, TextComponent.EMPTY, onPress); + super(x, y, width, height, Component.empty(), onPress); this.iconX = iconX; this.iconY = iconY; this.iconWidth = iconWidth; diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java index b1a4194..df500ae 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java @@ -7,15 +7,14 @@ import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.Widget; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.ChatFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.ParametersAreNonnullByDefault; +import java.awt.*; import java.text.DecimalFormat; import java.text.ParseException; import java.util.ArrayList; @@ -41,15 +40,15 @@ public class GuiNumberField extends GuiComponent { this.width = width; this.height = height; - textField = new EditBox(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, TextComponent.EMPTY); - minusButton = new Button(x, y - 1, buttonWidth, height + 2, new TextComponent("-"), button -> { + textField = new EditBox(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, Component.empty()); + minusButton = new Button(x, y - 1, buttonWidth, height + 2, Component.literal("-"), button -> { float valueChanged = 1f; if (Screen.hasControlDown()) valueChanged = 5f; if (Screen.hasShiftDown()) valueChanged = 10f; setNumber(getNumber() - valueChanged); }); - plusButton = new Button(x + width - buttonWidth, y - 1, buttonWidth, height + 2, new TextComponent("+"), button -> { + plusButton = new Button(x + width - buttonWidth, y - 1, buttonWidth, height + 2, Component.literal("+"), button -> { float valueChanged = 1f; if (Screen.hasControlDown()) valueChanged = 5f; if (Screen.hasShiftDown()) valueChanged = 10f; @@ -124,17 +123,17 @@ public class GuiNumberField extends GuiComponent { } if (insideMinusButton) { - textLines.add(new TextComponent("Hold ").append(new TextComponent("shift ").withStyle(ChatFormatting.AQUA)).append("for ") - .append(new TextComponent("10").withStyle(ChatFormatting.RED))); - textLines.add(new TextComponent("Hold ").append(new TextComponent("ctrl ").withStyle(ChatFormatting.AQUA)).append("for ") - .append(new TextComponent("5").withStyle(ChatFormatting.RED))); + textLines.add(Component.literal("Hold ").append(Component.literal("shift ").withStyle(ChatFormatting.AQUA)).append("for ") + .append(Component.literal("10").withStyle(ChatFormatting.RED))); + textLines.add(Component.literal("Hold ").append(Component.literal("ctrl ").withStyle(ChatFormatting.AQUA)).append("for ") + .append(Component.literal("5").withStyle(ChatFormatting.RED))); } if (insidePlusButton) { - textLines.add(new TextComponent("Hold ").append(new TextComponent("shift ").withStyle(ChatFormatting.DARK_GREEN)).append("for ") - .append(new TextComponent("10").withStyle(ChatFormatting.RED))); - textLines.add(new TextComponent("Hold ").append(new TextComponent("ctrl ").withStyle(ChatFormatting.DARK_GREEN)).append("for ") - .append(new TextComponent("5").withStyle(ChatFormatting.RED))); + textLines.add(Component.literal("Hold ").append(Component.literal("shift ").withStyle(ChatFormatting.DARK_GREEN)).append("for ") + .append(Component.literal("10").withStyle(ChatFormatting.RED))); + textLines.add(Component.literal("Hold ").append(Component.literal("ctrl ").withStyle(ChatFormatting.DARK_GREEN)).append("for ") + .append(Component.literal("5").withStyle(ChatFormatting.RED))); } screen.renderComponentTooltip(ms, textLines, mouseX - 10, mouseY + 25); diff --git a/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java b/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java index e04f6d8..0797ac3 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java @@ -17,7 +17,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.ChatFormatting; import net.minecraft.world.level.Level; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -212,15 +211,15 @@ public abstract class AbstractRandomizerBagItem extends Item { @Override public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - tooltip.add(new TextComponent(ChatFormatting.BLUE + "Rightclick" + ChatFormatting.GRAY + " to place a random block")); - tooltip.add(new TextComponent(ChatFormatting.BLUE + "Sneak + rightclick" + ChatFormatting.GRAY + " to open inventory")); + tooltip.add(Component.literal(ChatFormatting.BLUE + "Rightclick" + ChatFormatting.GRAY + " to place a random block")); + tooltip.add(Component.literal(ChatFormatting.BLUE + "Sneak + rightclick" + ChatFormatting.GRAY + " to open inventory")); if (world != null && world.players().size() > 1) { - tooltip.add(new TextComponent(ChatFormatting.YELLOW + "Experimental on servers: may lose inventory")); + tooltip.add(Component.literal(ChatFormatting.YELLOW + "Experimental on servers: may lose inventory")); } } @Override public String getDescriptionId() { - return this.getRegistryName().toString(); + return this.getDescriptionId(); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java b/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java index c07c5cd..29c317a 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java @@ -1,7 +1,6 @@ package nl.requios.effortlessbuilding.item; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java index c082ee0..75a0d41 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java @@ -7,7 +7,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.ChatFormatting; import net.minecraft.world.level.Level; import nl.requios.effortlessbuilding.BuildConfig; @@ -64,11 +63,11 @@ public class ReachUpgrade1Item extends Item { @Override public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - tooltip.add(new TextComponent(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get())); + tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get())); } @Override public String getDescriptionId() { - return this.getRegistryName().toString(); + return this.getDescriptionId(); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java index 3493941..4b0248f 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java @@ -7,7 +7,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.ChatFormatting; import net.minecraft.world.level.Level; import nl.requios.effortlessbuilding.BuildConfig; @@ -17,6 +16,7 @@ import nl.requios.effortlessbuilding.helper.ReachHelper; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; +import java.awt.*; import java.util.List; import net.minecraft.resources.ResourceLocation; @@ -68,12 +68,12 @@ public class ReachUpgrade2Item extends Item { @Override public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - tooltip.add(new TextComponent(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel2.get())); - tooltip.add(new TextComponent(ChatFormatting.GRAY + "Previous upgrades need to be consumed first")); + tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel2.get())); + tooltip.add(Component.literal(ChatFormatting.GRAY + "Previous upgrades need to be consumed first")); } @Override public String getDescriptionId() { - return this.getRegistryName().toString(); + return this.getDescriptionId(); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java index 2bc3008..6802106 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java @@ -7,7 +7,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.ChatFormatting; import net.minecraft.world.level.Level; import nl.requios.effortlessbuilding.BuildConfig; @@ -71,12 +70,12 @@ public class ReachUpgrade3Item extends Item { @Override public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - tooltip.add(new TextComponent(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel3.get())); - tooltip.add(new TextComponent(ChatFormatting.GRAY + "Previous upgrades need to be consumed first")); + tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel3.get())); + tooltip.add(Component.literal(ChatFormatting.GRAY + "Previous upgrades need to be consumed first")); } @Override public String getDescriptionId() { - return this.getRegistryName().toString(); + return this.getDescriptionId(); } }