diff --git a/build.gradle b/build.gradle index eb139a2..47da508 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ minecraft { // stable_# Stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: '1.18.2' + mappings channel: 'official', version: '1.19' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. @@ -89,7 +89,7 @@ dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.18.2-40.0.19' + minecraft 'net.minecraftforge:forge:1.19-41.0.99' // Real mod deobf dependency examples - these get remapped to your current mappings // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency diff --git a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java index 4dea3e7..4331413 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; @@ -43,7 +43,7 @@ public class EffortlessBuilding { //Registration private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID); - private static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, EffortlessBuilding.MODID); + private static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, EffortlessBuilding.MODID); public static final RegistryObject RANDOMIZER_BAG_ITEM = ITEMS.register("randomizer_bag", RandomizerBagItem::new); public static final RegistryObject GOLDEN_RANDOMIZER_BAG_ITEM = ITEMS.register("golden_randomizer_bag", GoldenRandomizerBagItem::new); @@ -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/EventHandler.java b/src/main/java/nl/requios/effortlessbuilding/EventHandler.java index 84c65ca..0085774 100644 --- a/src/main/java/nl/requios/effortlessbuilding/EventHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/EventHandler.java @@ -9,7 +9,7 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.network.PacketDistributor; @@ -39,7 +39,7 @@ public class EventHandler { @SubscribeEvent public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) { - if (event.getWorld().isClientSide()) return; + if (event.getLevel().isClientSide()) return; if (!(event.getEntity() instanceof Player)) return; @@ -74,7 +74,7 @@ public class EventHandler { @SubscribeEvent public static void onBlockBroken(BlockEvent.BreakEvent event) { - if (event.getWorld().isClientSide()) return; + if (event.getLevel().isClientSide()) return; if (event.getPlayer() instanceof FakePlayer) return; @@ -100,16 +100,16 @@ public class EventHandler { @SubscribeEvent public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { - if (event.getPlayer() instanceof FakePlayer) return; - Player player = event.getPlayer(); + if (event.getEntity() instanceof FakePlayer) return; + Player player = event.getEntity(); ModifierSettingsManager.handleNewPlayer(player); ModeSettingsManager.handleNewPlayer(player); } @SubscribeEvent public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - if (event.getPlayer() instanceof FakePlayer) return; - Player player = event.getPlayer(); + if (event.getEntity() instanceof FakePlayer) return; + Player player = event.getEntity(); if (player.getCommandSenderWorld().isClientSide) return; UndoRedo.clear(player); @@ -118,16 +118,16 @@ public class EventHandler { @SubscribeEvent public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { - if (event.getPlayer() instanceof FakePlayer) return; - Player player = event.getPlayer(); + if (event.getEntity() instanceof FakePlayer) return; + Player player = event.getEntity(); ModifierSettingsManager.handleNewPlayer(player); ModeSettingsManager.handleNewPlayer(player); } @SubscribeEvent public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) { - if (event.getPlayer() instanceof FakePlayer) return; - Player player = event.getPlayer(); + if (event.getEntity() instanceof FakePlayer) return; + Player player = event.getEntity(); if (player.getCommandSenderWorld().isClientSide) return; //Set build mode to normal @@ -151,12 +151,12 @@ public class EventHandler { @SubscribeEvent public static void onPlayerClone(PlayerEvent.Clone event) { - if (event.getPlayer() instanceof FakePlayer) return; + if (event.getEntity() instanceof FakePlayer) return; //Attach capabilities on death, otherwise crash Player oldPlayer = event.getOriginal(); oldPlayer.revive(); - Player newPlayer = event.getPlayer(); + Player newPlayer = event.getEntity(); ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer)); ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer)); } 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..586e58a 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java @@ -12,12 +12,10 @@ 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; import net.minecraftforge.client.gui.widget.ExtendedButton; -import net.minecraftforge.client.gui.widget.Slider; +import net.minecraftforge.client.gui.widget.ForgeSlider; import nl.requios.effortlessbuilding.EffortlessBuilding; import javax.annotation.ParametersAreNonnullByDefault; @@ -33,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 @@ -54,12 +52,10 @@ 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) -> { - - }); + ForgeSlider slider = new ForgeSlider(right - 200, yy, 200, 20, Component.empty(), Component.empty(), 0.5, 2.0, 1.0, true); 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 +107,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/buildmode/RadialMenu.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java index d150e44..82c3407 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java @@ -13,10 +13,11 @@ 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; +import net.minecraft.util.RandomSource; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager; @@ -72,7 +73,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() { @@ -473,7 +474,7 @@ public class RadialMenu extends Screen { public static void playRadialMenuSound() { final float volume = 0.1f; if (volume >= 0.0001f) { - SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK, SoundSource.MASTER, volume, 1.0f, Minecraft.getInstance().player.blockPosition()); + SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK, SoundSource.MASTER, volume, 1.0f, RandomSource.create(), Minecraft.getInstance().player.blockPosition()); Minecraft.getInstance().getSoundManager().play(sound); } } 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..5a7807c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java @@ -2,11 +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.TranslatableComponent; +import net.minecraft.network.chat.Component; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -19,9 +17,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 { @@ -33,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 @@ -55,7 +50,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..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,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,31 +57,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 +91,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 +146,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..917b58d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java @@ -3,8 +3,8 @@ 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.minecraftforge.client.gui.GuiUtils; +import net.minecraft.network.chat.Component; +import net.minecraftforge.client.gui.ScreenUtils; 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; @@ -30,7 +30,7 @@ public class GuiCheckBoxFixed extends Button { if (this.visible) { Minecraft mc = Minecraft.getInstance(); this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.boxWidth && mouseY < this.y + this.height; - GuiUtils.drawContinuousTexturedBox(ms, WIDGETS_LOCATION, this.x, this.y, 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset()); + ScreenUtils.blitWithBorder(ms, WIDGETS_LOCATION, this.x, this.y, 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset()); this.renderBg(ms, mc, mouseX, mouseY); int color = 14737632; 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/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/AbstractRandomizerBagItem.java b/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java index e04f6d8..aa9eb22 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; @@ -130,7 +129,7 @@ public abstract class AbstractRandomizerBagItem extends Item { if (ctx.getPlayer() != null && ctx.getPlayer().isShiftKeyDown()) { //ctx.isPlacerSneaking() if (world.isClientSide) return InteractionResult.SUCCESS; //Open inventory - NetworkHooks.openGui((ServerPlayer) player, getContainerProvider(item)); + NetworkHooks.openScreen((ServerPlayer) player, getContainerProvider(item)); } else { if (world.isClientSide) return InteractionResult.SUCCESS; @@ -183,7 +182,7 @@ public abstract class AbstractRandomizerBagItem extends Item { if (player.isShiftKeyDown()) { if (world.isClientSide) return new InteractionResultHolder<>(InteractionResult.SUCCESS, bag); //Open inventory - NetworkHooks.openGui((ServerPlayer) player, getContainerProvider(bag)); + NetworkHooks.openScreen((ServerPlayer) player, getContainerProvider(bag)); } else { //Use item //Get bag inventory @@ -212,15 +211,10 @@ 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(); - } } 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 c07c5cd..ac41deb 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; @@ -34,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 diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java index c082ee0..cd78755 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,7 @@ 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(); - } } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java index 3493941..17fbdce 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,7 @@ 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")); - } - - @Override - public String getDescriptionId() { - return this.getRegistryName().toString(); + 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")); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java index 2bc3008..7aedbc6 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,8 @@ 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(); - } } diff --git a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java index 43a2f87..6d4d062 100644 --- a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java +++ b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java @@ -23,9 +23,8 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.ChatFormatting; import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.ClientRegistry; -import net.minecraftforge.client.event.ScreenOpenEvent; import net.minecraftforge.client.event.InputEvent; +import net.minecraftforge.client.event.ScreenEvent; import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.client.settings.KeyModifier; import net.minecraftforge.event.TickEvent; @@ -82,11 +81,6 @@ public class ClientProxy implements IProxy { keyBindings[4] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category"); keyBindings[5] = new KeyMapping("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_CONTROL, 0), "key.effortlessbuilding.category"); - // register all the key bindings - for (KeyMapping keyBinding : keyBindings) { - ClientRegistry.registerKeyBinding(keyBinding); - } - MenuScreens.register(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), RandomizerBagScreen::new); MenuScreens.register(EffortlessBuilding.GOLDEN_RANDOMIZER_BAG_CONTAINER.get(), GoldenRandomizerBagScreen::new); MenuScreens.register(EffortlessBuilding.DIAMOND_RANDOMIZER_BAG_CONTAINER.get(), DiamondRandomizerBagScreen::new); @@ -226,7 +220,7 @@ public class ClientProxy implements IProxy { } @SubscribeEvent(receiveCanceled = true) - public static void onKeyPress(InputEvent.KeyInputEvent event) { + public static void onKeyPress(InputEvent.Key event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return; @@ -310,7 +304,7 @@ public class ClientProxy implements IProxy { } @SubscribeEvent - public static void onGuiOpen(ScreenOpenEvent event) { + public static void onGuiOpen(ScreenEvent event) { Player player = Minecraft.getInstance().player; if (player != null) { BuildModes.initializeMode(player); diff --git a/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java b/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java index 5789902..f7f72e1 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java @@ -2,24 +2,18 @@ package nl.requios.effortlessbuilding.render; import com.mojang.blaze3d.shaders.Uniform; import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; -import net.minecraft.Util; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderStateShard; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.ShaderInstance; -import net.minecraft.client.renderer.texture.TextureAtlas; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; -import nl.requios.effortlessbuilding.BuildConfig; import nl.requios.effortlessbuilding.EffortlessBuilding; -import org.lwjgl.opengl.*; import java.util.OptionalDouble; -import java.util.function.Consumer; -import java.util.function.Function; + public class BuildRenderTypes extends RenderType { public static ResourceLocation shaderMaskTextureLocation = new ResourceLocation(EffortlessBuilding.MODID, "textures/shader_mask.png"); diff --git a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java index df6d141..4bbcd7b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java @@ -19,8 +19,8 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RenderLevelLastEvent; -import net.minecraftforge.client.model.data.EmptyModelData; +import net.minecraftforge.client.event.RenderLevelStageEvent; +import net.minecraftforge.client.model.data.ModelData; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -28,6 +28,8 @@ import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager; import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; +import static net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_PARTICLES; + /*** * Main render class for Effortless Building */ @@ -35,8 +37,8 @@ import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; public class RenderHandler { @SubscribeEvent - public static void onRender(RenderLevelLastEvent event) { - if (event.getPhase() != EventPriority.NORMAL) + public static void onRender(RenderLevelStageEvent event) { + if (event.getPhase() != EventPriority.NORMAL || event.getStage() != AFTER_PARTICLES) return; PoseStack matrixStack = event.getPoseStack(); @@ -91,15 +93,10 @@ public class RenderHandler { RenderType blockPreviewRenderType = BuildRenderTypes.getBlockPreviewRenderType(dissolve, blockPos, firstPos, secondPos, red); VertexConsumer buffer = renderTypeBuffer.getBuffer(blockPreviewRenderType); -// MinecraftServer server = Minecraft.getInstance().getIntegratedServer(); -// World world = DimensionManager.getWorld(server, DimensionType.OVERWORLD, false, true); - try { BakedModel model = dispatcher.getBlockModel(blockState); dispatcher.getModelRenderer().renderModel(matrixStack.last(), buffer, blockState, model, - 1f, 1f, 1f, 0, OverlayTexture.NO_OVERLAY, EmptyModelData.INSTANCE); -// blockRendererDispatcher.getBlockModelRenderer().renderModel(world, blockRendererDispatcher.getModelForState(blockState), -// blockState, logicPos, matrixStack, renderTypeBuffer.getBuffer(renderType), true, new Random(), blockState.getPositionRandom(logicPos), i); + 1f, 1f, 1f, 0, OverlayTexture.NO_OVERLAY, ModelData.EMPTY, blockPreviewRenderType); } catch (NullPointerException e) { EffortlessBuilding.logger.warn("RenderHandler::renderBlockPreview cannot render " + blockState.getBlock().toString()); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index e4da843..37db863 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,6 +1,6 @@ modLoader="javafml" # Forge for 1.17.1 is version 37 -loaderVersion="[39,)" +loaderVersion="[41,)" license="GNU LESSER GENERAL PUBLIC LICENSE" issueTrackerURL="https://bitbucket.org/Requios/effortless-building/issues?status=new&status=open" showAsResourcePack=false @@ -20,13 +20,13 @@ Makes building easier by providing tools like mirrors, arrays, build modes and a [[dependencies.effortlessbuilding]] modId="forge" mandatory=true - versionRange="[39,)" + versionRange="[41,)" ordering="NONE" side="BOTH" [[dependencies.effortlessbuilding]] modId="minecraft" mandatory=true - versionRange="[1.18.1,1.19)" + versionRange="[1.18.1,1.20)" ordering="NONE" side="BOTH" \ No newline at end of file