From 63b95df0ff9491b3f69814266a5f2561f60b11b2 Mon Sep 17 00:00:00 2001 From: ManApart Date: Sun, 10 Jul 2022 07:59:17 -0400 Subject: [PATCH] upgrade translatable component --- .../gui/buildmode/PlayerSettingsGui.java | 3 +- .../gui/buildmode/RadialMenu.java | 4 +-- .../buildmodifier/ModifierSettingsGui.java | 3 +- .../RadialMirrorSettingsGui.java | 2 -- .../helper/SurvivalHelper.java | 35 ++++++++----------- .../item/DiamondRandomizerBagItem.java | 3 +- .../item/GoldenRandomizerBagItem.java | 3 +- .../item/RandomizerBagItem.java | 2 +- 8 files changed, 22 insertions(+), 33 deletions(-) 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 e9a348d..fa59b94 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.TranslatableComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.gui.widget.ExtendedButton; @@ -32,7 +31,7 @@ public class PlayerSettingsGui extends Screen { private Button closeButton; public PlayerSettingsGui() { - super(new TranslatableComponent("effortlessbuilding.screen.player_settings")); + super(Component.translatable("effortlessbuilding.screen.player_settings")); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java index d150e44..fb54c8d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java @@ -13,7 +13,7 @@ import net.minecraft.client.KeyMapping; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.core.Direction; import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -72,7 +72,7 @@ public class RadialMenu extends Screen { private float visibility; public RadialMenu() { - super(new TranslatableComponent("effortlessbuilding.screen.radial_menu")); + super(Component.translatable("effortlessbuilding.screen.radial_menu")); } public boolean isVisible() { 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 b090e8e..5a7807c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java @@ -5,7 +5,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -29,7 +28,7 @@ public class ModifierSettingsGui extends Screen { private RadialMirrorSettingsGui radialMirrorSettingsGui; public ModifierSettingsGui() { - super(new TranslatableComponent("effortlessbuilding.screen.modifier_settings")); + super(Component.translatable("effortlessbuilding.screen.modifier_settings")); } @Override 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 c1b2abf..3f17b97 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java @@ -3,12 +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; diff --git a/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java b/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java index 329aac0..64434a6 100644 --- a/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java @@ -1,38 +1,33 @@ package nl.requios.effortlessbuilding.helper; import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundSource; import net.minecraft.tags.BlockTags; -import net.minecraft.tags.Tag; -import net.minecraft.world.level.material.Material; +import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.pattern.BlockInWorld; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; -import net.minecraft.sounds.SoundSource; -import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraft.world.phys.Vec3; import net.minecraft.world.level.Level; -import net.minecraftforge.common.data.ForgeBlockTagsProvider; -import net.minecraftforge.event.ForgeEventFactory; -import nl.requios.effortlessbuilding.BuildConfig; -import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; -import nl.requios.effortlessbuilding.compatibility.CompatHelper; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.pattern.BlockInWorld; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraftforge.event.ForgeEventFactory; +import nl.requios.effortlessbuilding.BuildConfig; +import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; +import nl.requios.effortlessbuilding.compatibility.CompatHelper; + +import javax.annotation.Nullable; public class SurvivalHelper { diff --git a/src/main/java/nl/requios/effortlessbuilding/item/DiamondRandomizerBagItem.java b/src/main/java/nl/requios/effortlessbuilding/item/DiamondRandomizerBagItem.java index af762db..069a4ce 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/DiamondRandomizerBagItem.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/DiamondRandomizerBagItem.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; @@ -34,7 +33,7 @@ public class DiamondRandomizerBagItem extends AbstractRandomizerBagItem{ @Override public Component getDisplayName() { - return new TranslatableComponent("effortlessbuilding:diamond_randomizer_bag"); + return Component.translatable("effortlessbuilding:diamond_randomizer_bag"); } @Nullable diff --git a/src/main/java/nl/requios/effortlessbuilding/item/GoldenRandomizerBagItem.java b/src/main/java/nl/requios/effortlessbuilding/item/GoldenRandomizerBagItem.java index 34dea54..1d05c7d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/GoldenRandomizerBagItem.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/GoldenRandomizerBagItem.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; @@ -34,7 +33,7 @@ public class GoldenRandomizerBagItem extends AbstractRandomizerBagItem{ @Override public Component getDisplayName() { - return new TranslatableComponent("effortlessbuilding:golden_randomizer_bag"); + return Component.translatable("effortlessbuilding:golden_randomizer_bag"); } @Nullable diff --git a/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java b/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java index 29c317a..ac41deb 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java @@ -33,7 +33,7 @@ public class RandomizerBagItem extends AbstractRandomizerBagItem { @Override public Component getDisplayName() { - return new TranslatableComponent("effortlessbuilding:randomizer_bag"); + return Component.translatable("effortlessbuilding:randomizer_bag"); } @Nullable